[GNUnet-SVN] r35986 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2015-06-25 05:32:25 +0200 (Thu, 25 Jun 2015)
New Revision: 35986

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- destroy queued messages only after making sure no channels have handles to 
them

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-06-25 03:16:53 UTC 
(rev 35985)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-06-25 03:32:25 UTC 
(rev 35986)
@@ -3657,9 +3657,6 @@
                 GNUNET_CONTAINER_multipeermap_remove (tunnels,
                                                       GCP_get_id (t->peer), 
t));
 
-  while (NULL != t->tq_head)
-    unqueue_data (t->tq_head);
-
   for (iter_c = t->connection_head; NULL != iter_c; iter_c = next_c)
   {
     next_c = iter_c->next;
@@ -3671,7 +3668,14 @@
     GCCH_destroy (iter_ch->ch);
     /* Should only happen on shutdown, but it's ok. */
   }
+  while (NULL != t->tq_head)
+  {
+    /* Should have been cleaned by destuction of channel. */
+    GNUNET_break (0);
+    unqueue_data (t->tq_head);
+  }
 
+
   if (NULL != t->destroy_task)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "cancelling dest: %llX\n", t->destroy_task);