diff options
Diffstat (limited to 'src/testbed/test_testbed_api_controllerlink.c')
-rw-r--r-- | src/testbed/test_testbed_api_controllerlink.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 78d4d3bc7..fd876a07f 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c | |||
@@ -300,7 +300,7 @@ static enum Stage result; | |||
300 | if (NULL != abort_task) \ | 300 | if (NULL != abort_task) \ |
301 | GNUNET_SCHEDULER_cancel (abort_task); \ | 301 | GNUNET_SCHEDULER_cancel (abort_task); \ |
302 | abort_task = NULL; \ | 302 | abort_task = NULL; \ |
303 | GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ | 303 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); \ |
304 | return; \ | 304 | return; \ |
305 | } \ | 305 | } \ |
306 | } while (0) | 306 | } while (0) |
@@ -310,10 +310,9 @@ static enum Stage result; | |||
310 | * Shutdown nicely | 310 | * Shutdown nicely |
311 | * | 311 | * |
312 | * @param cls NULL | 312 | * @param cls NULL |
313 | * @param tc the task context | ||
314 | */ | 313 | */ |
315 | static void | 314 | static void |
316 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 315 | do_shutdown (void *cls) |
317 | { | 316 | { |
318 | if (NULL != abort_task) | 317 | if (NULL != abort_task) |
319 | GNUNET_SCHEDULER_cancel (abort_task); | 318 | GNUNET_SCHEDULER_cancel (abort_task); |
@@ -349,14 +348,13 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
349 | * abort task to run on test timed out | 348 | * abort task to run on test timed out |
350 | * | 349 | * |
351 | * @param cls NULL | 350 | * @param cls NULL |
352 | * @param tc the task context | ||
353 | */ | 351 | */ |
354 | static void | 352 | static void |
355 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 353 | do_abort (void *cls) |
356 | { | 354 | { |
357 | LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); | 355 | LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); |
358 | abort_task = NULL; | 356 | abort_task = NULL; |
359 | do_shutdown (cls, tc); | 357 | do_shutdown (cls); |
360 | } | 358 | } |
361 | 359 | ||
362 | 360 | ||
@@ -392,7 +390,7 @@ registration_cont (void *cls, const char *emsg); | |||
392 | * @return | 390 | * @return |
393 | */ | 391 | */ |
394 | static void | 392 | static void |
395 | delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 393 | delay_task (void *cls) |
396 | { | 394 | { |
397 | delay_task_id = NULL; | 395 | delay_task_id = NULL; |
398 | switch (result) | 396 | switch (result) |
@@ -644,8 +642,8 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
644 | result = SUCCESS; | 642 | result = SUCCESS; |
645 | GNUNET_TESTBED_operation_done (op); | 643 | GNUNET_TESTBED_operation_done (op); |
646 | op = NULL; | 644 | op = NULL; |
647 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 645 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, |
648 | (GNUNET_TIME_UNIT_SECONDS, 1), &do_shutdown, | 646 | &do_shutdown, |
649 | NULL); | 647 | NULL); |
650 | break; | 648 | break; |
651 | default: | 649 | default: |