aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_testbed_api_2peers_1controller.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/test_testbed_api_2peers_1controller.c')
-rw-r--r--src/testbed/test_testbed_api_2peers_1controller.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c
index 18bff91e9..64963c1a7 100644
--- a/src/testbed/test_testbed_api_2peers_1controller.c
+++ b/src/testbed/test_testbed_api_2peers_1controller.c
@@ -112,12 +112,12 @@ static struct GNUNET_TESTBED_Operation *common_operation;
112/** 112/**
113 * Abort task identifier 113 * Abort task identifier
114 */ 114 */
115static GNUNET_SCHEDULER_TaskIdentifier abort_task; 115static struct GNUNET_SCHEDULER_Task * abort_task;
116 116
117/** 117/**
118 * Delayed connect job identifier 118 * Delayed connect job identifier
119 */ 119 */
120static GNUNET_SCHEDULER_TaskIdentifier delayed_connect_task; 120static struct GNUNET_SCHEDULER_Task * delayed_connect_task;
121 121
122/** 122/**
123 * Different stages in testing 123 * Different stages in testing
@@ -173,9 +173,9 @@ static enum Stage result;
173#define FAIL_TEST(cond) do { \ 173#define FAIL_TEST(cond) do { \
174 if (!(cond)) { \ 174 if (!(cond)) { \
175 GNUNET_break(0); \ 175 GNUNET_break(0); \
176 if (GNUNET_SCHEDULER_NO_TASK != abort_task) \ 176 if (NULL != abort_task) \
177 GNUNET_SCHEDULER_cancel (abort_task); \ 177 GNUNET_SCHEDULER_cancel (abort_task); \
178 abort_task = GNUNET_SCHEDULER_NO_TASK; \ 178 abort_task = NULL; \
179 GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ 179 GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \
180 return; \ 180 return; \
181 } \ 181 } \
@@ -191,9 +191,9 @@ static enum Stage result;
191static void 191static void
192do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 192do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
193{ 193{
194 if (GNUNET_SCHEDULER_NO_TASK != abort_task) 194 if (NULL != abort_task)
195 GNUNET_SCHEDULER_cancel (abort_task); 195 GNUNET_SCHEDULER_cancel (abort_task);
196 if (GNUNET_SCHEDULER_NO_TASK != delayed_connect_task) 196 if (NULL != delayed_connect_task)
197 GNUNET_SCHEDULER_cancel (delayed_connect_task); 197 GNUNET_SCHEDULER_cancel (delayed_connect_task);
198 if (NULL != reg_handle) 198 if (NULL != reg_handle)
199 GNUNET_TESTBED_cancel_registration (reg_handle); 199 GNUNET_TESTBED_cancel_registration (reg_handle);
@@ -216,7 +216,7 @@ static void
216do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 216do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
217{ 217{
218 LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); 218 LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
219 abort_task = GNUNET_SCHEDULER_NO_TASK; 219 abort_task = NULL;
220 do_shutdown (cls, tc); 220 do_shutdown (cls, tc);
221} 221}
222 222
@@ -242,7 +242,7 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg);
242static void 242static void
243do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 243do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
244{ 244{
245 delayed_connect_task = GNUNET_SCHEDULER_NO_TASK; 245 delayed_connect_task = NULL;
246 FAIL_TEST (NULL == common_operation); 246 FAIL_TEST (NULL == common_operation);
247 common_operation = 247 common_operation =
248 GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer, 248 GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer,