diff options
Diffstat (limited to 'src/transport/test_transport_api_timeout.c')
-rw-r--r-- | src/transport/test_transport_api_timeout.c | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c index 7a8dc36f3..fcc0b044e 100644 --- a/src/transport/test_transport_api_timeout.c +++ b/src/transport/test_transport_api_timeout.c | |||
@@ -52,11 +52,11 @@ static struct GNUNET_SCHEDULER_Task * die_task; | |||
52 | 52 | ||
53 | static struct GNUNET_SCHEDULER_Task * timer_task; | 53 | static struct GNUNET_SCHEDULER_Task * timer_task; |
54 | 54 | ||
55 | static struct GNUNET_TRANSPORT_TESTING_handle *tth; | 55 | static struct GNUNET_TRANSPORT_TESTING_Handle *tth; |
56 | 56 | ||
57 | static struct PeerContext *p1; | 57 | static struct GNUNET_TRANSPORT_TESTING_PeerContext *p1; |
58 | 58 | ||
59 | static struct PeerContext *p2; | 59 | static struct GNUNET_TRANSPORT_TESTING_PeerContext *p2; |
60 | 60 | ||
61 | static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc; | 61 | static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc; |
62 | 62 | ||
@@ -95,8 +95,8 @@ end () | |||
95 | die_task = NULL; | 95 | die_task = NULL; |
96 | } | 96 | } |
97 | 97 | ||
98 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); | 98 | GNUNET_TRANSPORT_TESTING_stop_peer (p1); |
99 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); | 99 | GNUNET_TRANSPORT_TESTING_stop_peer (p2); |
100 | 100 | ||
101 | if (disconnects == 0) | 101 | if (disconnects == 0) |
102 | ok = 0; | 102 | ok = 0; |
@@ -127,11 +127,11 @@ end_badly (void *cls) | |||
127 | timer_task = NULL; | 127 | timer_task = NULL; |
128 | } | 128 | } |
129 | if (cc != NULL) | 129 | if (cc != NULL) |
130 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc); | 130 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc); |
131 | if (p1 != NULL) | 131 | if (p1 != NULL) |
132 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); | 132 | GNUNET_TRANSPORT_TESTING_stop_peer (p1); |
133 | if (p2 != NULL) | 133 | if (p2 != NULL) |
134 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); | 134 | GNUNET_TRANSPORT_TESTING_stop_peer (p2); |
135 | ok = GNUNET_SYSERR; | 135 | ok = GNUNET_SYSERR; |
136 | 136 | ||
137 | GNUNET_TRANSPORT_TESTING_done (tth); | 137 | GNUNET_TRANSPORT_TESTING_done (tth); |
@@ -197,7 +197,7 @@ timer (void *cls) | |||
197 | 197 | ||
198 | 198 | ||
199 | static void | 199 | static void |
200 | testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) | 200 | testing_connect_cb (void *cls) |
201 | { | 201 | { |
202 | cc = NULL; | 202 | cc = NULL; |
203 | char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); | 203 | char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); |
@@ -223,7 +223,7 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) | |||
223 | 223 | ||
224 | 224 | ||
225 | static void | 225 | static void |
226 | start_cb (struct PeerContext *p, void *cls) | 226 | start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p, void *cls) |
227 | { | 227 | { |
228 | static int started; | 228 | static int started; |
229 | 229 | ||
@@ -242,7 +242,9 @@ start_cb (struct PeerContext *p, void *cls) | |||
242 | p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id)); | 242 | p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id)); |
243 | GNUNET_free (sender_c); | 243 | GNUNET_free (sender_c); |
244 | 244 | ||
245 | cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, | 245 | cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, |
246 | p2, | ||
247 | &testing_connect_cb, | ||
246 | NULL); | 248 | NULL); |
247 | 249 | ||
248 | } | 250 | } |
@@ -253,13 +255,21 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
253 | { | 255 | { |
254 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); | 256 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); |
255 | 257 | ||
256 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1, | 258 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, |
257 | ¬ify_receive, ¬ify_connect, | 259 | cfg_file_p1, |
258 | ¬ify_disconnect, &start_cb, | 260 | 1, |
261 | ¬ify_receive, | ||
262 | ¬ify_connect, | ||
263 | ¬ify_disconnect, | ||
264 | &start_cb, | ||
259 | NULL); | 265 | NULL); |
260 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2, | 266 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, |
261 | ¬ify_receive, ¬ify_connect, | 267 | cfg_file_p2, |
262 | ¬ify_disconnect, &start_cb, | 268 | 2, |
269 | ¬ify_receive, | ||
270 | ¬ify_connect, | ||
271 | ¬ify_disconnect, | ||
272 | &start_cb, | ||
263 | NULL); | 273 | NULL); |
264 | 274 | ||
265 | if ((p1 == NULL) || (p2 == NULL)) | 275 | if ((p1 == NULL) || (p2 == NULL)) |
@@ -299,20 +309,20 @@ main (int argc, char *argv[]) | |||
299 | { | 309 | { |
300 | int ret; | 310 | int ret; |
301 | 311 | ||
302 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 312 | test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv[0]); |
303 | 313 | ||
304 | GNUNET_log_setup (test_name, | 314 | GNUNET_log_setup (test_name, |
305 | "WARNING", | 315 | "WARNING", |
306 | NULL); | 316 | NULL); |
307 | 317 | ||
308 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); | 318 | test_source = GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__); |
309 | GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source, | 319 | test_plugin = GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], |
310 | &test_plugin); | 320 | test_source); |
311 | 321 | ||
312 | tth = GNUNET_TRANSPORT_TESTING_init (); | 322 | tth = GNUNET_TRANSPORT_TESTING_init (); |
313 | 323 | ||
314 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); | 324 | cfg_file_p1 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 1); |
315 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); | 325 | cfg_file_p2 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 2); |
316 | 326 | ||
317 | ret = check (); | 327 | ret = check (); |
318 | 328 | ||