aboutsummaryrefslogtreecommitdiff
path: root/src/pt/test_gns_vpn.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pt/test_gns_vpn.c')
-rw-r--r--src/pt/test_gns_vpn.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index eaf94dfa7..e9c89b42a 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -45,9 +45,9 @@ static struct GNUNET_NAMESTORE_Handle *namestore;
45 45
46static struct MHD_Daemon *mhd; 46static struct MHD_Daemon *mhd;
47 47
48static GNUNET_SCHEDULER_TaskIdentifier mhd_task_id; 48static struct GNUNET_SCHEDULER_Task * mhd_task_id;
49 49
50static GNUNET_SCHEDULER_TaskIdentifier curl_task_id; 50static struct GNUNET_SCHEDULER_Task * curl_task_id;
51 51
52static CURL *curl; 52static CURL *curl;
53 53
@@ -131,15 +131,15 @@ mhd_ahc (void *cls,
131static void 131static void
132do_shutdown () 132do_shutdown ()
133{ 133{
134 if (mhd_task_id != GNUNET_SCHEDULER_NO_TASK) 134 if (mhd_task_id != NULL)
135 { 135 {
136 GNUNET_SCHEDULER_cancel (mhd_task_id); 136 GNUNET_SCHEDULER_cancel (mhd_task_id);
137 mhd_task_id = GNUNET_SCHEDULER_NO_TASK; 137 mhd_task_id = NULL;
138 } 138 }
139 if (curl_task_id != GNUNET_SCHEDULER_NO_TASK) 139 if (curl_task_id != NULL)
140 { 140 {
141 GNUNET_SCHEDULER_cancel (curl_task_id); 141 GNUNET_SCHEDULER_cancel (curl_task_id);
142 curl_task_id = GNUNET_SCHEDULER_NO_TASK; 142 curl_task_id = NULL;
143 } 143 }
144 if (NULL != mhd) 144 if (NULL != mhd)
145 { 145 {
@@ -162,7 +162,7 @@ static void
162curl_task (void *cls, 162curl_task (void *cls,
163 const struct GNUNET_SCHEDULER_TaskContext *tc) 163 const struct GNUNET_SCHEDULER_TaskContext *tc)
164{ 164{
165 curl_task_id = GNUNET_SCHEDULER_NO_TASK; 165 curl_task_id = NULL;
166 curl_main (); 166 curl_main ();
167} 167}
168 168
@@ -311,7 +311,7 @@ static void
311mhd_task (void *cls, 311mhd_task (void *cls,
312 const struct GNUNET_SCHEDULER_TaskContext *tc) 312 const struct GNUNET_SCHEDULER_TaskContext *tc)
313{ 313{
314 mhd_task_id = GNUNET_SCHEDULER_NO_TASK; 314 mhd_task_id = NULL;
315 MHD_run (mhd); 315 MHD_run (mhd);
316 mhd_main (); 316 mhd_main ();
317} 317}
@@ -329,7 +329,7 @@ mhd_main ()
329 unsigned MHD_LONG_LONG timeout; 329 unsigned MHD_LONG_LONG timeout;
330 struct GNUNET_TIME_Relative delay; 330 struct GNUNET_TIME_Relative delay;
331 331
332 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == mhd_task_id); 332 GNUNET_assert (NULL == mhd_task_id);
333 FD_ZERO (&rs); 333 FD_ZERO (&rs);
334 FD_ZERO (&ws); 334 FD_ZERO (&ws);
335 FD_ZERO (&es); 335 FD_ZERO (&es);