[GNUnet-SVN] r9076 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2009-10-02 07:40:59 -0600 (Fri, 02 Oct 2009)
New Revision: 9076

Modified:
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/transport_api.c
Log:
fixes

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2009-10-02 13:05:33 UTC (rev 
9075)
+++ gnunet/src/transport/plugin_transport_tcp.c 2009-10-02 13:40:59 UTC (rev 
9076)
@@ -39,7 +39,7 @@
 #include "plugin_transport.h"
 #include "transport.h"
 
-#define DEBUG_TCP GNUNET_YES
+#define DEBUG_TCP GNUNET_NO
 
 /**
  * After how long do we expire an address that we

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2009-10-02 13:05:33 UTC (rev 
9075)
+++ gnunet/src/transport/transport_api.c        2009-10-02 13:40:59 UTC (rev 
9076)
@@ -381,6 +381,7 @@
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                  "Could not transmit to transport service, cancelling pending 
requests\n");
 #endif
+      th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
       th = h->connect_ready_head;
       if (th->next != NULL)
         th->next->prev = NULL;
@@ -390,8 +391,12 @@
           GNUNET_assert (n->transmit_handle == th);
           n->transmit_handle = NULL;
         }
+      GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != th->notify_delay_task);
+      GNUNET_SCHEDULER_cancel (h->sched,
+                              th->notify_delay_task);
       GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
       GNUNET_free (th);
+      if (h->connect_ready_head != NULL) schedule_transmission (h); /* FIXME: 
is this ok? */
       return 0;
     } 
 #if DEBUG_TRANSPORT
@@ -990,6 +995,11 @@
                  GNUNET_i2s(&th->target));
 #endif
       th->notify (th->notify_cls, 0, NULL);
+      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;
+       }
       GNUNET_free (th);
       return 0;
     }