[GNUnet-SVN] r10885 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2010-04-12 21:38:35 +0200 (Mon, 12 Apr 2010)
New Revision: 10885

Modified:
   gnunet/src/core/gnunet-service-core.c
Log:
fix

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-04-12 16:46:49 UTC (rev 
10884)
+++ gnunet/src/core/gnunet-service-core.c       2010-04-12 19:38:35 UTC (rev 
10885)
@@ -2354,6 +2354,11 @@
       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,9 +2433,13 @@
   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,
                   "Key exchange in progress with `%4s'.\n",