1 files changed, 23 insertions, 40 deletions
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 005c490..943ef36 100644
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -1,18 +1,32 @@
 [PATHS]
 SERVICEHOME = /tmp/test_mesh_small/
-DEFAULTCONFIG = test_mesh_small.conf
+
+[mesh]
+PORT = 10005
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+REFRESH_PATH_TIME = 5 s
+APP_ANNOUNCE_TIME = 2 s
+ID_ANNOUNCE_TIME = 2 s
+CONNECT_TIMEOUT = 30 s
+DEFAULT_TTL = 64
+DHT_REPLICAITON_LEVEL = 3
+# PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
+# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
+
+[testbed]
+NUM_PEERS = 5
+OVERLAY_TOPOLOGY = LINE
 
 [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;
@@ -28,6 +42,10 @@ WORKDELAY = 500 ms
 AUTOSTART = NO
 PORT = 10011
 
+[vpn]
+AUTOSTART = NO
+PORT = 10012
+
 [transport]
 PORT = 10002
 AUTOSTART = YES
@@ -40,6 +58,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
@@ -53,43 +73,6 @@ PORT = 10003
 AUTOSTART = YES
 PORT = 10004
 
-[mesh]
-PORT = 10005
-DEBUG = YES
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-# PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
-# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-
 [testing]
-NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = LINE
-BLACKLIST_TOPOLOGY = LINE
-BLACKLIST_TRANSPORTS = tcp udp http unix
-#TOPOLOGY_FILE = small.dat
-#CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
-#CONNECT_TOPOLOGY_OPTION_MODIFIER = 25
-#PERCENTAGE = 3
-#PROBABILITY = .1
-F2F = NO
-CONNECT_TIMEOUT = 660 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
 
-[test_mesh_small]
-WAIT_TIME = 300 s
-CONNECTION_LIMIT = 16
-#DATA_OUTPUT_FILE=data_output