From: Matthias Wachs <wachs@net.in.tum.de>
Date: Mon, 26 Sep 2011 16:57:23 +0000 (+0000)
Subject: test_transport_api_http now working!
X-Git-Tag: initial-import-from-subversion-38251~16958
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=72cf5d20ff9e75156be2a25380405a5548a19aee;p=oweals%2Fgnunet.git

test_transport_api_http now working!
---

diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 0643663b3..cd68a0069 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -446,6 +446,7 @@ client_send_cb (void *stream, size_t size, size_t nmemb, void *cls)
   /* no data to send */
   else
   {
+    GNUNET_assert (0);
     bytes_sent = 0;
   }
 
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,
   delay = http_plugin_receive (s, &s->target, message, s, s->addr, s->addrlen);
 
   s->delay = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), delay);
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Server: SERVER DELAY %llu ms\n",
+              delay.rel_value);
 
   if (GNUNET_TIME_absolute_get().abs_value < s->delay.abs_value)
   {
@@ -475,6 +477,7 @@ create:
                         NULL);
 
     s->inbound = GNUNET_YES;
+    s->delay = GNUNET_TIME_absolute_get_zero();
     s->tag= tag;
     if (0 == strcmp (MHD_HTTP_METHOD_PUT, method))
       s->server_recv = s;
@@ -559,7 +562,8 @@ found:
                    "Server: peer `%s' PUT on address `%s' received %Zu bytes\n",
                    GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen), *upload_data_size);
 #endif
-      if ((GNUNET_TIME_absolute_get().abs_value < s->delay.abs_value))
+      struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get();
+      if (( s->delay.abs_value < now.abs_value))
       {
 #if VERBOSE_SERVER
         GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
@@ -578,13 +582,12 @@ found:
       }
       else
       {
-/*
+
 #if DEBUG_HTTP
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Connection %X: no inbound bandwidth available! Next read was delayed for  %llu ms\n",
-                    s, ps->peercontext->delay.rel_value);
+       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Connection %X: no inbound bandwidth available! Next read was delayed by %llu ms\n", s, now.abs_value - s->delay.abs_value);
 #endif
-*/
+
       }
       return MHD_YES;
     }