diff options
Diffstat (limited to 'src/transport/test_transport_api_manipulation_cfg.c')
-rw-r--r-- | src/transport/test_transport_api_manipulation_cfg.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c index 49e74ffaf..e7cccb812 100644 --- a/src/transport/test_transport_api_manipulation_cfg.c +++ b/src/transport/test_transport_api_manipulation_cfg.c | |||
@@ -67,9 +67,9 @@ static int s_connected; | |||
67 | 67 | ||
68 | static int s_sending; | 68 | static int s_sending; |
69 | 69 | ||
70 | static GNUNET_SCHEDULER_TaskIdentifier die_task; | 70 | static struct GNUNET_SCHEDULER_Task * die_task; |
71 | 71 | ||
72 | static GNUNET_SCHEDULER_TaskIdentifier send_task; | 72 | static struct GNUNET_SCHEDULER_Task * send_task; |
73 | 73 | ||
74 | static struct PeerContext *p1; | 74 | static struct PeerContext *p1; |
75 | 75 | ||
@@ -93,10 +93,10 @@ end () | |||
93 | { | 93 | { |
94 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); | 94 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); |
95 | 95 | ||
96 | if (send_task != GNUNET_SCHEDULER_NO_TASK) | 96 | if (send_task != NULL) |
97 | GNUNET_SCHEDULER_cancel (send_task); | 97 | GNUNET_SCHEDULER_cancel (send_task); |
98 | 98 | ||
99 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 99 | if (die_task != NULL) |
100 | GNUNET_SCHEDULER_cancel (die_task); | 100 | GNUNET_SCHEDULER_cancel (die_task); |
101 | 101 | ||
102 | if (th != NULL) | 102 | if (th != NULL) |
@@ -110,12 +110,12 @@ end () | |||
110 | static void | 110 | static void |
111 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 111 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
112 | { | 112 | { |
113 | die_task = GNUNET_SCHEDULER_NO_TASK; | 113 | die_task = NULL; |
114 | 114 | ||
115 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); | 115 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); |
116 | 116 | ||
117 | 117 | ||
118 | if (send_task != GNUNET_SCHEDULER_NO_TASK) | 118 | if (send_task != NULL) |
119 | GNUNET_SCHEDULER_cancel (send_task); | 119 | GNUNET_SCHEDULER_cancel (send_task); |
120 | 120 | ||
121 | if (cc != NULL) | 121 | if (cc != NULL) |
@@ -172,7 +172,7 @@ notify_request_ready (void *cls, size_t size, void *buf) | |||
172 | { | 172 | { |
173 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 173 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
174 | "Timeout occurred while waiting for transmit_ready\n"); | 174 | "Timeout occurred while waiting for transmit_ready\n"); |
175 | if (GNUNET_SCHEDULER_NO_TASK != die_task) | 175 | if (NULL != die_task) |
176 | GNUNET_SCHEDULER_cancel (die_task); | 176 | GNUNET_SCHEDULER_cancel (die_task); |
177 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 177 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
178 | ok = 42; | 178 | ok = 42; |
@@ -201,7 +201,7 @@ notify_request_ready (void *cls, size_t size, void *buf) | |||
201 | static void | 201 | static void |
202 | sendtask_request_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 202 | sendtask_request_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
203 | { | 203 | { |
204 | send_task = GNUNET_SCHEDULER_NO_TASK; | 204 | send_task = NULL; |
205 | 205 | ||
206 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) | 206 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) |
207 | return; | 207 | return; |
@@ -232,7 +232,7 @@ notify_response_ready (void *cls, size_t size, void *buf) | |||
232 | { | 232 | { |
233 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 233 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
234 | "Timeout occurred while waiting for transmit_ready\n"); | 234 | "Timeout occurred while waiting for transmit_ready\n"); |
235 | if (GNUNET_SCHEDULER_NO_TASK != die_task) | 235 | if (NULL != die_task) |
236 | GNUNET_SCHEDULER_cancel (die_task); | 236 | GNUNET_SCHEDULER_cancel (die_task); |
237 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 237 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
238 | ok = 42; | 238 | ok = 42; |
@@ -261,7 +261,7 @@ notify_response_ready (void *cls, size_t size, void *buf) | |||
261 | static void | 261 | static void |
262 | sendtask_response_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 262 | sendtask_response_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
263 | { | 263 | { |
264 | send_task = GNUNET_SCHEDULER_NO_TASK; | 264 | send_task = NULL; |
265 | 265 | ||
266 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) | 266 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) |
267 | return; | 267 | return; |
@@ -458,7 +458,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
458 | if ((p1 == NULL) || (p2 == NULL)) | 458 | if ((p1 == NULL) || (p2 == NULL)) |
459 | { | 459 | { |
460 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); | 460 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); |
461 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 461 | if (die_task != NULL) |
462 | GNUNET_SCHEDULER_cancel (die_task); | 462 | GNUNET_SCHEDULER_cancel (die_task); |
463 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 463 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
464 | return; | 464 | return; |
@@ -478,7 +478,7 @@ check () | |||
478 | GNUNET_GETOPT_OPTION_END | 478 | GNUNET_GETOPT_OPTION_END |
479 | }; | 479 | }; |
480 | 480 | ||
481 | send_task = GNUNET_SCHEDULER_NO_TASK; | 481 | send_task = NULL; |
482 | 482 | ||
483 | ok = 1; | 483 | ok = 1; |
484 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, | 484 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, |