aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_transport_testing.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport/test_transport_testing.c')
-rw-r--r--src/transport/test_transport_testing.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c
index 747168b17..fb5bf6068 100644
--- a/src/transport/test_transport_testing.c
+++ b/src/transport/test_transport_testing.c
@@ -34,7 +34,7 @@
34 */ 34 */
35#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) 35#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
36 36
37GNUNET_SCHEDULER_TaskIdentifier timeout_task; 37struct GNUNET_SCHEDULER_Task * timeout_task;
38 38
39static struct PeerContext *p1; 39static struct PeerContext *p1;
40static struct PeerContext *p2; 40static struct PeerContext *p2;
@@ -52,7 +52,7 @@ end ()
52{ 52{
53 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); 53 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
54 54
55 if (timeout_task != GNUNET_SCHEDULER_NO_TASK) 55 if (timeout_task != NULL)
56 GNUNET_SCHEDULER_cancel (timeout_task); 56 GNUNET_SCHEDULER_cancel (timeout_task);
57 57
58 GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); 58 GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
@@ -64,7 +64,7 @@ end ()
64static void 64static void
65end_badly () 65end_badly ()
66{ 66{
67 timeout_task = GNUNET_SCHEDULER_NO_TASK; 67 timeout_task = NULL;
68 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); 68 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
69 69
70 if (NULL != cc) 70 if (NULL != cc)
@@ -167,7 +167,7 @@ run (void *cls, char *const *args, const char *cfgfile,
167 { 167 {
168 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 168 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
169 "Peer1 was not started successfully\n"); 169 "Peer1 was not started successfully\n");
170 if (timeout_task != GNUNET_SCHEDULER_NO_TASK) 170 if (timeout_task != NULL)
171 GNUNET_SCHEDULER_cancel (timeout_task); 171 GNUNET_SCHEDULER_cancel (timeout_task);
172 timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); 172 timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
173 } 173 }
@@ -175,7 +175,7 @@ run (void *cls, char *const *args, const char *cfgfile,
175 { 175 {
176 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 176 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
177 "Peer2 was not started successfully\n"); 177 "Peer2 was not started successfully\n");
178 if (timeout_task != GNUNET_SCHEDULER_NO_TASK) 178 if (timeout_task != NULL)
179 GNUNET_SCHEDULER_cancel (timeout_task); 179 GNUNET_SCHEDULER_cancel (timeout_task);
180 timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); 180 timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
181 } 181 }