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_blacklisting.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_blacklisting.c')
-rw-r--r-- | src/transport/test_transport_api_blacklisting.c | 70 |
1 files changed, 40 insertions, 30 deletions
diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c index 963d3b045..8dce4d48d 100644 --- a/src/transport/test_transport_api_blacklisting.c +++ b/src/transport/test_transport_api_blacklisting.c | |||
@@ -28,15 +28,15 @@ | |||
28 | #include "gnunet_transport_service.h" | 28 | #include "gnunet_transport_service.h" |
29 | #include "transport-testing.h" | 29 | #include "transport-testing.h" |
30 | 30 | ||
31 | static struct PeerContext *p1; | 31 | static struct GNUNET_TRANSPORT_TESTING_PeerContext *p1; |
32 | 32 | ||
33 | static struct PeerContext *p2; | 33 | static struct GNUNET_TRANSPORT_TESTING_PeerContext *p2; |
34 | 34 | ||
35 | static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc; | 35 | static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc; |
36 | 36 | ||
37 | static struct GNUNET_TRANSPORT_TransmitHandle *th; | 37 | static struct GNUNET_TRANSPORT_TransmitHandle *th; |
38 | 38 | ||
39 | static struct GNUNET_TRANSPORT_TESTING_handle *tth; | 39 | static struct GNUNET_TRANSPORT_TESTING_Handle *tth; |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * How long until we give up on transmitting the message? | 42 | * How long until we give up on transmitting the message? |
@@ -91,7 +91,7 @@ end (void *cls) | |||
91 | 91 | ||
92 | if (cc != NULL) | 92 | if (cc != NULL) |
93 | { | 93 | { |
94 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc); | 94 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel(cc); |
95 | cc = NULL; | 95 | cc = NULL; |
96 | } | 96 | } |
97 | 97 | ||
@@ -113,12 +113,12 @@ end (void *cls) | |||
113 | 113 | ||
114 | if (p1 != NULL) | 114 | if (p1 != NULL) |
115 | { | 115 | { |
116 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); | 116 | GNUNET_TRANSPORT_TESTING_stop_peer (p1); |
117 | p1 = NULL; | 117 | p1 = NULL; |
118 | } | 118 | } |
119 | if (p2 != NULL) | 119 | if (p2 != NULL) |
120 | { | 120 | { |
121 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); | 121 | GNUNET_TRANSPORT_TESTING_stop_peer (p2); |
122 | p2 = NULL; | 122 | p2 = NULL; |
123 | } | 123 | } |
124 | 124 | ||
@@ -155,7 +155,7 @@ end_badly (void *cls) | |||
155 | if (cc != NULL) | 155 | if (cc != NULL) |
156 | { | 156 | { |
157 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n")); | 157 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n")); |
158 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc); | 158 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc); |
159 | cc = NULL; | 159 | cc = NULL; |
160 | } | 160 | } |
161 | 161 | ||
@@ -170,9 +170,9 @@ end_badly (void *cls) | |||
170 | GNUNET_TRANSPORT_blacklist_cancel (blacklist_p2); | 170 | GNUNET_TRANSPORT_blacklist_cancel (blacklist_p2); |
171 | 171 | ||
172 | if (p1 != NULL) | 172 | if (p1 != NULL) |
173 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); | 173 | GNUNET_TRANSPORT_TESTING_stop_peer (p1); |
174 | if (p2 != NULL) | 174 | if (p2 != NULL) |
175 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); | 175 | GNUNET_TRANSPORT_TESTING_stop_peer (p2); |
176 | 176 | ||
177 | ok = GNUNET_SYSERR; | 177 | ok = GNUNET_SYSERR; |
178 | } | 178 | } |
@@ -182,8 +182,8 @@ static void | |||
182 | notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | 182 | notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, |
183 | const struct GNUNET_MessageHeader *message) | 183 | const struct GNUNET_MessageHeader *message) |
184 | { | 184 | { |
185 | struct PeerContext *p = cls; | 185 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; |
186 | struct PeerContext *t = NULL; | 186 | struct GNUNET_TRANSPORT_TESTING_PeerContext *t = NULL; |
187 | 187 | ||
188 | if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) | 188 | if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) |
189 | t = p1; | 189 | t = p1; |
@@ -217,7 +217,7 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
217 | static size_t | 217 | static size_t |
218 | notify_ready (void *cls, size_t size, void *buf) | 218 | notify_ready (void *cls, size_t size, void *buf) |
219 | { | 219 | { |
220 | struct PeerContext *p = cls; | 220 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; |
221 | struct GNUNET_MessageHeader *hdr; | 221 | struct GNUNET_MessageHeader *hdr; |
222 | 222 | ||
223 | th = NULL; | 223 | th = NULL; |
@@ -283,8 +283,8 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
283 | static int c; | 283 | static int c; |
284 | 284 | ||
285 | c++; | 285 | c++; |
286 | struct PeerContext *p = cls; | 286 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; |
287 | struct PeerContext *t = NULL; | 287 | struct GNUNET_TRANSPORT_TESTING_PeerContext *t = NULL; |
288 | 288 | ||
289 | connected = GNUNET_YES; | 289 | connected = GNUNET_YES; |
290 | if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) | 290 | if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))) |
@@ -310,7 +310,7 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
310 | static void | 310 | static void |
311 | notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) | 311 | notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) |
312 | { | 312 | { |
313 | struct PeerContext *p = cls; | 313 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; |
314 | char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); | 314 | char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); |
315 | 315 | ||
316 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 316 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -326,7 +326,7 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
326 | 326 | ||
327 | 327 | ||
328 | static void | 328 | static void |
329 | testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) | 329 | testing_connect_cb (void *cls) |
330 | { | 330 | { |
331 | cc = NULL; | 331 | cc = NULL; |
332 | char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); | 332 | char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); |
@@ -347,7 +347,7 @@ blacklist_cb (void *cls, | |||
347 | const struct | 347 | const struct |
348 | GNUNET_PeerIdentity * pid) | 348 | GNUNET_PeerIdentity * pid) |
349 | { | 349 | { |
350 | struct PeerContext * p = cls; | 350 | struct GNUNET_TRANSPORT_TESTING_PeerContext * p = cls; |
351 | int res = GNUNET_SYSERR; | 351 | int res = GNUNET_SYSERR; |
352 | 352 | ||
353 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 353 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -376,7 +376,7 @@ blacklist_cb (void *cls, | |||
376 | 376 | ||
377 | 377 | ||
378 | static void | 378 | static void |
379 | start_cb (struct PeerContext *p, void *cls) | 379 | start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p, void *cls) |
380 | { | 380 | { |
381 | static int started; | 381 | static int started; |
382 | 382 | ||
@@ -395,7 +395,9 @@ start_cb (struct PeerContext *p, void *cls) | |||
395 | p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id)); | 395 | p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id)); |
396 | GNUNET_free (sender_c); | 396 | GNUNET_free (sender_c); |
397 | 397 | ||
398 | cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, | 398 | cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, |
399 | p2, | ||
400 | &testing_connect_cb, | ||
399 | NULL); | 401 | NULL); |
400 | 402 | ||
401 | } | 403 | } |
@@ -405,28 +407,36 @@ static void | |||
405 | run (void *cls, char *const *args, const char *cfgfile, | 407 | run (void *cls, char *const *args, const char *cfgfile, |
406 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 408 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
407 | { | 409 | { |
408 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); | 410 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
411 | &end_badly, | ||
412 | NULL); | ||
409 | connected = GNUNET_NO; | 413 | connected = GNUNET_NO; |
410 | blacklist_request_p1 = GNUNET_NO; | 414 | blacklist_request_p1 = GNUNET_NO; |
411 | blacklist_request_p2 = GNUNET_NO; | 415 | blacklist_request_p2 = GNUNET_NO; |
412 | 416 | ||
413 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_api_tcp_peer1.conf", 1, | 417 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, |
414 | ¬ify_receive, ¬ify_connect, | 418 | "test_transport_api_tcp_peer1.conf", 1, |
415 | ¬ify_disconnect, &start_cb, | 419 | ¬ify_receive, |
420 | ¬ify_connect, | ||
421 | ¬ify_disconnect, | ||
422 | &start_cb, | ||
416 | NULL); | 423 | NULL); |
417 | 424 | ||
418 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_api_tcp_peer2.conf", 2, | 425 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, |
419 | ¬ify_receive, ¬ify_connect, | 426 | "test_transport_api_tcp_peer2.conf", 2, |
420 | ¬ify_disconnect, &start_cb, | 427 | ¬ify_receive, |
428 | ¬ify_connect, | ||
429 | ¬ify_disconnect, | ||
430 | &start_cb, | ||
421 | NULL); | 431 | NULL); |
422 | 432 | ||
423 | blacklist_p1 = GNUNET_TRANSPORT_blacklist (p1->cfg, | 433 | blacklist_p1 = GNUNET_TRANSPORT_blacklist (p1->cfg, |
424 | &blacklist_cb, | 434 | &blacklist_cb, |
425 | p1); | 435 | p1); |
426 | 436 | ||
427 | blacklist_p2 = GNUNET_TRANSPORT_blacklist (p2->cfg, | 437 | blacklist_p2 = GNUNET_TRANSPORT_blacklist (p2->cfg, |
428 | &blacklist_cb, | 438 | &blacklist_cb, |
429 | p2); | 439 | p2); |
430 | 440 | ||
431 | GNUNET_assert (blacklist_p1 != NULL); | 441 | GNUNET_assert (blacklist_p1 != NULL); |
432 | GNUNET_assert (blacklist_p2 != NULL); | 442 | GNUNET_assert (blacklist_p2 != NULL); |