diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/dht/gnunet-service-xdht_neighbours.c | 10 | ||||
-rw-r--r-- | src/dht/gnunet_dht_profiler.c | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c index 8d5cd776d..758c71e19 100644 --- a/src/dht/gnunet-service-xdht_neighbours.c +++ b/src/dht/gnunet-service-xdht_neighbours.c | |||
@@ -5127,8 +5127,10 @@ handle_dht_p2p_verify_successor_result(void *cls, | |||
5127 | 5127 | ||
5128 | // Cancel Retry Task | 5128 | // Cancel Retry Task |
5129 | if (GNUNET_SCHEDULER_NO_TASK != send_verify_successor_retry_task) | 5129 | if (GNUNET_SCHEDULER_NO_TASK != send_verify_successor_retry_task) |
5130 | { | ||
5130 | GNUNET_SCHEDULER_cancel(send_verify_successor_retry_task); | 5131 | GNUNET_SCHEDULER_cancel(send_verify_successor_retry_task); |
5131 | 5132 | send_verify_successor_retry_task = GNUNET_SCHEDULER_NO_TASK; | |
5133 | } | ||
5132 | compare_and_update_successor (current_successor, | 5134 | compare_and_update_successor (current_successor, |
5133 | probable_successor, trail, trail_length); | 5135 | probable_successor, trail, trail_length); |
5134 | 5136 | ||
@@ -6025,6 +6027,12 @@ GDS_NEIGHBOURS_done (void) | |||
6025 | GNUNET_SCHEDULER_cancel (send_verify_successor_task); | 6027 | GNUNET_SCHEDULER_cancel (send_verify_successor_task); |
6026 | send_verify_successor_task = GNUNET_SCHEDULER_NO_TASK; | 6028 | send_verify_successor_task = GNUNET_SCHEDULER_NO_TASK; |
6027 | } | 6029 | } |
6030 | |||
6031 | if (GNUNET_SCHEDULER_NO_TASK != send_verify_successor_retry_task) | ||
6032 | { | ||
6033 | GNUNET_SCHEDULER_cancel (send_verify_successor_retry_task); | ||
6034 | send_verify_successor_retry_task = GNUNET_SCHEDULER_NO_TASK; | ||
6035 | } | ||
6028 | } | 6036 | } |
6029 | 6037 | ||
6030 | 6038 | ||
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c index bc1ee86d8..98ea16bec 100644 --- a/src/dht/gnunet_dht_profiler.c +++ b/src/dht/gnunet_dht_profiler.c | |||
@@ -564,7 +564,8 @@ get_iter (void *cls, | |||
564 | get_ac->nrefs--; | 564 | get_ac->nrefs--; |
565 | GNUNET_DHT_get_stop (ac->dht_get); | 565 | GNUNET_DHT_get_stop (ac->dht_get); |
566 | ac->dht_get = NULL; | 566 | ac->dht_get = NULL; |
567 | GNUNET_SCHEDULER_cancel (ac->delay_task); | 567 | if (ac->delay_task != GNUNET_SCHEDULER_NO_TASK) |
568 | GNUNET_SCHEDULER_cancel (ac->delay_task); | ||
568 | ac->delay_task = GNUNET_SCHEDULER_NO_TASK; | 569 | ac->delay_task = GNUNET_SCHEDULER_NO_TASK; |
569 | GNUNET_assert (NULL != ctx->op); | 570 | GNUNET_assert (NULL != ctx->op); |
570 | GNUNET_TESTBED_operation_done (ctx->op); | 571 | GNUNET_TESTBED_operation_done (ctx->op); |