[GNUnet-SVN] r34206 - gnunet/src/dht

[gnunet]

Author: supriti
Date: 2014-08-22 22:57:59 +0200 (Fri, 22 Aug 2014)
New Revision: 34206

Modified:
   gnunet/src/dht/gnunet-service-xdht_neighbours.c
   gnunet/src/dht/gnunet_dht_profiler.c
Log:
Fixme


Modified: gnunet/src/dht/gnunet-service-xdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-xdht_neighbours.c     2014-08-22 20:04:23 UTC 
(rev 34205)
+++ gnunet/src/dht/gnunet-service-xdht_neighbours.c     2014-08-22 20:57:59 UTC 
(rev 34206)
@@ -5127,8 +5127,10 @@
     
     // Cancel Retry Task
     if (GNUNET_SCHEDULER_NO_TASK != send_verify_successor_retry_task)
+    {
       GNUNET_SCHEDULER_cancel(send_verify_successor_retry_task);
-        
+      send_verify_successor_retry_task = GNUNET_SCHEDULER_NO_TASK;
+    }   
     compare_and_update_successor (current_successor,
                                   probable_successor, trail, trail_length);
     
@@ -6025,6 +6027,12 @@
     GNUNET_SCHEDULER_cancel (send_verify_successor_task);
     send_verify_successor_task = GNUNET_SCHEDULER_NO_TASK;
   }
+
+  if (GNUNET_SCHEDULER_NO_TASK != send_verify_successor_retry_task)
+  {
+    GNUNET_SCHEDULER_cancel (send_verify_successor_retry_task);
+    send_verify_successor_retry_task = GNUNET_SCHEDULER_NO_TASK;
+  }
 }
 
 

Modified: gnunet/src/dht/gnunet_dht_profiler.c
===================================================================
--- gnunet/src/dht/gnunet_dht_profiler.c        2014-08-22 20:04:23 UTC (rev 
34205)
+++ gnunet/src/dht/gnunet_dht_profiler.c        2014-08-22 20:57:59 UTC (rev 
34206)
@@ -564,7 +564,8 @@
   get_ac->nrefs--;
   GNUNET_DHT_get_stop (ac->dht_get);
   ac->dht_get = NULL;
-  GNUNET_SCHEDULER_cancel (ac->delay_task);
+  if (ac->delay_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel (ac->delay_task);
   ac->delay_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_assert (NULL != ctx->op);
   GNUNET_TESTBED_operation_done (ctx->op);