aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_transport_api_reliability.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-10-10 10:50:08 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-10-10 10:50:08 +0000
commit98aa0c158ee5cf82097432eff4cd15da2993198d (patch)
treeab69b7ae76b430ec5c510d488344b36cdd0ae14f /src/transport/test_transport_api_reliability.c
parent094a3aa5ed1723f6cf17498b3d233c61736b399a (diff)
downloadgnunet-98aa0c158ee5cf82097432eff4cd15da2993198d.tar.gz
gnunet-98aa0c158ee5cf82097432eff4cd15da2993198d.zip
fixes
Diffstat (limited to 'src/transport/test_transport_api_reliability.c')
-rw-r--r--src/transport/test_transport_api_reliability.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 21912e848..5d17b8d7e 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -81,6 +81,9 @@ char *cfg_file_p2;
81 81
82struct GNUNET_TRANSPORT_TESTING_handle * tth; 82struct GNUNET_TRANSPORT_TESTING_handle * tth;
83 83
84static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
85
86
84/* 87/*
85 * Testcase specific declarations 88 * Testcase specific declarations
86 */ 89 */
@@ -147,8 +150,13 @@ end ()
147 GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); 150 GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
148 th = NULL; 151 th = NULL;
149 152
153 if (cc != NULL)
154 GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
155
150 GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); 156 GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
151 GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); 157 GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
158
159 GNUNET_TRANSPORT_TESTING_done (tth);
152} 160}
153 161
154static void 162static void
@@ -166,6 +174,9 @@ end_badly ()
166 GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); 174 GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
167 th = NULL; 175 th = NULL;
168 176
177 if (cc != NULL)
178 GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
179
169 if (p1 != NULL) 180 if (p1 != NULL)
170 GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); 181 GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
171 if (p2 != NULL) 182 if (p2 != NULL)
@@ -402,7 +413,10 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
402 p2->no, GNUNET_i2s (&p2->id)); 413 p2->no, GNUNET_i2s (&p2->id));
403 GNUNET_free (p1_c); 414 GNUNET_free (p1_c);
404 415
416 cc = NULL;
417
405 GNUNET_SCHEDULER_add_now (&sendtask, NULL); 418 GNUNET_SCHEDULER_add_now (&sendtask, NULL);
419
406} 420}
407 421
408void start_cb (struct PeerContext * p, 422void start_cb (struct PeerContext * p,
@@ -435,7 +449,7 @@ void start_cb (struct PeerContext * p,
435 sender->no, sender_c, 449 sender->no, sender_c,
436 receiver->no, GNUNET_i2s (&receiver->id)); 450 receiver->no, GNUNET_i2s (&receiver->id));
437 451
438 GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, NULL); 452 cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, NULL);
439 453
440} 454}
441 455