diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-04-24 12:51:16 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-04-24 12:51:16 +0000 |
commit | 719f459ee3694e4cadf491a18b4f98ea2c412a42 (patch) | |
tree | 8fa4ea28a4694e99cc4409a99e306715f8b0decf /src/topology | |
parent | f88e96c46ff25d427c570e07b0bba8813813eabd (diff) | |
download | gnunet-719f459ee3694e4cadf491a18b4f98ea2c412a42.tar.gz gnunet-719f459ee3694e4cadf491a18b4f98ea2c412a42.zip |
-fix
Diffstat (limited to 'src/topology')
-rw-r--r-- | src/topology/gnunet-daemon-topology.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index e7860ac94..a9dbd3573 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -1186,11 +1186,6 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1186 | GNUNET_PEERINFO_notify_cancel (peerinfo_notify); | 1186 | GNUNET_PEERINFO_notify_cancel (peerinfo_notify); |
1187 | peerinfo_notify = NULL; | 1187 | peerinfo_notify = NULL; |
1188 | } | 1188 | } |
1189 | if (GNUNET_SCHEDULER_NO_TASK != add_task) | ||
1190 | { | ||
1191 | GNUNET_SCHEDULER_cancel (add_task); | ||
1192 | add_task = GNUNET_SCHEDULER_NO_TASK; | ||
1193 | } | ||
1194 | GNUNET_TRANSPORT_disconnect (transport); | 1189 | GNUNET_TRANSPORT_disconnect (transport); |
1195 | transport = NULL; | 1190 | transport = NULL; |
1196 | if (handle != NULL) | 1191 | if (handle != NULL) |
@@ -1199,6 +1194,11 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1199 | handle = NULL; | 1194 | handle = NULL; |
1200 | } | 1195 | } |
1201 | whitelist_peers (); | 1196 | whitelist_peers (); |
1197 | if (GNUNET_SCHEDULER_NO_TASK != add_task) | ||
1198 | { | ||
1199 | GNUNET_SCHEDULER_cancel (add_task); | ||
1200 | add_task = GNUNET_SCHEDULER_NO_TASK; | ||
1201 | } | ||
1202 | GNUNET_CONTAINER_multihashmap_iterate (peers, &free_peer, NULL); | 1202 | GNUNET_CONTAINER_multihashmap_iterate (peers, &free_peer, NULL); |
1203 | GNUNET_CONTAINER_multihashmap_destroy (peers); | 1203 | GNUNET_CONTAINER_multihashmap_destroy (peers); |
1204 | peers = NULL; | 1204 | peers = NULL; |