diff options
Diffstat (limited to 'src/transport/plugin_transport_http_client.c')
-rw-r--r-- | src/transport/plugin_transport_http_client.c | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 75daeab71..2d112d4fe 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c | |||
@@ -912,6 +912,7 @@ client_receive_mst_cb (void *cls, void *client, | |||
912 | struct GNUNET_TIME_Relative delay; | 912 | struct GNUNET_TIME_Relative delay; |
913 | struct GNUNET_ATS_Information atsi; | 913 | struct GNUNET_ATS_Information atsi; |
914 | char *stat_txt; | 914 | char *stat_txt; |
915 | |||
915 | if (GNUNET_YES != client_exist_session(p, s)) | 916 | if (GNUNET_YES != client_exist_session(p, s)) |
916 | { | 917 | { |
917 | GNUNET_break (0); | 918 | GNUNET_break (0); |
@@ -940,14 +941,16 @@ client_receive_mst_cb (void *cls, void *client, | |||
940 | s->next_receive = | 941 | s->next_receive = |
941 | GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay); | 942 | GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay); |
942 | 943 | ||
943 | if (GNUNET_TIME_absolute_get ().abs_value < s->next_receive.abs_value) | 944 | if (GNUNET_TIME_absolute_get ().abs_value_us < s->next_receive.abs_value_us) |
944 | { | 945 | { |
945 | |||
946 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, | 946 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
947 | "Client: peer `%s' address `%s' next read delayed for %llu ms\n", | 947 | "Client: peer `%s' address `%s' next read delayed for %s\n", |
948 | GNUNET_i2s (&s->target), | 948 | GNUNET_i2s (&s->target), |
949 | http_common_plugin_address_to_string (NULL, s->plugin->protocol, s->addr, s->addrlen), | 949 | http_common_plugin_address_to_string (NULL, |
950 | delay); | 950 | s->plugin->protocol, |
951 | s->addr, s->addrlen), | ||
952 | GNUNET_STRINGS_relative_time_to_string (delay, | ||
953 | GNUNET_YES)); | ||
951 | } | 954 | } |
952 | client_reschedule_session_timeout (s); | 955 | client_reschedule_session_timeout (s); |
953 | return GNUNET_OK; | 956 | return GNUNET_OK; |
@@ -993,14 +996,16 @@ client_receive (void *stream, size_t size, size_t nmemb, void *cls) | |||
993 | s, s->client_get, | 996 | s, s->client_get, |
994 | len, GNUNET_i2s (&s->target)); | 997 | len, GNUNET_i2s (&s->target)); |
995 | now = GNUNET_TIME_absolute_get (); | 998 | now = GNUNET_TIME_absolute_get (); |
996 | if (now.abs_value < s->next_receive.abs_value) | 999 | if (now.abs_value_us < s->next_receive.abs_value_us) |
997 | { | 1000 | { |
998 | struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); | 1001 | struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); |
999 | struct GNUNET_TIME_Relative delta = | 1002 | struct GNUNET_TIME_Relative delta = |
1000 | GNUNET_TIME_absolute_get_difference (now, s->next_receive); | 1003 | GNUNET_TIME_absolute_get_difference (now, s->next_receive); |
1001 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name, | 1004 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name, |
1002 | "Session %p / connection %p: No inbound bandwidth available! Next read was delayed for %llu ms\n", | 1005 | "Session %p / connection %p: No inbound bandwidth available! Next read was delayed for %s\n", |
1003 | s, s->client_get, delta.rel_value); | 1006 | s, s->client_get, |
1007 | GNUNET_STRINGS_relative_time_to_string (delta, | ||
1008 | GNUNET_YES)); | ||
1004 | if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK) | 1009 | if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK) |
1005 | { | 1010 | { |
1006 | GNUNET_SCHEDULER_cancel (s->recv_wakeup_task); | 1011 | GNUNET_SCHEDULER_cancel (s->recv_wakeup_task); |
@@ -1276,7 +1281,7 @@ client_connect_get (struct Session *s) | |||
1276 | curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT, 0); | 1281 | curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT, 0); |
1277 | curl_easy_setopt (s->client_get, CURLOPT_PRIVATE, s); | 1282 | curl_easy_setopt (s->client_get, CURLOPT_PRIVATE, s); |
1278 | curl_easy_setopt (s->client_get, CURLOPT_CONNECTTIMEOUT_MS, | 1283 | curl_easy_setopt (s->client_get, CURLOPT_CONNECTTIMEOUT_MS, |
1279 | (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value); | 1284 | (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL); |
1280 | curl_easy_setopt (s->client_get, CURLOPT_BUFFERSIZE, | 1285 | curl_easy_setopt (s->client_get, CURLOPT_BUFFERSIZE, |
1281 | 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); | 1286 | 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); |
1282 | #if CURL_TCP_NODELAY | 1287 | #if CURL_TCP_NODELAY |
@@ -1353,7 +1358,7 @@ client_connect_put (struct Session *s) | |||
1353 | curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT, 0); | 1358 | curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT, 0); |
1354 | curl_easy_setopt (s->client_put, CURLOPT_PRIVATE, s); | 1359 | curl_easy_setopt (s->client_put, CURLOPT_PRIVATE, s); |
1355 | curl_easy_setopt (s->client_put, CURLOPT_CONNECTTIMEOUT_MS, | 1360 | curl_easy_setopt (s->client_put, CURLOPT_CONNECTTIMEOUT_MS, |
1356 | (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value); | 1361 | (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL); |
1357 | curl_easy_setopt (s->client_put, CURLOPT_BUFFERSIZE, | 1362 | curl_easy_setopt (s->client_put, CURLOPT_BUFFERSIZE, |
1358 | 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); | 1363 | 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); |
1359 | #if CURL_TCP_NODELAY | 1364 | #if CURL_TCP_NODELAY |
@@ -1597,8 +1602,10 @@ client_session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc | |||
1597 | 1602 | ||
1598 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 1603 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
1599 | GNUNET_log (TIMEOUT_LOG, | 1604 | GNUNET_log (TIMEOUT_LOG, |
1600 | "Session %p was idle for %llu ms, disconnecting\n", | 1605 | "Session %p was idle for %s, disconnecting\n", |
1601 | s, (unsigned long long) CLIENT_SESSION_TIMEOUT.rel_value); | 1606 | s, |
1607 | GNUNET_STRINGS_relative_time_to_string (CLIENT_SESSION_TIMEOUT, | ||
1608 | GNUNET_YES)); | ||
1602 | 1609 | ||
1603 | /* call session destroy function */ | 1610 | /* call session destroy function */ |
1604 | GNUNET_assert (GNUNET_OK == client_disconnect (s)); | 1611 | GNUNET_assert (GNUNET_OK == client_disconnect (s)); |
@@ -1620,8 +1627,10 @@ client_start_session_timeout (struct Session *s) | |||
1620 | &client_session_timeout, | 1627 | &client_session_timeout, |
1621 | s); | 1628 | s); |
1622 | GNUNET_log (TIMEOUT_LOG, | 1629 | GNUNET_log (TIMEOUT_LOG, |
1623 | "Timeout for session %p set to %llu ms\n", | 1630 | "Timeout for session %p set to %s\n", |
1624 | s, (unsigned long long) CLIENT_SESSION_TIMEOUT.rel_value); | 1631 | s, |
1632 | GNUNET_STRINGS_relative_time_to_string (CLIENT_SESSION_TIMEOUT, | ||
1633 | GNUNET_YES)); | ||
1625 | } | 1634 | } |
1626 | 1635 | ||
1627 | 1636 | ||
@@ -1642,8 +1651,10 @@ client_reschedule_session_timeout (struct Session *s) | |||
1642 | &client_session_timeout, | 1651 | &client_session_timeout, |
1643 | s); | 1652 | s); |
1644 | GNUNET_log (TIMEOUT_LOG, | 1653 | GNUNET_log (TIMEOUT_LOG, |
1645 | "Timeout rescheduled for session %p set to %llu ms\n", | 1654 | "Timeout rescheduled for session %p set to %s\n", |
1646 | s, (unsigned long long) CLIENT_SESSION_TIMEOUT.rel_value); | 1655 | s, |
1656 | GNUNET_STRINGS_relative_time_to_string (CLIENT_SESSION_TIMEOUT, | ||
1657 | GNUNET_YES)); | ||
1647 | } | 1658 | } |
1648 | 1659 | ||
1649 | 1660 | ||