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

[gnunet]

Author: bartpolot
Date: 2013-06-14 12:49:54 +0200 (Fri, 14 Jun 2013)
New Revision: 27447

Modified:
   gnunet/src/mesh/test_mesh2.conf
   gnunet/src/mesh/test_mesh2_small.c
Log:
- fix

Modified: gnunet/src/mesh/test_mesh2.conf
===================================================================
--- gnunet/src/mesh/test_mesh2.conf     2013-06-14 09:45:02 UTC (rev 27446)
+++ gnunet/src/mesh/test_mesh2.conf     2013-06-14 10:49:54 UTC (rev 27447)
@@ -1,9 +1,6 @@
-[fs]
-AUTOSTART = NO
+[PATHS]
+SERVICEHOME = /tmp/test-mesh/
 
-[resolver]
-AUTOSTART = NO
-
 [mesh]
 BINARY = gnunet-service-mesh-new
 AUTOSTART = NO
@@ -21,6 +18,16 @@
 MAX_TUNNELS = 10
 MAX_MSGS_QUEUE = 20
 
+[testbed]
+NUM_PEERS = 5
+OVERLAY_TOPOLOGY = LINE
+
+[fs]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+
 [vpn]
 AUTOSTART = NO
 PORT = 10012
@@ -67,9 +74,6 @@
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
 
-[PATHS]
-SERVICEHOME = /tmp/test-mesh/
-
 [dns]
 AUTOSTART = NO
 

Modified: gnunet/src/mesh/test_mesh2_small.c
===================================================================
--- gnunet/src/mesh/test_mesh2_small.c  2013-06-14 09:45:02 UTC (rev 27446)
+++ gnunet/src/mesh/test_mesh2_small.c  2013-06-14 10:49:54 UTC (rev 27447)
@@ -239,15 +239,15 @@
   long line = (long) cls;
   unsigned int i;
 
-  for (i = 0; i < 3; i++)
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "disconnecting mesh service of peers, called from line %ld\n",
+              line);
+  for (i = 0; i < 4; i++)
     if (NULL != t_op[i])
     {
       GNUNET_TESTBED_operation_done (t_op[i]);
       t_op[i] = NULL;
     }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "disconnecting mesh service of peers, called from line %ld\n",
-              line);
   disconnect_task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != t)
   {
@@ -825,8 +825,8 @@
   }
 
   p_ids = 0;
-  GNUNET_MESH_TEST_run ("test_mesh_small",
-                        "test_mesh_small.conf",
+  GNUNET_MESH_TEST_run ("test_mesh2_small",
+                        "test_mesh2.conf",
                         5,
                         &tmain,
                         NULL,