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

[gnunet]

Author: bartpolot
Date: 2012-09-20 14:32:12 +0200 (Thu, 20 Sep 2012)
New Revision: 23915

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
- reorder for case of shutdown

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2012-09-20 12:29:11 UTC (rev 
23914)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2012-09-20 12:32:12 UTC (rev 
23915)
@@ -4339,13 +4339,13 @@
   struct MeshTunnel *t = cls;
   struct GNUNET_PeerIdentity id;
 
+  t->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    return;
   GNUNET_PEER_resolve(t->id.oid, &id);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Tunnel %s [%X] timed out. Destroying.\n",
               GNUNET_i2s(&id), t->id.tid);
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-    return;
-  t->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   tunnel_destroy (t);
 }