[GNUnet-SVN] r30448 - gnunet/src/set

[gnunet]

Author: dold
Date: 2013-10-29 08:41:58 +0100 (Tue, 29 Oct 2013)
New Revision: 30448

Modified:
   gnunet/src/set/gnunet-service-set.c
Log:
- fixed assertion due to task not testing for shutdown as a reason


Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2013-10-29 02:54:22 UTC (rev 30447)
+++ gnunet/src/set/gnunet-service-set.c 2013-10-29 07:41:58 UTC (rev 30448)
@@ -367,6 +367,11 @@
 incoming_destroy (struct Incoming *incoming)
 {
   GNUNET_CONTAINER_DLL_remove (incoming_head, incoming_tail, incoming);
+  if (GNUNET_SCHEDULER_NO_TASK != incoming->timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (incoming->timeout_task);
+    incoming->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   if (NULL != incoming->tunnel)
   {
     struct GNUNET_MESH_Tunnel *t = incoming->tunnel;
@@ -414,6 +419,7 @@
   incoming->suggest_id = suggest_id++;
 
   GNUNET_SCHEDULER_cancel (incoming->timeout_task);
+  incoming->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   mqm = GNUNET_MQ_msg_nested_mh (cmsg, GNUNET_MESSAGE_TYPE_SET_REQUEST,
                                  incoming->spec->context_msg);
   GNUNET_assert (NULL != mqm);
@@ -422,7 +428,6 @@
   cmsg->accept_id = htonl (incoming->suggest_id);
   cmsg->peer_id = incoming->spec->peer;
   GNUNET_MQ_send (listener->client_mq, mqm);
-
 }
 
 
@@ -902,7 +907,6 @@
 
   if (NULL == incoming)
   {
-
     GNUNET_break (0);
     GNUNET_SERVER_client_disconnect (client);
     return;
@@ -971,6 +975,9 @@
 {
   struct Incoming *incoming = cls;
 
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    return;
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "remote peer timed out\n");
   incoming_destroy (incoming);
 }