diff options
Diffstat (limited to 'src/util/test_connection_timeout.c')
-rw-r--r-- | src/util/test_connection_timeout.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c index 0e2190e41..3989d654a 100644 --- a/src/util/test_connection_timeout.c +++ b/src/util/test_connection_timeout.c | |||
@@ -62,8 +62,7 @@ open_listen_socket () | |||
62 | GNUNET_assert (desc != NULL); | 62 | GNUNET_assert (desc != NULL); |
63 | if (GNUNET_NETWORK_socket_setsockopt | 63 | if (GNUNET_NETWORK_socket_setsockopt |
64 | (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) | 64 | (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) |
65 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 65 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "setsockopt"); |
66 | "setsockopt"); | ||
67 | GNUNET_assert (GNUNET_NETWORK_socket_bind | 66 | GNUNET_assert (GNUNET_NETWORK_socket_bind |
68 | (desc, (const struct sockaddr *) &sa, | 67 | (desc, (const struct sockaddr *) &sa, |
69 | sizeof (sa)) == GNUNET_OK); | 68 | sizeof (sa)) == GNUNET_OK); |
@@ -76,17 +75,18 @@ static size_t | |||
76 | send_kilo (void *cls, size_t size, void *buf) | 75 | send_kilo (void *cls, size_t size, void *buf) |
77 | { | 76 | { |
78 | int *ok = cls; | 77 | int *ok = cls; |
78 | |||
79 | if (size == 0) | 79 | if (size == 0) |
80 | { | 80 | { |
81 | #if VERBOSE | 81 | #if VERBOSE |
82 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got the desired timeout!\n"); | 82 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got the desired timeout!\n"); |
83 | #endif | 83 | #endif |
84 | GNUNET_assert (buf == NULL); | 84 | GNUNET_assert (buf == NULL); |
85 | *ok = 0; | 85 | *ok = 0; |
86 | GNUNET_CONNECTION_destroy (lsock, GNUNET_YES); | 86 | GNUNET_CONNECTION_destroy (lsock, GNUNET_YES); |
87 | GNUNET_CONNECTION_destroy (csock, GNUNET_YES); | 87 | GNUNET_CONNECTION_destroy (csock, GNUNET_YES); |
88 | return 0; | 88 | return 0; |
89 | } | 89 | } |
90 | #if VERBOSE | 90 | #if VERBOSE |
91 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending kilo to fill buffer.\n"); | 91 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending kilo to fill buffer.\n"); |
92 | #endif | 92 | #endif |
@@ -109,8 +109,7 @@ task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
109 | ls = open_listen_socket (); | 109 | ls = open_listen_socket (); |
110 | lsock = GNUNET_CONNECTION_create_from_existing (ls); | 110 | lsock = GNUNET_CONNECTION_create_from_existing (ls); |
111 | GNUNET_assert (lsock != NULL); | 111 | GNUNET_assert (lsock != NULL); |
112 | csock = GNUNET_CONNECTION_create_from_connect (cfg, | 112 | csock = GNUNET_CONNECTION_create_from_connect (cfg, "localhost", PORT); |
113 | "localhost", PORT); | ||
114 | GNUNET_assert (csock != NULL); | 113 | GNUNET_assert (csock != NULL); |
115 | GNUNET_assert (NULL != | 114 | GNUNET_assert (NULL != |
116 | GNUNET_CONNECTION_notify_transmit_ready (csock, | 115 | GNUNET_CONNECTION_notify_transmit_ready (csock, |