diff options
Diffstat (limited to 'src/util/connection.c')
-rw-r--r-- | src/util/connection.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/util/connection.c b/src/util/connection.c index 886ae140c..e09c0cd9e 100644 --- a/src/util/connection.c +++ b/src/util/connection.c | |||
@@ -817,12 +817,11 @@ GNUNET_CONNECTION_create_from_connect (struct GNUNET_SCHEDULER_Handle *sched, | |||
817 | ret->port = port; | 817 | ret->port = port; |
818 | ret->hostname = GNUNET_strdup (hostname); | 818 | ret->hostname = GNUNET_strdup (hostname); |
819 | ret->dns_active = GNUNET_RESOLVER_ip_get (sched, | 819 | ret->dns_active = GNUNET_RESOLVER_ip_get (sched, |
820 | cfg, | 820 | cfg, |
821 | ret->hostname, | 821 | ret->hostname, |
822 | AF_UNSPEC, | 822 | AF_UNSPEC, |
823 | GNUNET_CONNECTION_CONNECT_RETRY_TIMEOUT, | 823 | GNUNET_CONNECTION_CONNECT_RETRY_TIMEOUT, |
824 | &try_connect_using_address, | 824 | &try_connect_using_address, ret); |
825 | ret); | ||
826 | return ret; | 825 | return ret; |
827 | } | 826 | } |
828 | 827 | ||
@@ -971,9 +970,8 @@ receive_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
971 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 970 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
972 | "Receive from `%s' encounters error: time out by %llums... (%p)\n", | 971 | "Receive from `%s' encounters error: time out by %llums... (%p)\n", |
973 | GNUNET_a2s (sh->addr, sh->addrlen), | 972 | GNUNET_a2s (sh->addr, sh->addrlen), |
974 | GNUNET_TIME_absolute_get_duration (sh-> | 973 | GNUNET_TIME_absolute_get_duration (sh->receive_timeout). |
975 | receive_timeout).value, | 974 | value, sh); |
976 | sh); | ||
977 | #endif | 975 | #endif |
978 | signal_timeout (sh); | 976 | signal_timeout (sh); |
979 | return; | 977 | return; |
@@ -1320,8 +1318,8 @@ transmit_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1320 | GNUNET_assert (sock->write_buffer_pos <= sock->write_buffer_size); | 1318 | GNUNET_assert (sock->write_buffer_pos <= sock->write_buffer_size); |
1321 | RETRY: | 1319 | RETRY: |
1322 | ret = GNUNET_NETWORK_socket_send (sock->sock, | 1320 | ret = GNUNET_NETWORK_socket_send (sock->sock, |
1323 | &sock-> | 1321 | &sock->write_buffer[sock-> |
1324 | write_buffer[sock->write_buffer_pos], | 1322 | write_buffer_pos], |
1325 | have); | 1323 | have); |
1326 | if (ret == -1) | 1324 | if (ret == -1) |
1327 | { | 1325 | { |
@@ -1418,8 +1416,8 @@ GNUNET_CONNECTION_notify_transmit_ready (struct GNUNET_CONNECTION_Handle | |||
1418 | #endif | 1416 | #endif |
1419 | sock->write_task = GNUNET_SCHEDULER_add_write_net (sock->sched, | 1417 | sock->write_task = GNUNET_SCHEDULER_add_write_net (sock->sched, |
1420 | GNUNET_TIME_absolute_get_remaining | 1418 | GNUNET_TIME_absolute_get_remaining |
1421 | (sock-> | 1419 | (sock->nth. |
1422 | nth.transmit_timeout), | 1420 | transmit_timeout), |
1423 | sock->sock, | 1421 | sock->sock, |
1424 | &transmit_ready, | 1422 | &transmit_ready, |
1425 | sock); | 1423 | sock); |