aboutsummaryrefslogtreecommitdiff
path: root/src/cadet/test_cadet_local.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cadet/test_cadet_local.c')
-rw-r--r--src/cadet/test_cadet_local.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cadet/test_cadet_local.c b/src/cadet/test_cadet_local.c
index 0796aaf12..d66f0a3d4 100644
--- a/src/cadet/test_cadet_local.c
+++ b/src/cadet/test_cadet_local.c
@@ -42,9 +42,9 @@ static int result = GNUNET_OK;
42 42
43static int got_data = GNUNET_NO; 43static int got_data = GNUNET_NO;
44 44
45static GNUNET_SCHEDULER_TaskIdentifier abort_task; 45static struct GNUNET_SCHEDULER_Task * abort_task;
46 46
47static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; 47static struct GNUNET_SCHEDULER_Task * shutdown_task;
48 48
49static struct GNUNET_CADET_TransmitHandle *mth; 49static struct GNUNET_CADET_TransmitHandle *mth;
50 50
@@ -66,7 +66,7 @@ static void
66do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 66do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
67{ 67{
68 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shutdown\n"); 68 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shutdown\n");
69 if (GNUNET_SCHEDULER_NO_TASK != abort_task) 69 if (NULL != abort_task)
70 { 70 {
71 GNUNET_SCHEDULER_cancel (abort_task); 71 GNUNET_SCHEDULER_cancel (abort_task);
72 } 72 }
@@ -95,11 +95,11 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
95{ 95{
96 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ABORT\n"); 96 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ABORT\n");
97 result = GNUNET_SYSERR; 97 result = GNUNET_SYSERR;
98 abort_task = GNUNET_SCHEDULER_NO_TASK; 98 abort_task = NULL;
99 if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) 99 if (NULL != shutdown_task)
100 { 100 {
101 GNUNET_SCHEDULER_cancel (shutdown_task); 101 GNUNET_SCHEDULER_cancel (shutdown_task);
102 shutdown_task = GNUNET_SCHEDULER_NO_TASK; 102 shutdown_task = NULL;
103 } 103 }
104 do_shutdown (cls, tc); 104 do_shutdown (cls, tc);
105} 105}
@@ -123,7 +123,7 @@ data_callback (void *cls, struct GNUNET_CADET_Channel *channel,
123{ 123{
124 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Data callback! Shutting down.\n"); 124 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Data callback! Shutting down.\n");
125 got_data = GNUNET_YES; 125 got_data = GNUNET_YES;
126 if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) 126 if (NULL != shutdown_task)
127 GNUNET_SCHEDULER_cancel (shutdown_task); 127 GNUNET_SCHEDULER_cancel (shutdown_task);
128 shutdown_task = 128 shutdown_task =
129 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown, 129 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown,