diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-04-02 13:52:36 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-04-02 13:52:36 +0000 |
commit | bf4d77f07d632bd3414c4b6f373bdb2d24700b9b (patch) | |
tree | cc93a38ea28f46bc240c275cf3b06761c0c4cd7d /src/peerinfo/peerinfo_api.c | |
parent | 45cb6dbbdd3a509e54f94eff3b4f96ed3734b7c9 (diff) | |
download | gnunet-bf4d77f07d632bd3414c4b6f373bdb2d24700b9b.tar.gz gnunet-bf4d77f07d632bd3414c4b6f373bdb2d24700b9b.zip |
-make error message on timeout more consistent to allow tests to pass
Diffstat (limited to 'src/peerinfo/peerinfo_api.c')
-rw-r--r-- | src/peerinfo/peerinfo_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c index fed577035..c3e756a6e 100644 --- a/src/peerinfo/peerinfo_api.c +++ b/src/peerinfo/peerinfo_api.c | |||
@@ -451,7 +451,7 @@ peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg) | |||
451 | GNUNET_SCHEDULER_cancel (ic->timeout_task); | 451 | GNUNET_SCHEDULER_cancel (ic->timeout_task); |
452 | if (ic->callback != NULL) | 452 | if (ic->callback != NULL) |
453 | ic->callback (ic->callback_cls, NULL, NULL, | 453 | ic->callback (ic->callback_cls, NULL, NULL, |
454 | _("Received invalid message from `PEERINFO' service.\n")); | 454 | _("Received invalid message from `PEERINFO' service.")); |
455 | GNUNET_free (ic); | 455 | GNUNET_free (ic); |
456 | return; | 456 | return; |
457 | } | 457 | } |
@@ -469,7 +469,7 @@ peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg) | |||
469 | GNUNET_SCHEDULER_cancel (ic->timeout_task); | 469 | GNUNET_SCHEDULER_cancel (ic->timeout_task); |
470 | if (ic->callback != NULL) | 470 | if (ic->callback != NULL) |
471 | ic->callback (ic->callback_cls, NULL, NULL, | 471 | ic->callback (ic->callback_cls, NULL, NULL, |
472 | _("Received invalid message from `PEERINFO' service.\n")); | 472 | _("Received invalid message from `PEERINFO' service.")); |
473 | GNUNET_free (ic); | 473 | GNUNET_free (ic); |
474 | return; | 474 | return; |
475 | } | 475 | } |
@@ -541,7 +541,7 @@ signal_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
541 | reconnect (ic->h); | 541 | reconnect (ic->h); |
542 | ic->callback (ic->callback_cls, NULL, NULL, | 542 | ic->callback (ic->callback_cls, NULL, NULL, |
543 | _ | 543 | _ |
544 | ("Timeout transmitting iteration request to `PEERINFO' service.\n")); | 544 | ("Timeout transmitting iteration request to `PEERINFO' service.")); |
545 | ic->callback = NULL; | 545 | ic->callback = NULL; |
546 | GNUNET_free_non_null (ic->tqe); | 546 | GNUNET_free_non_null (ic->tqe); |
547 | GNUNET_free (ic); | 547 | GNUNET_free (ic); |
@@ -609,7 +609,7 @@ GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h, | |||
609 | ic->timeout = GNUNET_TIME_relative_to_absolute (timeout); | 609 | ic->timeout = GNUNET_TIME_relative_to_absolute (timeout); |
610 | ic->timeout_task = | 610 | ic->timeout_task = |
611 | GNUNET_SCHEDULER_add_delayed (timeout, &signal_timeout, ic); | 611 | GNUNET_SCHEDULER_add_delayed (timeout, &signal_timeout, ic); |
612 | tqe->timeout = ic->timeout; | 612 | tqe->timeout = GNUNET_TIME_UNIT_FOREVER_ABS; |
613 | tqe->cont = &iterator_start_receive; | 613 | tqe->cont = &iterator_start_receive; |
614 | tqe->cont_cls = ic; | 614 | tqe->cont_cls = ic; |
615 | tqe->timeout = ic->timeout; | 615 | tqe->timeout = ic->timeout; |