From: Bart Polot <bart@net.in.tum.de>
Date: Fri, 14 Jun 2013 10:49:54 +0000 (+0000)
Subject: - fix
X-Git-Tag: initial-import-from-subversion-38251~8763
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1d0dc833d1121914d42475d3c8b9e2e326a625fd;hp=5a8b58263b47eb9e5d82f47aad6931f24158a815;p=oweals%2Fgnunet.git

- fix
---

diff --git a/src/mesh/test_mesh2.conf b/src/mesh/test_mesh2.conf
index 9d57a49d1..a517d2a35 100644
--- a/src/mesh/test_mesh2.conf
+++ b/src/mesh/test_mesh2.conf
@@ -1,8 +1,5 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
+[PATHS]
+SERVICEHOME = /tmp/test-mesh/
 
 [mesh]
 BINARY = gnunet-service-mesh-new
@@ -21,6 +18,16 @@ DHT_REPLICATION_LEVEL = 3
 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 @@ WEAKRANDOM = YES
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
 
-[PATHS]
-SERVICEHOME = /tmp/test-mesh/
-
 [dns]
 AUTOSTART = NO
 
diff --git a/src/mesh/test_mesh2_small.c b/src/mesh/test_mesh2_small.c
index b1631570d..f7f7e930f 100644
--- a/src/mesh/test_mesh2_small.c
+++ b/src/mesh/test_mesh2_small.c
@@ -239,15 +239,15 @@ disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   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 @@ main (int argc, char *argv[])
   }
 
   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,