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