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

[gnunet]

Author: bartpolot
Date: 2016-05-03 20:38:43 +0200 (Tue, 03 May 2016)
New Revision: 37114

Modified:
   gnunet/src/cadet/gnunet-service-cadet_peer.c
Log:
Fix shutdown assertion failure in core_api: avoid double cancel of pending 
traffic

Modified: gnunet/src/cadet/gnunet-service-cadet_peer.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_peer.c        2016-05-03 16:56:25 UTC 
(rev 37113)
+++ gnunet/src/cadet/gnunet-service-cadet_peer.c        2016-05-03 18:38:43 UTC 
(rev 37114)
@@ -775,8 +775,6 @@
     GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size 
(peer->connections));
     GNUNET_CONTAINER_multihashmap_destroy (peer->connections);
   }
-  if (NULL != peer->core_transmit)
-    GNUNET_CORE_notify_transmit_ready_cancel (peer->core_transmit);
   if (NULL != peer->hello_offer)
   {
     GNUNET_TRANSPORT_offer_hello_cancel (peer->hello_offer);
@@ -791,6 +789,13 @@
   {
     GCP_queue_destroy (peer->queue_head, GNUNET_YES, GNUNET_NO, 0);
   }
+  if (NULL != peer->core_transmit)
+  {
+    GNUNET_break (0); /* GCP_queue_destroy should've cancelled it! */
+    GNUNET_CORE_notify_transmit_ready_cancel (peer->core_transmit);
+    peer->core_transmit = NULL;
+  }
+
   GNUNET_free_non_null (peer->hello);
   GNUNET_free (peer);
   return GNUNET_OK;