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

[gnunet]

Author: grothoff
Date: 2011-06-17 12:03:36 +0200 (Fri, 17 Jun 2011)
New Revision: 15690

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

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2011-06-17 09:51:39 UTC (rev 
15689)
+++ gnunet/src/core/gnunet-service-core.c       2011-06-17 10:03:36 UTC (rev 
15690)
@@ -2030,6 +2030,11 @@
  
   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 @@
       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))