diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-09-26 16:57:23 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-09-26 16:57:23 +0000 |
commit | 72cf5d20ff9e75156be2a25380405a5548a19aee (patch) | |
tree | 782784c037eb3dbbddf83ca5eaa2d43ec5090c82 /src/transport/plugin_transport_http_server.c | |
parent | 5c9b9bac3b0a6f1e090342e460f6393c68492797 (diff) | |
download | gnunet-72cf5d20ff9e75156be2a25380405a5548a19aee.tar.gz gnunet-72cf5d20ff9e75156be2a25380405a5548a19aee.zip |
test_transport_api_http now working!
Diffstat (limited to 'src/transport/plugin_transport_http_server.c')
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index fd5df5097..596ac4925 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -248,6 +248,8 @@ server_receive_mst_cb (void *cls, void *client, | |||
248 | delay = http_plugin_receive (s, &s->target, message, s, s->addr, s->addrlen); | 248 | delay = http_plugin_receive (s, &s->target, message, s, s->addr, s->addrlen); |
249 | 249 | ||
250 | s->delay = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), delay); | 250 | s->delay = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), delay); |
251 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Server: SERVER DELAY %llu ms\n", | ||
252 | delay.rel_value); | ||
251 | 253 | ||
252 | if (GNUNET_TIME_absolute_get().abs_value < s->delay.abs_value) | 254 | if (GNUNET_TIME_absolute_get().abs_value < s->delay.abs_value) |
253 | { | 255 | { |
@@ -475,6 +477,7 @@ create: | |||
475 | NULL); | 477 | NULL); |
476 | 478 | ||
477 | s->inbound = GNUNET_YES; | 479 | s->inbound = GNUNET_YES; |
480 | s->delay = GNUNET_TIME_absolute_get_zero(); | ||
478 | s->tag= tag; | 481 | s->tag= tag; |
479 | if (0 == strcmp (MHD_HTTP_METHOD_PUT, method)) | 482 | if (0 == strcmp (MHD_HTTP_METHOD_PUT, method)) |
480 | s->server_recv = s; | 483 | s->server_recv = s; |
@@ -559,7 +562,8 @@ found: | |||
559 | "Server: peer `%s' PUT on address `%s' received %Zu bytes\n", | 562 | "Server: peer `%s' PUT on address `%s' received %Zu bytes\n", |
560 | GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen), *upload_data_size); | 563 | GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen), *upload_data_size); |
561 | #endif | 564 | #endif |
562 | if ((GNUNET_TIME_absolute_get().abs_value < s->delay.abs_value)) | 565 | struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get(); |
566 | if (( s->delay.abs_value < now.abs_value)) | ||
563 | { | 567 | { |
564 | #if VERBOSE_SERVER | 568 | #if VERBOSE_SERVER |
565 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, | 569 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
@@ -578,13 +582,12 @@ found: | |||
578 | } | 582 | } |
579 | else | 583 | else |
580 | { | 584 | { |
581 | /* | 585 | |
582 | #if DEBUG_HTTP | 586 | #if DEBUG_HTTP |
583 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 587 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
584 | "Connection %X: no inbound bandwidth available! Next read was delayed for %llu ms\n", | 588 | "Connection %X: no inbound bandwidth available! Next read was delayed by %llu ms\n", s, now.abs_value - s->delay.abs_value); |
585 | s, ps->peercontext->delay.rel_value); | ||
586 | #endif | 589 | #endif |
587 | */ | 590 | |
588 | } | 591 | } |
589 | return MHD_YES; | 592 | return MHD_YES; |
590 | } | 593 | } |