diff options
Diffstat (limited to 'src/transport/test_transport_api_reliability.c')
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 07213722e..a727d3e6a 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c | |||
@@ -107,7 +107,7 @@ char *cfg_file_p2; | |||
107 | /** | 107 | /** |
108 | * Timeout task | 108 | * Timeout task |
109 | */ | 109 | */ |
110 | static GNUNET_SCHEDULER_TaskIdentifier die_task; | 110 | static struct GNUNET_SCHEDULER_Task * die_task; |
111 | 111 | ||
112 | /** | 112 | /** |
113 | * Transport transmit handle used | 113 | * Transport transmit handle used |
@@ -190,7 +190,7 @@ end () | |||
190 | "kb/s"); | 190 | "kb/s"); |
191 | GNUNET_free (value_name); | 191 | GNUNET_free (value_name); |
192 | 192 | ||
193 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 193 | if (die_task != NULL) |
194 | GNUNET_SCHEDULER_cancel (die_task); | 194 | GNUNET_SCHEDULER_cancel (die_task); |
195 | 195 | ||
196 | if (th != NULL) | 196 | if (th != NULL) |
@@ -224,7 +224,7 @@ static void | |||
224 | end_badly () | 224 | end_badly () |
225 | { | 225 | { |
226 | int i; | 226 | int i; |
227 | die_task = GNUNET_SCHEDULER_NO_TASK; | 227 | die_task = NULL; |
228 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); | 228 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); |
229 | 229 | ||
230 | if (test_connected == GNUNET_YES) | 230 | if (test_connected == GNUNET_YES) |
@@ -347,7 +347,7 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
347 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 347 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
348 | "Expected message %u of size %u, got %u bytes of message %u\n", | 348 | "Expected message %u of size %u, got %u bytes of message %u\n", |
349 | ntohl (hdr->num), s, ntohs (message->size), ntohl (hdr->num)); | 349 | ntohl (hdr->num), s, ntohs (message->size), ntohl (hdr->num)); |
350 | if (GNUNET_SCHEDULER_NO_TASK != die_task) | 350 | if (NULL != die_task) |
351 | GNUNET_SCHEDULER_cancel (die_task); | 351 | GNUNET_SCHEDULER_cancel (die_task); |
352 | test_sending = GNUNET_YES; | 352 | test_sending = GNUNET_YES; |
353 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 353 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
@@ -360,7 +360,7 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
360 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 360 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
361 | "Expected message %u with bits %u, but body did not match\n", | 361 | "Expected message %u with bits %u, but body did not match\n", |
362 | ntohl (hdr->num), (unsigned char) n); | 362 | ntohl (hdr->num), (unsigned char) n); |
363 | if (GNUNET_SCHEDULER_NO_TASK != die_task) | 363 | if (NULL != die_task) |
364 | GNUNET_SCHEDULER_cancel (die_task); | 364 | GNUNET_SCHEDULER_cancel (die_task); |
365 | test_sending = GNUNET_YES; | 365 | test_sending = GNUNET_YES; |
366 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 366 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
@@ -384,7 +384,7 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
384 | if (0 == (n % (TOTAL_MSGS / 100))) | 384 | if (0 == (n % (TOTAL_MSGS / 100))) |
385 | { | 385 | { |
386 | FPRINTF (stderr, "%s", "."); | 386 | FPRINTF (stderr, "%s", "."); |
387 | if (GNUNET_SCHEDULER_NO_TASK != die_task) | 387 | if (NULL != die_task) |
388 | GNUNET_SCHEDULER_cancel (die_task); | 388 | GNUNET_SCHEDULER_cancel (die_task); |
389 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); | 389 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); |
390 | } | 390 | } |
@@ -412,7 +412,7 @@ notify_ready (void *cls, size_t size, void *buf) | |||
412 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 412 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
413 | "Timeout occurred while waiting for transmit_ready for msg %u of %u\n", | 413 | "Timeout occurred while waiting for transmit_ready for msg %u of %u\n", |
414 | msg_scheduled, TOTAL_MSGS); | 414 | msg_scheduled, TOTAL_MSGS); |
415 | if (GNUNET_SCHEDULER_NO_TASK != die_task) | 415 | if (NULL != die_task) |
416 | GNUNET_SCHEDULER_cancel (die_task); | 416 | GNUNET_SCHEDULER_cancel (die_task); |
417 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 417 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
418 | ok = 42; | 418 | ok = 42; |
@@ -460,7 +460,7 @@ notify_ready (void *cls, size_t size, void *buf) | |||
460 | { | 460 | { |
461 | FPRINTF (stderr, "%s", "\n"); | 461 | FPRINTF (stderr, "%s", "\n"); |
462 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All messages scheduled to be sent\n"); | 462 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All messages scheduled to be sent\n"); |
463 | if (GNUNET_SCHEDULER_NO_TASK != die_task) | 463 | if (NULL != die_task) |
464 | GNUNET_SCHEDULER_cancel (die_task); | 464 | GNUNET_SCHEDULER_cancel (die_task); |
465 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); | 465 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); |
466 | } | 466 | } |
@@ -554,7 +554,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
554 | if ((p1 == NULL) || (p2 == NULL)) | 554 | if ((p1 == NULL) || (p2 == NULL)) |
555 | { | 555 | { |
556 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); | 556 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); |
557 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 557 | if (die_task != NULL) |
558 | GNUNET_SCHEDULER_cancel (die_task); | 558 | GNUNET_SCHEDULER_cancel (die_task); |
559 | //die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 559 | //die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
560 | return; | 560 | return; |