first disconnect from core to handle disconnect events nicely -- likely cause of #1724

1 files changed, 9 insertions, 9 deletions

diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index be635d4a0..626ca79f4 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -4998,6 +4998,15 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                          NULL);
       GNUNET_TRANSPORT_disconnect (transport_handle);
     }
+  if (coreAPI != NULL)
+    {
+#if DEBUG_DHT
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "%s:%s Disconnecting core!\n", my_short_id, "DHT");
+#endif
+      GNUNET_CORE_disconnect (coreAPI);
+      coreAPI = NULL;
+    }
   for (bucket_count = lowest_bucket; bucket_count < MAX_BUCKETS;
        bucket_count++)
     {
@@ -5012,15 +5021,6 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
           delete_peer (pos, bucket_count);
         }
     }
-  if (coreAPI != NULL)
-    {
-#if DEBUG_DHT
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "%s:%s Disconnecting core!\n", my_short_id, "DHT");
-#endif
-      GNUNET_CORE_disconnect (coreAPI);
-      coreAPI = NULL;
-    }
   if (datacache != NULL)
     {
 #if DEBUG_DHT