[GNUnet-SVN] r37912 - gnunet/src/dht

[gnunet]

Author: grothoff
Date: 2016-09-11 20:36:31 +0200 (Sun, 11 Sep 2016)
New Revision: 37912

Modified:
   gnunet/src/dht/gnunet-service-dht.c
   gnunet/src/dht/gnunet-service-dht_clients.c
   gnunet/src/dht/gnunet-service-dht_clients.h
Log:
fix dht kill issue

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2016-09-11 17:32:05 UTC (rev 37911)
+++ gnunet/src/dht/gnunet-service-dht.c 2016-09-11 18:36:31 UTC (rev 37912)
@@ -125,6 +125,7 @@
   }
   GNUNET_free_non_null (GDS_my_hello);
   GDS_my_hello = NULL;
+  GDS_CLIENTS_stop ();
 }
 
 

Modified: gnunet/src/dht/gnunet-service-dht_clients.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_clients.c 2016-09-11 17:32:05 UTC (rev 
37911)
+++ gnunet/src/dht/gnunet-service-dht_clients.c 2016-09-11 18:36:31 UTC (rev 
37912)
@@ -626,11 +626,17 @@
   /* start remote requests */
   if (NULL != retry_task)
     GNUNET_SCHEDULER_cancel (retry_task);
-  retry_task = GNUNET_SCHEDULER_add_now (&transmit_next_request_task, NULL);
+  retry_task = GNUNET_SCHEDULER_add_now (&transmit_next_request_task,
+                                        NULL);
   /* perform local lookup */
-  GDS_DATACACHE_handle_get (&get->key, cqr->type, cqr->xquery, xquery_size,
-                            NULL, 0);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
+  GDS_DATACACHE_handle_get (&get->key,
+                           cqr->type,
+                           cqr->xquery,
+                           xquery_size,
+                            NULL,
+                           0);
+  GNUNET_SERVER_receive_done (client,
+                             GNUNET_OK);
 }
 
 
@@ -1515,15 +1521,23 @@
  * Shutdown client subsystem.
  */
 void
-GDS_CLIENTS_done ()
+GDS_CLIENTS_stop ()
 {
-  GNUNET_assert (client_head == NULL);
-  GNUNET_assert (client_tail == NULL);
   if (NULL != retry_task)
   {
     GNUNET_SCHEDULER_cancel (retry_task);
     retry_task = NULL;
   }
+}
+
+/**
+ * Shutdown client subsystem.
+ */
+void
+GDS_CLIENTS_done ()
+{
+  GNUNET_assert (client_head == NULL);
+  GNUNET_assert (client_tail == NULL);
   if (NULL != retry_heap)
   {
     GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size (retry_heap));

Modified: gnunet/src/dht/gnunet-service-dht_clients.h
===================================================================
--- gnunet/src/dht/gnunet-service-dht_clients.h 2016-09-11 17:32:05 UTC (rev 
37911)
+++ gnunet/src/dht/gnunet-service-dht_clients.h 2016-09-11 18:36:31 UTC (rev 
37912)
@@ -137,7 +137,13 @@
 void
 GDS_CLIENTS_init (void);
 
+/**
+ * Shutdown client subsystem.
+ */
+void
+GDS_CLIENTS_stop (void);
 
+
 /**
  * Shutdown client subsystem.
  */