- copied and adapted from testbed (previous failed during 30c3 with IPv6 VPN setup)

1 files changed, 42 insertions, 34 deletions

diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index f61aea30e..f4806878f 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -1,14 +1,23 @@
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-mesh/
-
-[mesh]
-# BINARY = gnunet-service-mesh-enc
+[testbed]
 AUTOSTART = NO
+PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
-PORT = 10511
+OVERLAY_TOPOLOGY = LINE
+#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
+
+[fs]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+
+[mesh]
+#BINARY = gnunet-service-mesh-enc
 #PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
+AUTOSTART = NO
+ACCEPT_FROM = 127.0.0.1;
 REFRESH_PATH_TIME = 2 s
 ID_ANNOUNCE_TIME = 5 s
 CONNECT_TIMEOUT = 30 s
@@ -19,26 +28,8 @@ MAX_CONNECTIONS = 10
 MAX_MSGS_QUEUE = 20
 #DROP_PERCENT = 1
 
-[testbed]
-NUM_PEERS = 5
-OVERLAY_TOPOLOGY = LINE
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-PORT = 10012
-
 [dht]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 12100
+AUTOSTART = NO
 DISABLE_TRY_CONNECT = YES
 FORCE_NSE = 3
 
@@ -47,7 +38,7 @@ QUOTA = 1 MB
 DATABASE = heap
 
 [transport]
-PLUGINS = tcp
+PLUGINS = udp
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
@@ -59,31 +50,48 @@ WAN_QUOTA_IN = 3932160
 
 [core]
 PORT = 12092
+AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
 
 [arm]
-DEFAULTSERVICES = core mesh
+DEFAULTSERVICES = core transport dht mesh
 PORT = 12366
 
-[transport-tcp]
+[transport-udp]
 TIMEOUT = 300 s
 PORT = 12368
 
+[gnunetd]
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
+
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-mesh/
+
 [dns]
 AUTOSTART = NO
 
 [nse]
 AUTOSTART = NO
 
-[namestore]
-AUTOSTART = NO
-
-[consensus]
+[vpn]
 AUTOSTART = NO
 
 [nat]
-# Allow running on systems with only loopback?
 RETURN_LOCAL_ADDRESSES = YES
-# Disable redundant addresses...
 DISABLEV6 = YES
 USE_LOCALADDR = YES
 
+[gns-helper-service-w32]
+AUTOSTART = NO
+
+[consensus]
+AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[statistics]
+AUTOSTART = NO
+
+[peerinfo]
+NO_IO = YES