diff options
Diffstat (limited to 'src/util/test_server_with_client.c')
-rw-r--r-- | src/util/test_server_with_client.c | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c index 21c706b07..5b6e51718 100644 --- a/src/util/test_server_with_client.c +++ b/src/util/test_server_with_client.c | |||
@@ -58,7 +58,7 @@ send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
58 | 58 | ||
59 | static void | 59 | static void |
60 | recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient, | 60 | recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient, |
61 | const struct GNUNET_MessageHeader *message) | 61 | const struct GNUNET_MessageHeader *message) |
62 | { | 62 | { |
63 | void *addr; | 63 | void *addr; |
64 | size_t addrlen; | 64 | size_t addrlen; |
@@ -66,8 +66,7 @@ recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient, | |||
66 | struct sockaddr_in *have; | 66 | struct sockaddr_in *have; |
67 | 67 | ||
68 | GNUNET_assert (GNUNET_OK == | 68 | GNUNET_assert (GNUNET_OK == |
69 | GNUNET_SERVER_client_get_address (argclient, &addr, | 69 | GNUNET_SERVER_client_get_address (argclient, &addr, &addrlen)); |
70 | &addrlen)); | ||
71 | 70 | ||
72 | GNUNET_assert (addrlen == sizeof (struct sockaddr_in)); | 71 | GNUNET_assert (addrlen == sizeof (struct sockaddr_in)); |
73 | have = addr; | 72 | have = addr; |
@@ -81,21 +80,21 @@ recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient, | |||
81 | GNUNET_assert (0 == memcmp (&sa, addr, addrlen)); | 80 | GNUNET_assert (0 == memcmp (&sa, addr, addrlen)); |
82 | GNUNET_free (addr); | 81 | GNUNET_free (addr); |
83 | switch (ok) | 82 | switch (ok) |
84 | { | 83 | { |
85 | case 2: | 84 | case 2: |
86 | ok++; | 85 | ok++; |
87 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 86 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
88 | (GNUNET_TIME_UNIT_MILLISECONDS, 50), | 87 | (GNUNET_TIME_UNIT_MILLISECONDS, 50), |
89 | &send_done, argclient); | 88 | &send_done, argclient); |
90 | break; | 89 | break; |
91 | case 4: | 90 | case 4: |
92 | ok++; | 91 | ok++; |
93 | GNUNET_CLIENT_disconnect (client, GNUNET_YES); | 92 | GNUNET_CLIENT_disconnect (client, GNUNET_YES); |
94 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); | 93 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); |
95 | break; | 94 | break; |
96 | default: | 95 | default: |
97 | GNUNET_assert (0); | 96 | GNUNET_assert (0); |
98 | } | 97 | } |
99 | 98 | ||
100 | } | 99 | } |
101 | 100 | ||
@@ -170,25 +169,24 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
170 | sa.sin_family = AF_INET; | 169 | sa.sin_family = AF_INET; |
171 | sa.sin_port = htons (PORT); | 170 | sa.sin_port = htons (PORT); |
172 | server = | 171 | server = |
173 | GNUNET_SERVER_create (NULL, NULL, sap, slens, | 172 | GNUNET_SERVER_create (NULL, NULL, sap, slens, |
174 | GNUNET_TIME_relative_multiply | 173 | GNUNET_TIME_relative_multiply |
175 | (GNUNET_TIME_UNIT_MILLISECONDS, 250), GNUNET_NO); | 174 | (GNUNET_TIME_UNIT_MILLISECONDS, 250), GNUNET_NO); |
176 | GNUNET_assert (server != NULL); | 175 | GNUNET_assert (server != NULL); |
177 | handlers[0].callback_cls = cls; | 176 | handlers[0].callback_cls = cls; |
178 | GNUNET_SERVER_add_handlers (server, handlers); | 177 | GNUNET_SERVER_add_handlers (server, handlers); |
179 | GNUNET_SERVER_disconnect_notify (server, ¬ify_disconnect, cls); | 178 | GNUNET_SERVER_disconnect_notify (server, ¬ify_disconnect, cls); |
180 | cfg = GNUNET_CONFIGURATION_create (); | 179 | cfg = GNUNET_CONFIGURATION_create (); |
181 | GNUNET_CONFIGURATION_set_value_number (cfg, "test", "PORT", PORT); | 180 | GNUNET_CONFIGURATION_set_value_number (cfg, "test", "PORT", PORT); |
182 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME", | 181 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME", "localhost"); |
183 | "localhost"); | ||
184 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 182 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
185 | "localhost"); | 183 | "localhost"); |
186 | client = GNUNET_CLIENT_connect ("test", cfg); | 184 | client = GNUNET_CLIENT_connect ("test", cfg); |
187 | GNUNET_assert (client != NULL); | 185 | GNUNET_assert (client != NULL); |
188 | GNUNET_CLIENT_notify_transmit_ready (client, 256, | 186 | GNUNET_CLIENT_notify_transmit_ready (client, 256, |
189 | GNUNET_TIME_relative_multiply | 187 | GNUNET_TIME_relative_multiply |
190 | (GNUNET_TIME_UNIT_MILLISECONDS, 250), | 188 | (GNUNET_TIME_UNIT_MILLISECONDS, 250), |
191 | GNUNET_NO, ¬ify_ready, NULL); | 189 | GNUNET_NO, ¬ify_ready, NULL); |
192 | } | 190 | } |
193 | 191 | ||
194 | 192 | ||
@@ -213,11 +211,11 @@ main (int argc, char *argv[]) | |||
213 | 211 | ||
214 | GNUNET_log_setup ("test_server_with_client", | 212 | GNUNET_log_setup ("test_server_with_client", |
215 | #if VERBOSE | 213 | #if VERBOSE |
216 | "DEBUG", | 214 | "DEBUG", |
217 | #else | 215 | #else |
218 | "WARNING", | 216 | "WARNING", |
219 | #endif | 217 | #endif |
220 | NULL); | 218 | NULL); |
221 | ret += check (); | 219 | ret += check (); |
222 | 220 | ||
223 | return ret; | 221 | return ret; |