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

[gnunet]

Author: bartpolot
Date: 2013-05-10 18:30:03 +0200 (Fri, 10 May 2013)
New Revision: 27095

Modified:
   gnunet/src/mesh/gnunet-service-mesh-new.c
Log:
- avoid mixing path_refresh and tunnel_timeout

Modified: gnunet/src/mesh/gnunet-service-mesh-new.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-new.c   2013-05-10 16:25:06 UTC (rev 
27094)
+++ gnunet/src/mesh/gnunet-service-mesh-new.c   2013-05-10 16:30:03 UTC (rev 
27095)
@@ -3074,6 +3074,8 @@
 static void
 tunnel_reset_timeout (struct MeshTunnel *t)
 {
+  if (NULL != t->owner || 0 != t->local_tid || 0 == t->prev_hop)
+    return;
   if (GNUNET_SCHEDULER_NO_TASK != t->maintenance_task)
     GNUNET_SCHEDULER_cancel (t->maintenance_task);
   t->maintenance_task =
@@ -4471,7 +4473,8 @@
   char cbuf[size];
 
   t->maintenance_task = GNUNET_SCHEDULER_NO_TASK;
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) ||
+      NULL == t->owner || 0 == t->local_tid || 0 != t->prev_hop)
   {
     return;
   }