diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-12-23 13:23:11 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-12-23 13:23:11 +0000 |
commit | ba204d8d7f0dc98c5b50d047cb5e081f73d67d2e (patch) | |
tree | 375ec124c8fc9880c756aea09c501221c4e38ab4 /src/fs/gnunet-service-fs.c | |
parent | 354f00f513160dfb7b03948152c605dc4a48f987 (diff) | |
download | gnunet-ba204d8d7f0dc98c5b50d047cb5e081f73d67d2e.tar.gz gnunet-ba204d8d7f0dc98c5b50d047cb5e081f73d67d2e.zip |
fix shutdown order
Diffstat (limited to 'src/fs/gnunet-service-fs.c')
-rw-r--r-- | src/fs/gnunet-service-fs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 08e864a10..20d5cf865 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -2080,6 +2080,9 @@ shutdown_task (void *cls, | |||
2080 | handle_client_disconnect (NULL, | 2080 | handle_client_disconnect (NULL, |
2081 | client_list->client); | 2081 | client_list->client); |
2082 | cron_flush_trust (NULL, NULL); | 2082 | cron_flush_trust (NULL, NULL); |
2083 | GNUNET_assert (NULL != core); | ||
2084 | GNUNET_CORE_disconnect (core); | ||
2085 | core = NULL; | ||
2083 | GNUNET_CONTAINER_multihashmap_iterate (connected_peers, | 2086 | GNUNET_CONTAINER_multihashmap_iterate (connected_peers, |
2084 | &clean_peer, | 2087 | &clean_peer, |
2085 | NULL); | 2088 | NULL); |
@@ -2096,9 +2099,6 @@ shutdown_task (void *cls, | |||
2096 | GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_size (peer_request_map)); | 2099 | GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_size (peer_request_map)); |
2097 | GNUNET_CONTAINER_multihashmap_destroy (peer_request_map); | 2100 | GNUNET_CONTAINER_multihashmap_destroy (peer_request_map); |
2098 | peer_request_map = NULL; | 2101 | peer_request_map = NULL; |
2099 | GNUNET_assert (NULL != core); | ||
2100 | GNUNET_CORE_disconnect (core); | ||
2101 | core = NULL; | ||
2102 | if (stats != NULL) | 2102 | if (stats != NULL) |
2103 | { | 2103 | { |
2104 | GNUNET_STATISTICS_destroy (stats, GNUNET_NO); | 2104 | GNUNET_STATISTICS_destroy (stats, GNUNET_NO); |