[GNUnet-SVN] r19200 - gnunet/src/vpn

[gnunet]

Author: grothoff
Date: 2012-01-17 16:52:35 +0100 (Tue, 17 Jan 2012)
New Revision: 19200

Modified:
   gnunet/src/vpn/gnunet-service-vpn.c
Log:
-fix #2079

Modified: gnunet/src/vpn/gnunet-service-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-service-vpn.c 2012-01-17 15:40:06 UTC (rev 19199)
+++ gnunet/src/vpn/gnunet-service-vpn.c 2012-01-17 15:52:35 UTC (rev 19200)
@@ -510,9 +510,13 @@
                     const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct TunnelState *ts = cls;
+  struct GNUNET_MESH_Tunnel *tunnel;
 
   ts->destroy_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_MESH_tunnel_destroy (ts->tunnel);
+  if (NULL == (tunnel = ts->tunnel))
+    return;
+  ts->tunnel = NULL;
+  GNUNET_MESH_tunnel_destroy (tunnel);
 }
 
 
@@ -759,6 +763,7 @@
 {
   GNUNET_HashCode key;
   struct TunnelMessageQueueEntry *tnq;
+  struct GNUNET_MESH_Tunnel *tunnel;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Cleaning up tunnel state\n");
@@ -790,10 +795,10 @@
     ts->th = NULL;
   }
   GNUNET_assert (NULL == ts->destination.heap_node);
-  if (NULL != ts->tunnel)
+  if (NULL != (tunnel = ts->tunnel))
   {
-    GNUNET_MESH_tunnel_destroy (ts->tunnel);
     ts->tunnel = NULL;
+    GNUNET_MESH_tunnel_destroy (tunnel);
   }
   if (NULL != ts->heap_node)
   {