diff options
Diffstat (limited to 'src/transport/test_transport_api_reliability.c')
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 3964b43ef..50a9cc80e 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c | |||
@@ -114,7 +114,8 @@ end () | |||
114 | unsigned long long delta; | 114 | unsigned long long delta; |
115 | char *value_name; | 115 | char *value_name; |
116 | 116 | ||
117 | GNUNET_SCHEDULER_cancel (die_task); | 117 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
118 | GNUNET_SCHEDULER_cancel (die_task); | ||
118 | die_task = GNUNET_SCHEDULER_NO_TASK; | 119 | die_task = GNUNET_SCHEDULER_NO_TASK; |
119 | #if VERBOSE | 120 | #if VERBOSE |
120 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); | 121 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); |
@@ -227,7 +228,8 @@ notify_receive (void *cls, | |||
227 | n, s, | 228 | n, s, |
228 | ntohs (message->size), | 229 | ntohs (message->size), |
229 | ntohl (hdr->num)); | 230 | ntohl (hdr->num)); |
230 | GNUNET_SCHEDULER_cancel (die_task); | 231 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
232 | GNUNET_SCHEDULER_cancel (die_task); | ||
231 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 233 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
232 | return; | 234 | return; |
233 | } | 235 | } |
@@ -238,7 +240,8 @@ notify_receive (void *cls, | |||
238 | n, s, | 240 | n, s, |
239 | ntohs (message->size), | 241 | ntohs (message->size), |
240 | ntohl (hdr->num)); | 242 | ntohl (hdr->num)); |
241 | GNUNET_SCHEDULER_cancel (die_task); | 243 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
244 | GNUNET_SCHEDULER_cancel (die_task); | ||
242 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 245 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
243 | return; | 246 | return; |
244 | } | 247 | } |
@@ -250,7 +253,8 @@ notify_receive (void *cls, | |||
250 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 253 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
251 | "Expected message %u with bits %u, but body did not match\n", | 254 | "Expected message %u with bits %u, but body did not match\n", |
252 | n, (unsigned char) n); | 255 | n, (unsigned char) n); |
253 | GNUNET_SCHEDULER_cancel (die_task); | 256 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
257 | GNUNET_SCHEDULER_cancel (die_task); | ||
254 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 258 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
255 | return; | 259 | return; |
256 | } | 260 | } |
@@ -267,7 +271,8 @@ notify_receive (void *cls, | |||
267 | if (0 == (n % (TOTAL_MSGS/100))) | 271 | if (0 == (n % (TOTAL_MSGS/100))) |
268 | { | 272 | { |
269 | fprintf (stderr, "."); | 273 | fprintf (stderr, "."); |
270 | GNUNET_SCHEDULER_cancel (die_task); | 274 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
275 | GNUNET_SCHEDULER_cancel (die_task); | ||
271 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, | 276 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
272 | &end_badly, | 277 | &end_badly, |
273 | NULL); | 278 | NULL); |
@@ -420,7 +425,9 @@ notify_connect (void *cls, | |||
420 | } | 425 | } |
421 | if (2 == connected) | 426 | if (2 == connected) |
422 | { | 427 | { |
423 | GNUNET_SCHEDULER_cancel (die_task); | 428 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
429 | GNUNET_SCHEDULER_cancel (die_task); | ||
430 | if (tct != GNUNET_SCHEDULER_NO_TASK) | ||
424 | GNUNET_SCHEDULER_cancel (tct); | 431 | GNUNET_SCHEDULER_cancel (tct); |
425 | tct = GNUNET_SCHEDULER_NO_TASK; | 432 | tct = GNUNET_SCHEDULER_NO_TASK; |
426 | GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2); | 433 | GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2); |