Replace mesh with new version

1 files changed, 20 insertions, 13 deletions

diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index 3b35a16b4..58dff5adc 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -1,17 +1,15 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
+[PATHS]
+SERVICEHOME = /tmp/test-mesh/
 
 [mesh]
-AUTOSTART = YES
+BINARY = gnunet-service-mesh-new
+AUTOSTART = NO
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 PORT = 10511
-# PREFIX = valgrind --leak-check=full
-# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-REFRESH_PATH_TIME = 3 s
+#PREFIX = valgrind --leak-check=full
+#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
+REFRESH_PATH_TIME = 2 s
 APP_ANNOUNCE_TIME = 5 s
 ID_ANNOUNCE_TIME = 5 s
 CONNECT_TIMEOUT = 30 s
@@ -20,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
@@ -30,6 +38,8 @@ ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 PORT = 12100
+DISABLE_TRY_CONNECT = YES
+FORCE_NSE = 3
 
 [block]
 plugins = dht test
@@ -53,7 +63,7 @@ WAN_QUOTA_IN = 3932160
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core
+DEFAULTSERVICES = core mesh
 PORT = 12366
 
 [transport-tcp]
@@ -66,9 +76,6 @@ WEAKRANDOM = YES
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
 
-[PATHS]
-SERVICEHOME = /tmp/test-mesh/
-
 [dns]
 AUTOSTART = NO