aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_testbed_api_peers_manage_services.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/test_testbed_api_peers_manage_services.c')
-rw-r--r--src/testbed/test_testbed_api_peers_manage_services.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c
index 63c089e19..fedaae295 100644
--- a/src/testbed/test_testbed_api_peers_manage_services.c
+++ b/src/testbed/test_testbed_api_peers_manage_services.c
@@ -52,7 +52,7 @@ static void *dummy_cls = (void *) 0xDEAD0001;
52/** 52/**
53 * Abort task identifier 53 * Abort task identifier
54 */ 54 */
55static GNUNET_SCHEDULER_TaskIdentifier abort_task; 55static struct GNUNET_SCHEDULER_Task * abort_task;
56 56
57/** 57/**
58 * States in this test 58 * States in this test
@@ -91,7 +91,7 @@ enum {
91#define FAIL_TEST(cond, ret) do { \ 91#define FAIL_TEST(cond, ret) do { \
92 if (!(cond)) { \ 92 if (!(cond)) { \
93 GNUNET_break(0); \ 93 GNUNET_break(0); \
94 if (GNUNET_SCHEDULER_NO_TASK != abort_task) \ 94 if (NULL != abort_task) \
95 GNUNET_SCHEDULER_cancel (abort_task); \ 95 GNUNET_SCHEDULER_cancel (abort_task); \
96 abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ 96 abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \
97 ret; \ 97 ret; \
@@ -109,7 +109,7 @@ static void
109do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 109do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
110{ 110{
111 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); 111 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n");
112 abort_task = GNUNET_SCHEDULER_NO_TASK; 112 abort_task = NULL;
113 if (NULL != op) 113 if (NULL != op)
114 { 114 {
115 GNUNET_TESTBED_operation_done (op); 115 GNUNET_TESTBED_operation_done (op);
@@ -151,7 +151,7 @@ op_comp_cb (void *cls,
151 case STATE_SERVICE_DOWN: 151 case STATE_SERVICE_DOWN:
152 state = STATE_SERVICE_UP; 152 state = STATE_SERVICE_UP;
153 GNUNET_SCHEDULER_cancel (abort_task); 153 GNUNET_SCHEDULER_cancel (abort_task);
154 abort_task = GNUNET_SCHEDULER_NO_TASK; 154 abort_task = NULL;
155 state = STATE_OK; 155 state = STATE_OK;
156 GNUNET_SCHEDULER_shutdown (); 156 GNUNET_SCHEDULER_shutdown ();
157 break; 157 break;