diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-09-02 16:08:43 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-09-02 16:08:43 +0000 |
commit | eb243bc1d82bef705576b5f5b38122b04f51b634 (patch) | |
tree | 47219860d924b16cba2d73d4f4c2396e20899e56 /src/peerinfo | |
parent | f9928e80e3a6209f95bd65f0aee7d8bff4c65109 (diff) | |
download | gnunet-eb243bc1d82bef705576b5f5b38122b04f51b634.tar.gz gnunet-eb243bc1d82bef705576b5f5b38122b04f51b634.zip |
forgotten commit, null check
Diffstat (limited to 'src/peerinfo')
-rw-r--r-- | src/peerinfo/peerinfo_api.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c index eca082529..67dfc2379 100644 --- a/src/peerinfo/peerinfo_api.c +++ b/src/peerinfo/peerinfo_api.c | |||
@@ -226,7 +226,7 @@ do_transmit (void *cls, size_t size, void *buf) | |||
226 | h->th = NULL; | 226 | h->th = NULL; |
227 | if (buf == NULL) | 227 | if (buf == NULL) |
228 | { | 228 | { |
229 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 229 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, |
230 | _("Failed to transmit message to `%s' service.\n"), | 230 | _("Failed to transmit message to `%s' service.\n"), |
231 | "PEERINFO"); | 231 | "PEERINFO"); |
232 | if (tqe != NULL) | 232 | if (tqe != NULL) |
@@ -528,7 +528,7 @@ signal_timeout (void *cls, | |||
528 | { | 528 | { |
529 | struct GNUNET_PEERINFO_IteratorContext *ic = cls; | 529 | struct GNUNET_PEERINFO_IteratorContext *ic = cls; |
530 | 530 | ||
531 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 531 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, |
532 | _("Timeout transmitting iteration request to `%s' service.\n"), | 532 | _("Timeout transmitting iteration request to `%s' service.\n"), |
533 | "PEERINFO"); | 533 | "PEERINFO"); |
534 | ic->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 534 | ic->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
@@ -536,11 +536,10 @@ signal_timeout (void *cls, | |||
536 | GNUNET_CONTAINER_DLL_remove (ic->h->tq_head, | 536 | GNUNET_CONTAINER_DLL_remove (ic->h->tq_head, |
537 | ic->h->tq_tail, | 537 | ic->h->tq_tail, |
538 | ic->tqe); | 538 | ic->tqe); |
539 | reconnect (ic->h); | ||
539 | ic->callback (ic->callback_cls, NULL, NULL); | 540 | ic->callback (ic->callback_cls, NULL, NULL); |
540 | ic->callback = NULL; | 541 | ic->callback = NULL; |
541 | if (ic->in_receive) | 542 | GNUNET_free_non_null (ic->tqe); |
542 | return; | ||
543 | GNUNET_free (ic->tqe); | ||
544 | GNUNET_free (ic); | 543 | GNUNET_free (ic); |
545 | } | 544 | } |
546 | 545 | ||