aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_gnunet_helper_testbed.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/test_gnunet_helper_testbed.c')
-rw-r--r--src/testbed/test_gnunet_helper_testbed.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c
index cf4559c26..43177c894 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -58,12 +58,12 @@ static struct GNUNET_HELPER_SendHandle *shandle;
58/** 58/**
59 * Abort task identifier 59 * Abort task identifier
60 */ 60 */
61static GNUNET_SCHEDULER_TaskIdentifier abort_task; 61static struct GNUNET_SCHEDULER_Task * abort_task;
62 62
63/** 63/**
64 * Shutdown task identifier 64 * Shutdown task identifier
65 */ 65 */
66static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; 66static struct GNUNET_SCHEDULER_Task * shutdown_task;
67 67
68/** 68/**
69 * Configuratin handler 69 * Configuratin handler
@@ -85,7 +85,7 @@ static int result;
85static void 85static void
86do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 86do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
87{ 87{
88 if (GNUNET_SCHEDULER_NO_TASK != abort_task) 88 if (NULL != abort_task)
89 GNUNET_SCHEDULER_cancel (abort_task); 89 GNUNET_SCHEDULER_cancel (abort_task);
90 if (NULL != helper) 90 if (NULL != helper)
91 GNUNET_HELPER_stop (helper, GNUNET_NO); 91 GNUNET_HELPER_stop (helper, GNUNET_NO);
@@ -104,12 +104,12 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
104static void 104static void
105do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 105do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
106{ 106{
107 abort_task = GNUNET_SCHEDULER_NO_TASK; 107 abort_task = NULL;
108 LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); 108 LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
109 result = GNUNET_SYSERR; 109 result = GNUNET_SYSERR;
110 if (NULL != shandle) 110 if (NULL != shandle)
111 GNUNET_HELPER_send_cancel (shandle); 111 GNUNET_HELPER_send_cancel (shandle);
112 if (GNUNET_SCHEDULER_NO_TASK == shutdown_task) 112 if (NULL == shutdown_task)
113 shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); 113 shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
114} 114}
115 115
@@ -167,7 +167,7 @@ mst_cb (void *cls, void *client, const struct GNUNET_MessageHeader *message)
167 uncompress ((Bytef *) config, &config_size, 167 uncompress ((Bytef *) config, &config_size,
168 (const Bytef *) &msg[1], xconfig_size)); 168 (const Bytef *) &msg[1], xconfig_size));
169 GNUNET_free (config); 169 GNUNET_free (config);
170 if (GNUNET_SCHEDULER_NO_TASK == shutdown_task) 170 if (NULL == shutdown_task)
171 shutdown_task = 171 shutdown_task =
172 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 172 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
173 (GNUNET_TIME_UNIT_SECONDS, 1), 173 (GNUNET_TIME_UNIT_SECONDS, 1),