diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/dht/gnunet-service-dht.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index 5a5fa6fa8..da82ac841 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c | |||
@@ -2922,8 +2922,11 @@ converge_distance (const GNUNET_HashCode *target, | |||
2922 | * value first (always route to closest, because | 2922 | * value first (always route to closest, because |
2923 | * they are sorted.) | 2923 | * they are sorted.) |
2924 | */ | 2924 | */ |
2925 | |||
2925 | if (hops > converge_modifier) /* Past cutoff */ | 2926 | if (hops > converge_modifier) /* Past cutoff */ |
2926 | return ULLONG_MAX; | 2927 | { |
2928 | return ULLONG_MAX; | ||
2929 | } | ||
2927 | /* Fall through */ | 2930 | /* Fall through */ |
2928 | default: | 2931 | default: |
2929 | return 1; | 2932 | return 1; |
@@ -3308,11 +3311,13 @@ remove_recent (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
3308 | GNUNET_CONTAINER_bloomfilter_free(req->bloom); | 3311 | GNUNET_CONTAINER_bloomfilter_free(req->bloom); |
3309 | GNUNET_free(req); | 3312 | GNUNET_free(req); |
3310 | 3313 | ||
3314 | /* | ||
3311 | if ((tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) && (0 == GNUNET_CONTAINER_multihashmap_size(recent.hashmap)) && (0 == GNUNET_CONTAINER_heap_get_size(recent.minHeap))) | 3315 | if ((tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) && (0 == GNUNET_CONTAINER_multihashmap_size(recent.hashmap)) && (0 == GNUNET_CONTAINER_heap_get_size(recent.minHeap))) |
3312 | { | 3316 | { |
3313 | GNUNET_CONTAINER_multihashmap_destroy(recent.hashmap); | 3317 | GNUNET_CONTAINER_multihashmap_destroy(recent.hashmap); |
3314 | GNUNET_CONTAINER_heap_destroy(recent.minHeap); | 3318 | GNUNET_CONTAINER_heap_destroy(recent.minHeap); |
3315 | } | 3319 | } |
3320 | */ | ||
3316 | } | 3321 | } |
3317 | 3322 | ||
3318 | 3323 | ||
@@ -4802,6 +4807,10 @@ main (int argc, char *const *argv) | |||
4802 | "dht", | 4807 | "dht", |
4803 | GNUNET_SERVICE_OPTION_NONE, | 4808 | GNUNET_SERVICE_OPTION_NONE, |
4804 | &run, NULL)) ? 0 : 1; | 4809 | &run, NULL)) ? 0 : 1; |
4810 | GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size(recent.hashmap)); | ||
4811 | GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size(recent.minHeap)); | ||
4805 | GNUNET_CONTAINER_multihashmap_destroy (recent_find_peer_requests); | 4812 | GNUNET_CONTAINER_multihashmap_destroy (recent_find_peer_requests); |
4813 | GNUNET_CONTAINER_multihashmap_destroy (recent.hashmap); | ||
4814 | GNUNET_CONTAINER_heap_destroy (recent.minHeap); | ||
4806 | return ret; | 4815 | return ret; |
4807 | } | 4816 | } |