[GNUnet-SVN] r31424 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-12-16 17:15:47 +0100 (Mon, 16 Dec 2013)
New Revision: 31424

Modified:
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
- stop kx on empty tunnels


Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-12-16 16:14:09 UTC 
(rev 31423)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-12-16 16:15:47 UTC 
(rev 31424)
@@ -884,6 +884,7 @@
   if (NULL == c)
   {
     GNUNET_break (GNUNET_YES == t->destroy || MESH_TUNNEL3_READY != t->cstate);
+    GMT_debug (t);
     return;
   }
   type = ntohs (message->type);
@@ -985,7 +986,7 @@
 
   t->rekey_task = GNUNET_SCHEDULER_NO_TASK;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Re-key Tunnel\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Re-key Tunnel %s\n", GMT_2s (t));
   if (NULL != tc && 0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
     return;
 
@@ -1924,6 +1925,12 @@
     GMC_send_destroy (iter->c);
   }
 
+  if (GNUNET_SCHEDULER_NO_TASK != t->rekey_task)
+  {
+    t->estate = MESH_TUNNEL3_KEY_UNINITIALIZED;
+    GNUNET_SCHEDULER_cancel (t->rekey_task);
+    t->rekey_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   t->cstate = MESH_TUNNEL3_NEW;
   t->destroy = GNUNET_YES;
 }