[GNUnet-SVN] r11911 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-06-23 17:20:46 +0200 (Wed, 23 Jun 2010)
New Revision: 11911

Modified:
   gnunet/src/util/connection.c
Log:
fix

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2010-06-23 15:20:40 UTC (rev 11910)
+++ gnunet/src/util/connection.c        2010-06-23 15:20:46 UTC (rev 11911)
@@ -622,6 +622,7 @@
       GNUNET_SCHEDULER_cancel (h->sched, h->nth.timeout_task);
       h->nth.timeout_task = GNUNET_SCHEDULER_NO_TASK;
       h->ccs -= COCO_TRANSMIT_READY;
+      GNUNET_assert (h->write_task == GNUNET_SCHEDULER_NO_TASK);
       h->write_task = GNUNET_SCHEDULER_add_after (h->sched,
                                                   GNUNET_SCHEDULER_NO_TASK,
                                                   &transmit_ready, h);
@@ -680,6 +681,7 @@
       GNUNET_SCHEDULER_cancel (h->sched, h->nth.timeout_task);
       h->nth.timeout_task = GNUNET_SCHEDULER_NO_TASK;
       h->ccs -= COCO_TRANSMIT_READY;
+      GNUNET_assert (h->write_task == GNUNET_SCHEDULER_NO_TASK);
       h->write_task =
         GNUNET_SCHEDULER_add_write_net (h->sched,
                                         GNUNET_TIME_absolute_get_remaining
@@ -1605,6 +1607,9 @@
   if ((sock->sock == NULL) &&
       (sock->ap_head == NULL) && (sock->dns_active == NULL))
     {
+      if (sock->write_task != GNUNET_SCHEDULER_NO_TASK)
+       GNUNET_SCHEDULER_cancel (sock->sched,
+                                sock->write_task);
       sock->write_task = GNUNET_SCHEDULER_add_now (sock->sched,
                                                   &connect_error, sock);
       return &sock->nth;