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

[gnunet]

Author: grothoff
Date: 2012-03-09 14:23:28 +0100 (Fri, 09 Mar 2012)
New Revision: 20409

Modified:
   gnunet/src/core/gnunet-service-core_kx.c
   gnunet/src/core/gnunet-service-core_neighbours.c
Log:
-fixing #2195

Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c    2012-03-09 12:55:24 UTC (rev 
20408)
+++ gnunet/src/core/gnunet-service-core_kx.c    2012-03-09 13:23:28 UTC (rev 
20409)
@@ -603,6 +603,8 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 _("Error in communication with PEERINFO service\n"));
     kx->pitr = NULL;
+    if (GNUNET_SCHEDULER_NO_TASK != kx->retry_set_key_task)
+      GNUNET_SCHEDULER_cancel (kx->retry_set_key_task);
     kx->retry_set_key_task =
         GNUNET_SCHEDULER_add_delayed (kx->set_key_retry_frequency,
                                       &set_key_retry_task, kx);
@@ -622,6 +624,8 @@
                               gettext_noop
                               ("# Delayed connecting due to lack of public 
key"),
                               1, GNUNET_NO);
+    if (GNUNET_SCHEDULER_NO_TASK != kx->retry_set_key_task)
+      GNUNET_SCHEDULER_cancel (kx->retry_set_key_task);
     kx->retry_set_key_task =
         GNUNET_SCHEDULER_add_delayed (kx->set_key_retry_frequency,
                                       &set_key_retry_task, kx);

Modified: gnunet/src/core/gnunet-service-core_neighbours.c
===================================================================
--- gnunet/src/core/gnunet-service-core_neighbours.c    2012-03-09 12:55:24 UTC 
(rev 20408)
+++ gnunet/src/core/gnunet-service-core_neighbours.c    2012-03-09 13:23:28 UTC 
(rev 20409)
@@ -129,6 +129,8 @@
 static struct Neighbour *
 find_neighbour (const struct GNUNET_PeerIdentity *peer)
 {
+  if (NULL == neighbours)
+    return NULL;
   return GNUNET_CONTAINER_multihashmap_get (neighbours, &peer->hashPubKey);
 }