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

[gnunet]

Author: bartpolot
Date: 2012-12-20 18:18:03 +0100 (Thu, 20 Dec 2012)
New Revision: 25600

Modified:
   gnunet/src/mesh/mesh_tunnel_tree.h
   gnunet/src/mesh/test_mesh_small.c
   gnunet/src/mesh/test_mesh_small.conf
Log:
- account for disconnection

Modified: gnunet/src/mesh/mesh_tunnel_tree.h
===================================================================
--- gnunet/src/mesh/mesh_tunnel_tree.h  2012-12-20 17:16:01 UTC (rev 25599)
+++ gnunet/src/mesh/mesh_tunnel_tree.h  2012-12-20 17:18:03 UTC (rev 25600)
@@ -337,6 +337,8 @@
  * If the tree is not local and no longer has any paths, the root node will be
  * destroyed and marked as NULL.
  *
+ * FIXME: dont destroy the root
+ *
  * @param t Tunnel tree to use.
  * @param peer Short ID of the peer to remove from the tunnel tree.
  * @param cb Callback to notify client of disconnected peers.

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2012-12-20 17:16:01 UTC (rev 25599)
+++ gnunet/src/mesh/test_mesh_small.c   2012-12-20 17:18:03 UTC (rev 25600)
@@ -665,6 +665,16 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "peer %s disconnected\n",
               GNUNET_i2s (peer));
+  if (P2P_SIGNAL == test)
+  {
+    ok ++;
+    if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+    {
+      GNUNET_SCHEDULER_cancel (disconnect_task);
+    }
+    disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers,
+                                                (void *) __LINE__);
+  }
   return;
 }
 

Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf        2012-12-20 17:16:01 UTC (rev 
25599)
+++ gnunet/src/mesh/test_mesh_small.conf        2012-12-20 17:18:03 UTC (rev 
25600)
@@ -11,7 +11,7 @@
 CONNECT_TIMEOUT = 30 s
 DEFAULT_TTL = 64
 DHT_REPLICAITON_LEVEL = 3
-# PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
+PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
 # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
 [testbed]