[GNUnet-SVN] [gnunet] 01/02: fix #5491

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

commit 817720bfdcc4276372594089dcdb9d8a56e92364
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Jan 24 19:49:12 2019 +0100

    fix #5491
---
 src/cadet/gnunet-service-cadet.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index 4f9fda82b..ae5d48943 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -380,6 +380,14 @@ shutdown_rest ()
                                GNUNET_NO);
     stats = NULL;
   }
+  /* Destroy tunnels.  Note that all channels must be destroyed first! */
+  GCP_iterate_all (&destroy_tunnels_now,
+                   NULL);
+  /* All tunnels, channels, connections and CORE must be down before this 
point. */
+  GCP_iterate_all (&destroy_paths_now,
+                   NULL);
+  /* All paths, tunnels, channels, connections and CORE must be down before 
this point. */
+  GCP_destroy_all_peers ();
   if (NULL != open_ports)
   {
     GNUNET_CONTAINER_multihashmap_destroy (open_ports);
@@ -390,14 +398,6 @@ shutdown_rest ()
     GNUNET_CONTAINER_multihashmap_destroy (loose_channels);
     loose_channels = NULL;
   }
-  /* Destroy tunnels.  Note that all channels must be destroyed first! */
-  GCP_iterate_all (&destroy_tunnels_now,
-                   NULL);
-  /* All tunnels, channels, connections and CORE must be down before this 
point. */
-  GCP_iterate_all (&destroy_paths_now,
-                   NULL);
-  /* All paths, tunnels, channels, connections and CORE must be down before 
this point. */
-  GCP_destroy_all_peers ();
   if (NULL != peers)
   {
     GNUNET_CONTAINER_multipeermap_destroy (peers);

-- 
To stop receiving notification emails like this one, please contact
address@hidden