1 files changed, 24 insertions, 38 deletions
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf
index 9a2227b..fb235fe 100644
--- a/src/mesh/test_mesh_2dtorus.conf
+++ b/src/mesh/test_mesh_2dtorus.conf
@@ -1,23 +1,38 @@
 [PATHS]
 SERVICEHOME = /tmp/test_mesh_small/
-DEFAULTCONFIG = test_mesh_small.conf
+
+[mesh]
+PORT = 10005
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+DHT_REPLICATION_LEVEL = 10
+# PREFIX = valgrind --leak-check=full
+# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
+
+[testing]
+WEAKRANDOM = YES
+
+[testbed]
+NUM_PEERS = 16
+OVERLAY_TOPOLOGY = 2D_TORUS
+
+
 
 [arm]
 PORT = 10010
 DEFAULTSERVICES = core dht mesh
-#DEBUG = YES
 
 [statistics]
 AUTOSTART = YES
 PORT = 10000
 
 [dht]
-DEBUG = NO
 AUTOSTART = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 PORT = 10001
+DISABLE_TRY_CONNECT = YES
 
 [nse]
 WORKBITS = 0
@@ -26,6 +41,10 @@ WORKBITS = 0
 AUTOSTART = NO
 PORT = 10011
 
+[vpn]
+AUTOSTART = NO
+PORT = 10012
+
 [transport]
 PORT = 10002
 AUTOSTART = YES
@@ -38,6 +57,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+RETURN_LOCAL_ADDRESSES = YES
+USE_LOCALADDR = YES
 
 [ats]
 WAN_QUOTA_IN = 1 GB
@@ -50,38 +71,3 @@ PORT = 10003
 [peerinfo]
 AUTOSTART = YES
 PORT = 10004
-
-[mesh]
-PORT = 10005
-DEBUG=YES
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-# PREFIX = valgrind --leak-check=full
-# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-
-[testing]
-NUM_PEERS = 16
-WEAKRANDOM = YES
-TOPOLOGY = 2D_TORUS
-CONNECT_TOPOLOGY = 2D_TORUS
-#TOPOLOGY_FILE = small.dat
-CONNECT_TOPOLOGY = 2D_TORUS
-#CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
-#CONNECT_TOPOLOGY_OPTION_MODIFIER = 25
-#PERCENTAGE = 3
-#PROBABILITY = .1
-F2F = NO
-CONNECT_TIMEOUT = 600 s
-CONNECT_ATTEMPTS = 2
-DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-TOPOLOGY_OUTPUT_FILE = mesh_topo_initial
-MAX_OUTSTANDING_CONNECTIONS = 75
-#SINGLE_PEERINFO_PER_HOST = YES
-#NUM_PEERINFO_PER_HOST = 10
-#SINGLE_STATISTICS_PER_HOST = YES
-#NUM_STATISTICS_PER_HOST = 10
-DELETE_FILES = YES