diff options
Diffstat (limited to 'src/util/test_connection.c')
-rw-r--r-- | src/util/test_connection.c | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/util/test_connection.c b/src/util/test_connection.c index e144f66c1..0f4c46b3b 100644 --- a/src/util/test_connection.c +++ b/src/util/test_connection.c | |||
@@ -64,12 +64,13 @@ open_listen_socket () | |||
64 | sa.sin_family = AF_INET; | 64 | sa.sin_family = AF_INET; |
65 | desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0); | 65 | desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0); |
66 | GNUNET_assert (desc != NULL); | 66 | GNUNET_assert (desc != NULL); |
67 | if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) | 67 | if (GNUNET_NETWORK_socket_setsockopt |
68 | (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) | ||
68 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 69 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
69 | "setsockopt"); | 70 | "setsockopt"); |
70 | GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, | 71 | GNUNET_assert (GNUNET_NETWORK_socket_bind |
71 | (const struct sockaddr*) &sa, | 72 | (desc, (const struct sockaddr *) &sa, |
72 | sizeof (sa)) == GNUNET_OK); | 73 | sizeof (sa)) == GNUNET_OK); |
73 | GNUNET_NETWORK_socket_listen (desc, 5); | 74 | GNUNET_NETWORK_socket_listen (desc, 5); |
74 | return desc; | 75 | return desc; |
75 | } | 76 | } |
@@ -94,10 +95,10 @@ receive_check (void *cls, | |||
94 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receive needs more data\n"); | 95 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receive needs more data\n"); |
95 | #endif | 96 | #endif |
96 | GNUNET_CONNECTION_receive (asock, | 97 | GNUNET_CONNECTION_receive (asock, |
97 | 1024, | 98 | 1024, |
98 | GNUNET_TIME_relative_multiply | 99 | GNUNET_TIME_relative_multiply |
99 | (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, | 100 | (GNUNET_TIME_UNIT_SECONDS, 5), |
100 | cls); | 101 | &receive_check, cls); |
101 | } | 102 | } |
102 | else | 103 | else |
103 | { | 104 | { |
@@ -118,7 +119,7 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
118 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test accepts connection\n"); | 119 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test accepts connection\n"); |
119 | #endif | 120 | #endif |
120 | asock = GNUNET_CONNECTION_create_from_accept (tc->sched, | 121 | asock = GNUNET_CONNECTION_create_from_accept (tc->sched, |
121 | NULL, NULL, ls, 1024); | 122 | NULL, NULL, ls, 1024); |
122 | GNUNET_assert (asock != NULL); | 123 | GNUNET_assert (asock != NULL); |
123 | GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); | 124 | GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); |
124 | #if VERBOSE | 125 | #if VERBOSE |
@@ -130,9 +131,10 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
130 | "Test asks to receive on accepted socket\n"); | 131 | "Test asks to receive on accepted socket\n"); |
131 | #endif | 132 | #endif |
132 | GNUNET_CONNECTION_receive (asock, | 133 | GNUNET_CONNECTION_receive (asock, |
133 | 1024, | 134 | 1024, |
134 | GNUNET_TIME_relative_multiply | 135 | GNUNET_TIME_relative_multiply |
135 | (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, cls); | 136 | (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, |
137 | cls); | ||
136 | } | 138 | } |
137 | 139 | ||
138 | static size_t | 140 | static size_t |
@@ -158,27 +160,26 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
158 | lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); | 160 | lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); |
159 | GNUNET_assert (lsock != NULL); | 161 | GNUNET_assert (lsock != NULL); |
160 | csock = GNUNET_CONNECTION_create_from_connect (tc->sched, | 162 | csock = GNUNET_CONNECTION_create_from_connect (tc->sched, |
161 | cfg, | 163 | cfg, |
162 | "localhost", PORT, 1024); | 164 | "localhost", PORT, 1024); |
163 | GNUNET_assert (csock != NULL); | 165 | GNUNET_assert (csock != NULL); |
164 | #if VERBOSE | 166 | #if VERBOSE |
165 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test asks for write notification\n"); | 167 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test asks for write notification\n"); |
166 | #endif | 168 | #endif |
167 | GNUNET_assert (NULL != | 169 | GNUNET_assert (NULL != |
168 | GNUNET_CONNECTION_notify_transmit_ready (csock, | 170 | GNUNET_CONNECTION_notify_transmit_ready (csock, |
169 | 12, | 171 | 12, |
170 | GNUNET_TIME_UNIT_SECONDS, | 172 | GNUNET_TIME_UNIT_SECONDS, |
171 | &make_hello, | 173 | &make_hello, NULL)); |
172 | NULL)); | ||
173 | #if VERBOSE | 174 | #if VERBOSE |
174 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test prepares to accept\n"); | 175 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test prepares to accept\n"); |
175 | #endif | 176 | #endif |
176 | GNUNET_SCHEDULER_add_read_net (tc->sched, | 177 | GNUNET_SCHEDULER_add_read_net (tc->sched, |
177 | GNUNET_NO, | 178 | GNUNET_NO, |
178 | GNUNET_SCHEDULER_PRIORITY_HIGH, | 179 | GNUNET_SCHEDULER_PRIORITY_HIGH, |
179 | GNUNET_SCHEDULER_NO_TASK, | 180 | GNUNET_SCHEDULER_NO_TASK, |
180 | GNUNET_TIME_UNIT_FOREVER_REL, | 181 | GNUNET_TIME_UNIT_FOREVER_REL, |
181 | ls, &run_accept, cls); | 182 | ls, &run_accept, cls); |
182 | } | 183 | } |
183 | 184 | ||
184 | 185 | ||