diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-01-24 19:49:12 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-01-24 19:51:41 +0100 |
commit | 817720bfdcc4276372594089dcdb9d8a56e92364 (patch) | |
tree | 3f8d6bebc9e98d1baa23f57e7d107e83cd7be031 | |
parent | 31a1df068442392cf7aa7ccd156ccd6c7a8716dd (diff) | |
download | gnunet-817720bfdcc4276372594089dcdb9d8a56e92364.tar.gz gnunet-817720bfdcc4276372594089dcdb9d8a56e92364.zip |
fix #5491
-rw-r--r-- | src/cadet/gnunet-service-cadet.c | 16 |
1 files 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 () | |||
380 | GNUNET_NO); | 380 | GNUNET_NO); |
381 | stats = NULL; | 381 | stats = NULL; |
382 | } | 382 | } |
383 | /* Destroy tunnels. Note that all channels must be destroyed first! */ | ||
384 | GCP_iterate_all (&destroy_tunnels_now, | ||
385 | NULL); | ||
386 | /* All tunnels, channels, connections and CORE must be down before this point. */ | ||
387 | GCP_iterate_all (&destroy_paths_now, | ||
388 | NULL); | ||
389 | /* All paths, tunnels, channels, connections and CORE must be down before this point. */ | ||
390 | GCP_destroy_all_peers (); | ||
383 | if (NULL != open_ports) | 391 | if (NULL != open_ports) |
384 | { | 392 | { |
385 | GNUNET_CONTAINER_multihashmap_destroy (open_ports); | 393 | GNUNET_CONTAINER_multihashmap_destroy (open_ports); |
@@ -390,14 +398,6 @@ shutdown_rest () | |||
390 | GNUNET_CONTAINER_multihashmap_destroy (loose_channels); | 398 | GNUNET_CONTAINER_multihashmap_destroy (loose_channels); |
391 | loose_channels = NULL; | 399 | loose_channels = NULL; |
392 | } | 400 | } |
393 | /* Destroy tunnels. Note that all channels must be destroyed first! */ | ||
394 | GCP_iterate_all (&destroy_tunnels_now, | ||
395 | NULL); | ||
396 | /* All tunnels, channels, connections and CORE must be down before this point. */ | ||
397 | GCP_iterate_all (&destroy_paths_now, | ||
398 | NULL); | ||
399 | /* All paths, tunnels, channels, connections and CORE must be down before this point. */ | ||
400 | GCP_destroy_all_peers (); | ||
401 | if (NULL != peers) | 401 | if (NULL != peers) |
402 | { | 402 | { |
403 | GNUNET_CONTAINER_multipeermap_destroy (peers); | 403 | GNUNET_CONTAINER_multipeermap_destroy (peers); |