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

[gnunet]

Author: dold
Date: 2013-12-24 21:20:36 +0100 (Tue, 24 Dec 2013)
New Revision: 31746

Modified:
   gnunet/src/set/gnunet-service-set.c
Log:
- destroy channel after timeout


Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2013-12-24 20:09:48 UTC (rev 31745)
+++ gnunet/src/set/gnunet-service-set.c 2013-12-24 20:20:36 UTC (rev 31746)
@@ -452,6 +452,16 @@
     GNUNET_SCHEDULER_cancel (incoming->state->timeout_task);
     incoming->state->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   }
+  if (NULL != incoming->mq)
+  {
+    GNUNET_MQ_destroy (incoming->mq);
+    incoming->mq = NULL;
+  }
+  if (NULL != incoming->channel)
+  {
+    GNUNET_MESH_channel_destroy (incoming->channel);
+    incoming->channel = NULL;
+  }
   GNUNET_assert (NULL != incoming->state);
   GNUNET_free (incoming->state);
   // make sure that the tunnel end handler will not
@@ -1196,6 +1206,9 @@
 handle_incoming_disconnect (struct Operation *op)
 {
   GNUNET_assert (GNUNET_YES == op->is_incoming);
+  /* channel is already dead, incoming_destroy must not
+   * destroy it ... */
+  op->channel = NULL;
   incoming_destroy (op);
   op->vt = NULL;
 }