From: Nathan S. Evans <evans@in.tum.de>
Date: Thu, 4 Feb 2010 15:54:07 +0000 (+0000)
Subject: dying transport_api fix/hack
X-Git-Tag: initial-import-from-subversion-38251~22788
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a16bb742d0655f2c1c9b6f91b4fbcb1509398f28;p=oweals%2Fgnunet.git

dying transport_api fix/hack
---

diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 8b4fe3ffd..0c75ce9f7 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -1555,9 +1555,22 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
               h->network_handle = NULL;
               h->transmission_scheduled = GNUNET_NO;
               th = h->connect_ready_head;
-              /* add timeout again, we cancelled the transmit_ready task! */
+              /* add timeout again, we canceled the transmit_ready task! */
+
+              /*GNUNET_assert (th->notify_delay_task ==
+                             GNUNET_SCHEDULER_NO_TASK);*/
+
+              /* START - somehow we are getting here when th->notify_delay_task is already
+               * set.  Not sure why, so just checking and canceling instead of asserting and
+               * dying.  Probably not a *fix*.  */
+              if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+                {
+                  GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
+                  th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+                }
+              /* END */
               GNUNET_assert (th->notify_delay_task ==
-                             GNUNET_SCHEDULER_NO_TASK);
+                                           GNUNET_SCHEDULER_NO_TASK);
               th->notify_delay_task =
                 GNUNET_SCHEDULER_add_delayed (h->sched,
                                               GNUNET_TIME_absolute_get_remaining