aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-09-24 08:43:14 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-09-24 08:43:14 +0000
commit9870c79db5747d3f83324de7feea2690dcddbfa2 (patch)
treefbb7e996338758d69cee14f0f8c8f0cc8e18dcb5 /src/transport
parent08993cbbcdf4606b13082b5f7118485adc0911b3 (diff)
downloadgnunet-9870c79db5747d3f83324de7feea2690dcddbfa2.tar.gz
gnunet-9870c79db5747d3f83324de7feea2690dcddbfa2.zip
- fix disconnect problem in put connection
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/plugin_transport_http_client.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index bcc97edc7..7ea55deb1 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -880,8 +880,9 @@ client_receive (void *stream, size_t size, size_t nmemb, void *cls)
880 struct HTTP_Client_Plugin *plugin = s->plugin; 880 struct HTTP_Client_Plugin *plugin = s->plugin;
881 881
882 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, 882 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
883 "Received %u bytes from peer `%s'\n", len, 883 "Session %p / connection %p: Received %u bytes from peer `%s'\n",
884 GNUNET_i2s (&s->target)); 884 s, s->client_get,
885 len, GNUNET_i2s (&s->target));
885 now = GNUNET_TIME_absolute_get (); 886 now = GNUNET_TIME_absolute_get ();
886 if (now.abs_value < s->next_receive.abs_value) 887 if (now.abs_value < s->next_receive.abs_value)
887 { 888 {
@@ -889,8 +890,8 @@ client_receive (void *stream, size_t size, size_t nmemb, void *cls)
889 struct GNUNET_TIME_Relative delta = 890 struct GNUNET_TIME_Relative delta =
890 GNUNET_TIME_absolute_get_difference (now, s->next_receive); 891 GNUNET_TIME_absolute_get_difference (now, s->next_receive);
891 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, 892 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
892 "No inbound bandwidth for session %p available! Next read was delayed for %llu ms\n", 893 "Session %p / connection %p: No inbound bandwidth available! Next read was delayed for %llu ms\n",
893 s, delta.rel_value); 894 s, s->client_get, delta.rel_value);
894 if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK) 895 if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK)
895 { 896 {
896 GNUNET_SCHEDULER_cancel (s->recv_wakeup_task); 897 GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
@@ -898,7 +899,7 @@ client_receive (void *stream, size_t size, size_t nmemb, void *cls)
898 } 899 }
899 s->recv_wakeup_task = 900 s->recv_wakeup_task =
900 GNUNET_SCHEDULER_add_delayed (delta, &client_wake_up, s); 901 GNUNET_SCHEDULER_add_delayed (delta, &client_wake_up, s);
901 return CURLPAUSE_ALL; 902 return CURL_WRITEFUNC_PAUSE;
902 } 903 }
903 if (NULL == s->msg_tk) 904 if (NULL == s->msg_tk)
904 s->msg_tk = GNUNET_SERVER_mst_create (&client_receive_mst_cb, s); 905 s->msg_tk = GNUNET_SERVER_mst_create (&client_receive_mst_cb, s);