[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17018 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17018 - gnunet/src/transport |
Date: |
Mon, 26 Sep 2011 18:57:24 +0200 |
Author: wachs
Date: 2011-09-26 18:57:23 +0200 (Mon, 26 Sep 2011)
New Revision: 17018
Modified:
gnunet/src/transport/plugin_transport_http_client.c
gnunet/src/transport/plugin_transport_http_server.c
Log:
test_transport_api_http now working!
Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2011-09-26 15:58:11 UTC
(rev 17017)
+++ gnunet/src/transport/plugin_transport_http_client.c 2011-09-26 16:57:23 UTC
(rev 17018)
@@ -446,6 +446,7 @@
/* no data to send */
else
{
+ GNUNET_assert (0);
bytes_sent = 0;
}
Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2011-09-26 15:58:11 UTC
(rev 17017)
+++ gnunet/src/transport/plugin_transport_http_server.c 2011-09-26 16:57:23 UTC
(rev 17018)
@@ -248,6 +248,8 @@
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 @@
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 @@
"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 @@
}
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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17018 - gnunet/src/transport,
gnunet <=