From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 12 Apr 2010 19:38:35 +0000 (+0000)
Subject: fix
X-Git-Tag: initial-import-from-subversion-38251~22187
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ed4043480b4f39153ffea1e1f5ade324d3ad990e;p=oweals%2Fgnunet.git

fix
---

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 2176397e4..1ee495fb0 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -2354,6 +2354,11 @@ process_hello_retry_send_key (void *cls,
       n->pitr = NULL;
       if (n->public_key != NULL)
 	{
+	  if (n->retry_set_key_task != GNUNET_SCHEDULER_NO_TASK)
+	    {
+	      GNUNET_SCHEDULER_cancel (sched, n->retry_set_key_task);
+	      n->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK;
+	    }      
 	  GNUNET_STATISTICS_update (stats,
 				    gettext_noop ("# SETKEY messages deferred (need public key)"), 
 				    -1, 
@@ -2428,8 +2433,12 @@ send_key (struct Neighbour *n)
   struct PingMessage pp;
   struct PingMessage *pm;
 
-  if ( (n->retry_set_key_task != GNUNET_SCHEDULER_NO_TASK) ||
-       (n->pitr != NULL) )
+  if (n->retry_set_key_task != GNUNET_SCHEDULER_NO_TASK)
+    {
+      GNUNET_SCHEDULER_cancel (sched, n->retry_set_key_task);
+      n->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK;
+    }        
+  if (n->pitr != NULL)
     {
 #if DEBUG_CORE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,