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

[gnunet]

Author: bartpolot
Date: 2015-06-26 12:07:05 +0200 (Fri, 26 Jun 2015)
New Revision: 35999

Modified:
   gnunet/src/cadet/gnunet-service-cadet_peer.c
Log:
- explicitly track shutdown status

Modified: gnunet/src/cadet/gnunet-service-cadet_peer.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_peer.c        2015-06-26 09:28:32 UTC 
(rev 35998)
+++ gnunet/src/cadet/gnunet-service-cadet_peer.c        2015-06-26 10:07:05 UTC 
(rev 35999)
@@ -236,7 +236,12 @@
  */
 static struct GNUNET_TRANSPORT_Handle *transport_handle;
 
+/**
+ * Shutdown falg.
+ */
+static int in_shutdown;
 
+
 
/******************************************************************************/
 /*****************************     DEBUG      
*********************************/
 
/******************************************************************************/
@@ -460,7 +465,7 @@
   p = GNUNET_CONTAINER_multipeermap_get (peers, peer);
   if (NULL == p)
   {
-    GNUNET_break (0);
+    GNUNET_break (GNUNET_YES == in_shutdown);
     return;
   }
   if (myid == p->id)
@@ -1150,8 +1155,6 @@
   /* Sanity checking */
   if (NULL == buf || 0 == size)
   {
-    GNUNET_break (0);
-    LOG (GNUNET_ERROR_TYPE_INFO, "CORE gave buffer size 0.\n");
     peer->tmt_time.abs_value_us = 0;
     peer->core_transmit = NULL;
     return 0;
@@ -1671,6 +1674,7 @@
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "GCP_init\n");
+  in_shutdown = GNUNET_NO;
   peers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (c, "CADET", "MAX_PEERS",
@@ -1740,6 +1744,7 @@
 void
 GCP_shutdown (void)
 {
+  in_shutdown = GNUNET_YES;
   GNUNET_CONTAINER_multipeermap_iterate (peers,
                                          &shutdown_peer,
                                          NULL);