fix 1698

1 files changed, 10 insertions, 0 deletions

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 19758c5b3..a7f6f8939 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -2030,6 +2030,11 @@ process_encrypted_neighbour_queue (struct Neighbour *n)
  
   if (n->th != NULL)
     return;  /* request already pending */
+  if (GNUNET_YES != n->is_connected)
+    {
+      GNUNET_break (0);
+      return;
+    }
   m = n->encrypted_head;
   if (m == NULL)
     {
@@ -4522,6 +4527,11 @@ handle_transport_notify_disconnect (void *cls,
       GNUNET_TRANSPORT_notify_transmit_ready_cancel (n->th);
       n->th = NULL;
     }
+  if (GNUNET_SCHEDULER_NO_TASK != n->keep_alive_task)
+    {
+      GNUNET_SCHEDULER_cancel (n->keep_alive_task);
+      n->keep_alive_task = GNUNET_SCHEDULER_NO_TASK;
+    }
   n->is_connected = GNUNET_NO;
   n->status = PEER_STATE_DOWN;
   while (NULL != (car = n->active_client_request_head))