diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-09 22:34:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-09 22:34:49 +0000 |
commit | c0b81510ffe194dc662c3a6267d5e66a69873c4b (patch) | |
tree | 5ad5cc473d6993523be80bcf1430230e224d9216 /src/transport/test_transport_api_manipulation_recv_tcp.c | |
parent | a7345f7436c421fd15e18e87ec399ea93b6dde03 (diff) | |
download | gnunet-c0b81510ffe194dc662c3a6267d5e66a69873c4b.tar.gz gnunet-c0b81510ffe194dc662c3a6267d5e66a69873c4b.zip |
-start to refactor testcases for sanity
Diffstat (limited to 'src/transport/test_transport_api_manipulation_recv_tcp.c')
-rw-r--r-- | src/transport/test_transport_api_manipulation_recv_tcp.c | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c b/src/transport/test_transport_api_manipulation_recv_tcp.c index 02c9408a6..03aced539 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp.c +++ b/src/transport/test_transport_api_manipulation_recv_tcp.c | |||
@@ -63,15 +63,15 @@ static struct GNUNET_SCHEDULER_Task * die_task; | |||
63 | 63 | ||
64 | static struct GNUNET_SCHEDULER_Task * send_task; | 64 | static struct GNUNET_SCHEDULER_Task * send_task; |
65 | 65 | ||
66 | static struct PeerContext *p1; | 66 | static struct GNUNET_TRANSPORT_TESTING_PeerContext *p1; |
67 | 67 | ||
68 | static struct PeerContext *p2; | 68 | static struct GNUNET_TRANSPORT_TESTING_PeerContext *p2; |
69 | 69 | ||
70 | static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc; | 70 | static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc; |
71 | 71 | ||
72 | static struct GNUNET_TRANSPORT_TransmitHandle *th; | 72 | static struct GNUNET_TRANSPORT_TransmitHandle *th; |
73 | 73 | ||
74 | static struct GNUNET_TRANSPORT_TESTING_handle *tth; | 74 | static struct GNUNET_TRANSPORT_TESTING_Handle *tth; |
75 | 75 | ||
76 | static char *cfg_file_p1; | 76 | static char *cfg_file_p1; |
77 | 77 | ||
@@ -100,8 +100,8 @@ end () | |||
100 | GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); | 100 | GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); |
101 | th = NULL; | 101 | th = NULL; |
102 | 102 | ||
103 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); | 103 | GNUNET_TRANSPORT_TESTING_stop_peer (p1); |
104 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); | 104 | GNUNET_TRANSPORT_TESTING_stop_peer (p2); |
105 | } | 105 | } |
106 | 106 | ||
107 | 107 | ||
@@ -119,7 +119,7 @@ end_badly (void *cls) | |||
119 | if (cc != NULL) | 119 | if (cc != NULL) |
120 | { | 120 | { |
121 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n")); | 121 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n")); |
122 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc); | 122 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc); |
123 | cc = NULL; | 123 | cc = NULL; |
124 | } | 124 | } |
125 | 125 | ||
@@ -146,11 +146,11 @@ end_badly (void *cls) | |||
146 | th = NULL; | 146 | th = NULL; |
147 | 147 | ||
148 | if (p1 != NULL) | 148 | if (p1 != NULL) |
149 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); | 149 | GNUNET_TRANSPORT_TESTING_stop_peer (p1); |
150 | else | 150 | else |
151 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 1 was not started\n")); | 151 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 1 was not started\n")); |
152 | if (p2 != NULL) | 152 | if (p2 != NULL) |
153 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); | 153 | GNUNET_TRANSPORT_TESTING_stop_peer (p2); |
154 | else | 154 | else |
155 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 2 was not started\n")); | 155 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 2 was not started\n")); |
156 | 156 | ||
@@ -166,8 +166,8 @@ static void | |||
166 | notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | 166 | notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, |
167 | const struct GNUNET_MessageHeader *message) | 167 | const struct GNUNET_MessageHeader *message) |
168 | { | 168 | { |
169 | struct PeerContext *p = cls; | 169 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; |
170 | struct PeerContext *t = NULL; | 170 | struct GNUNET_TRANSPORT_TESTING_PeerContext *t = NULL; |
171 | 171 | ||
172 | if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) | 172 | if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) |
173 | t = p1; | 173 | t = p1; |
@@ -249,7 +249,7 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
249 | static size_t | 249 | static size_t |
250 | notify_ready (void *cls, size_t size, void *buf) | 250 | notify_ready (void *cls, size_t size, void *buf) |
251 | { | 251 | { |
252 | struct PeerContext *p = cls; | 252 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; |
253 | struct GNUNET_MessageHeader *hdr; | 253 | struct GNUNET_MessageHeader *hdr; |
254 | 254 | ||
255 | th = NULL; | 255 | th = NULL; |
@@ -327,8 +327,8 @@ notify_connect (void *cls, | |||
327 | static int c; | 327 | static int c; |
328 | 328 | ||
329 | c++; | 329 | c++; |
330 | struct PeerContext *p = cls; | 330 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; |
331 | struct PeerContext *t = NULL; | 331 | struct GNUNET_TRANSPORT_TESTING_PeerContext *t = NULL; |
332 | 332 | ||
333 | if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) | 333 | if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) |
334 | t = p1; | 334 | t = p1; |
@@ -354,7 +354,7 @@ static void | |||
354 | notify_disconnect (void *cls, | 354 | notify_disconnect (void *cls, |
355 | const struct GNUNET_PeerIdentity *peer) | 355 | const struct GNUNET_PeerIdentity *peer) |
356 | { | 356 | { |
357 | struct PeerContext *p = cls; | 357 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; |
358 | 358 | ||
359 | { | 359 | { |
360 | char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); | 360 | char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); |
@@ -376,9 +376,7 @@ notify_disconnect (void *cls, | |||
376 | 376 | ||
377 | 377 | ||
378 | static void | 378 | static void |
379 | testing_connect_cb (struct PeerContext *p1, | 379 | testing_connect_cb (void *cls) |
380 | struct PeerContext *p2, | ||
381 | void *cls) | ||
382 | { | 380 | { |
383 | cc = NULL; | 381 | cc = NULL; |
384 | 382 | ||
@@ -400,7 +398,7 @@ testing_connect_cb (struct PeerContext *p1, | |||
400 | 398 | ||
401 | 399 | ||
402 | static void | 400 | static void |
403 | start_cb (struct PeerContext *p, void *cls) | 401 | start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p, void *cls) |
404 | { | 402 | { |
405 | static int started; | 403 | static int started; |
406 | started++; | 404 | started++; |
@@ -426,8 +424,7 @@ start_cb (struct PeerContext *p, void *cls) | |||
426 | GNUNET_free (sender_c); | 424 | GNUNET_free (sender_c); |
427 | } | 425 | } |
428 | 426 | ||
429 | cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, | 427 | cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, |
430 | p1, | ||
431 | p2, | 428 | p2, |
432 | &testing_connect_cb, | 429 | &testing_connect_cb, |
433 | NULL); | 430 | NULL); |
@@ -445,12 +442,14 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
445 | s_connected = GNUNET_NO; | 442 | s_connected = GNUNET_NO; |
446 | s_sending = GNUNET_NO; | 443 | s_sending = GNUNET_NO; |
447 | 444 | ||
448 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1, | 445 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, |
446 | cfg_file_p1, 1, | ||
449 | ¬ify_receive, ¬ify_connect, | 447 | ¬ify_receive, ¬ify_connect, |
450 | ¬ify_disconnect, &start_cb, | 448 | ¬ify_disconnect, &start_cb, |
451 | NULL); | 449 | NULL); |
452 | 450 | ||
453 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2, | 451 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, |
452 | cfg_file_p2, 2, | ||
454 | ¬ify_receive, ¬ify_connect, | 453 | ¬ify_receive, ¬ify_connect, |
455 | ¬ify_disconnect, &start_cb, | 454 | ¬ify_disconnect, &start_cb, |
456 | NULL); | 455 | NULL); |
@@ -492,18 +491,18 @@ main (int argc, char *argv[]) | |||
492 | { | 491 | { |
493 | int ret; | 492 | int ret; |
494 | 493 | ||
495 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 494 | test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv[0]); |
496 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); | 495 | test_source = GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__); |
497 | GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source, | 496 | test_plugin = GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], |
498 | &test_plugin); | 497 | test_source); |
499 | 498 | ||
500 | GNUNET_log_setup (test_name, | 499 | GNUNET_log_setup (test_name, |
501 | "WARNING", | 500 | "WARNING", |
502 | NULL); | 501 | NULL); |
503 | tth = GNUNET_TRANSPORT_TESTING_init (); | 502 | tth = GNUNET_TRANSPORT_TESTING_init (); |
504 | 503 | ||
505 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); | 504 | cfg_file_p1 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 1); |
506 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); | 505 | cfg_file_p2 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 2); |
507 | 506 | ||
508 | ret = check (); | 507 | ret = check (); |
509 | 508 | ||