diff options
Diffstat (limited to 'src/testbed/test_testbed_api_3peers_3controllers.c')
-rw-r--r-- | src/testbed/test_testbed_api_3peers_3controllers.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index 6d88490c1..8a44029d4 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c | |||
@@ -151,12 +151,12 @@ struct GNUNET_TESTBED_HostHabitableCheckHandle *hc_handle; | |||
151 | /** | 151 | /** |
152 | * Abort task identifier | 152 | * Abort task identifier |
153 | */ | 153 | */ |
154 | static GNUNET_SCHEDULER_TaskIdentifier abort_task; | 154 | static struct GNUNET_SCHEDULER_Task * abort_task; |
155 | 155 | ||
156 | /** | 156 | /** |
157 | * Delayed connect job identifier | 157 | * Delayed connect job identifier |
158 | */ | 158 | */ |
159 | static GNUNET_SCHEDULER_TaskIdentifier delayed_connect_task; | 159 | static struct GNUNET_SCHEDULER_Task * delayed_connect_task; |
160 | 160 | ||
161 | /** | 161 | /** |
162 | * Different stages in testing | 162 | * Different stages in testing |
@@ -259,11 +259,11 @@ static enum Stage result; | |||
259 | static void | 259 | static void |
260 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 260 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
261 | { | 261 | { |
262 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 262 | if (NULL != abort_task) |
263 | GNUNET_SCHEDULER_cancel (abort_task); | 263 | GNUNET_SCHEDULER_cancel (abort_task); |
264 | if (NULL != hc_handle) | 264 | if (NULL != hc_handle) |
265 | GNUNET_TESTBED_is_host_habitable_cancel (hc_handle); | 265 | GNUNET_TESTBED_is_host_habitable_cancel (hc_handle); |
266 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == delayed_connect_task); | 266 | GNUNET_assert (NULL == delayed_connect_task); |
267 | if (NULL != common_operation) | 267 | if (NULL != common_operation) |
268 | GNUNET_TESTBED_operation_done (common_operation); | 268 | GNUNET_TESTBED_operation_done (common_operation); |
269 | if (NULL != reg_handle) | 269 | if (NULL != reg_handle) |
@@ -294,11 +294,11 @@ static void | |||
294 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 294 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
295 | { | 295 | { |
296 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 296 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
297 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 297 | abort_task = NULL; |
298 | if (GNUNET_SCHEDULER_NO_TASK != delayed_connect_task) | 298 | if (NULL != delayed_connect_task) |
299 | { | 299 | { |
300 | GNUNET_SCHEDULER_cancel (delayed_connect_task); | 300 | GNUNET_SCHEDULER_cancel (delayed_connect_task); |
301 | delayed_connect_task = GNUNET_SCHEDULER_NO_TASK; | 301 | delayed_connect_task = NULL; |
302 | } | 302 | } |
303 | do_shutdown (cls, tc); | 303 | do_shutdown (cls, tc); |
304 | } | 304 | } |
@@ -306,7 +306,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
306 | static void | 306 | static void |
307 | abort_test () | 307 | abort_test () |
308 | { | 308 | { |
309 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 309 | if (NULL != abort_task) |
310 | GNUNET_SCHEDULER_cancel (abort_task); | 310 | GNUNET_SCHEDULER_cancel (abort_task); |
311 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); | 311 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); |
312 | } | 312 | } |
@@ -333,7 +333,7 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg); | |||
333 | static void | 333 | static void |
334 | do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 334 | do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
335 | { | 335 | { |
336 | delayed_connect_task = GNUNET_SCHEDULER_NO_TASK; | 336 | delayed_connect_task = NULL; |
337 | if (NULL != common_operation) | 337 | if (NULL != common_operation) |
338 | { | 338 | { |
339 | GNUNET_break (0); | 339 | GNUNET_break (0); |
@@ -859,7 +859,7 @@ host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *_host, | |||
859 | "to use password less SSH logins to localhost.\n" | 859 | "to use password less SSH logins to localhost.\n" |
860 | "Skipping test\n"); | 860 | "Skipping test\n"); |
861 | GNUNET_SCHEDULER_cancel (abort_task); | 861 | GNUNET_SCHEDULER_cancel (abort_task); |
862 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 862 | abort_task = NULL; |
863 | (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 863 | (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |
864 | result = SKIP; | 864 | result = SKIP; |
865 | return; | 865 | return; |