diff options
-rw-r--r-- | src/zonemaster/gnunet-service-zonemaster.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c index cbb890589..8220e6eab 100644 --- a/src/zonemaster/gnunet-service-zonemaster.c +++ b/src/zonemaster/gnunet-service-zonemaster.c | |||
@@ -138,11 +138,6 @@ static struct GNUNET_STATISTICS_Handle *statistics; | |||
138 | static struct GNUNET_DHT_Handle *dht_handle; | 138 | static struct GNUNET_DHT_Handle *dht_handle; |
139 | 139 | ||
140 | /** | 140 | /** |
141 | * Active DHT put operation (or NULL) | ||
142 | */ | ||
143 | static struct GNUNET_DHT_PutHandle *active_put; | ||
144 | |||
145 | /** | ||
146 | * Our handle to the namestore service | 141 | * Our handle to the namestore service |
147 | */ | 142 | */ |
148 | static struct GNUNET_NAMESTORE_Handle *namestore_handle; | 143 | static struct GNUNET_NAMESTORE_Handle *namestore_handle; |
@@ -289,6 +284,7 @@ shutdown_task (void *cls) | |||
289 | while (NULL != (ma = ma_head)) | 284 | while (NULL != (ma = ma_head)) |
290 | { | 285 | { |
291 | GNUNET_DHT_put_cancel (ma->ph); | 286 | GNUNET_DHT_put_cancel (ma->ph); |
287 | ma_queue_length--; | ||
292 | GNUNET_CONTAINER_DLL_remove (ma_head, | 288 | GNUNET_CONTAINER_DLL_remove (ma_head, |
293 | ma_tail, | 289 | ma_tail, |
294 | ma); | 290 | ma); |
@@ -297,6 +293,7 @@ shutdown_task (void *cls) | |||
297 | while (NULL != (ma = it_head)) | 293 | while (NULL != (ma = it_head)) |
298 | { | 294 | { |
299 | GNUNET_DHT_put_cancel (ma->ph); | 295 | GNUNET_DHT_put_cancel (ma->ph); |
296 | dht_queue_length--; | ||
300 | GNUNET_CONTAINER_DLL_remove (it_head, | 297 | GNUNET_CONTAINER_DLL_remove (it_head, |
301 | it_tail, | 298 | it_tail, |
302 | ma); | 299 | ma); |
@@ -329,11 +326,6 @@ shutdown_task (void *cls) | |||
329 | GNUNET_NAMESTORE_disconnect (namestore_handle); | 326 | GNUNET_NAMESTORE_disconnect (namestore_handle); |
330 | namestore_handle = NULL; | 327 | namestore_handle = NULL; |
331 | } | 328 | } |
332 | if (NULL != active_put) | ||
333 | { | ||
334 | GNUNET_DHT_put_cancel (active_put); | ||
335 | active_put = NULL; | ||
336 | } | ||
337 | if (NULL != dht_handle) | 329 | if (NULL != dht_handle) |
338 | { | 330 | { |
339 | GNUNET_DHT_disconnect (dht_handle); | 331 | GNUNET_DHT_disconnect (dht_handle); |
@@ -732,11 +724,6 @@ zone_iteration_error (void *cls) | |||
732 | GNUNET_SCHEDULER_cancel (zone_publish_task); | 724 | GNUNET_SCHEDULER_cancel (zone_publish_task); |
733 | zone_publish_task = NULL; | 725 | zone_publish_task = NULL; |
734 | } | 726 | } |
735 | if (NULL != active_put) | ||
736 | { | ||
737 | GNUNET_DHT_put_cancel (active_put); | ||
738 | active_put = NULL; | ||
739 | } | ||
740 | zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start, | 727 | zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start, |
741 | NULL); | 728 | NULL); |
742 | } | 729 | } |
@@ -1016,11 +1003,6 @@ handle_monitor_error (void *cls) | |||
1016 | GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter); | 1003 | GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter); |
1017 | namestore_iter = NULL; | 1004 | namestore_iter = NULL; |
1018 | } | 1005 | } |
1019 | if (NULL != active_put) | ||
1020 | { | ||
1021 | GNUNET_DHT_put_cancel (active_put); | ||
1022 | active_put = NULL; | ||
1023 | } | ||
1024 | zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start, | 1006 | zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start, |
1025 | NULL); | 1007 | NULL); |
1026 | } | 1008 | } |