- disable try_connect to force topology

[oweals/gnunet.git] / src / mesh / test_mesh_small.conf

diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 2277a9a76ec42081e15363eaf02594b4868a7a0c..943ef3638af884c4a0c591b7db8ce724e198fc3f 100644 (file)
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -3,30 +3,30 @@ SERVICEHOME = /tmp/test_mesh_small/
 
 [mesh]
 PORT = 10005
-DEBUG = YES
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 REFRESH_PATH_TIME = 5 s
 APP_ANNOUNCE_TIME = 2 s
 ID_ANNOUNCE_TIME = 2 s
-UNACKNOWLEDGED_WAIT = 2 s
 CONNECT_TIMEOUT = 30 s
 DEFAULT_TTL = 64
-DHT_REPLICAITON_LEVEL = 10
+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;
@@ -59,6 +59,7 @@ 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
@@ -75,35 +76,3 @@ PORT = 10004
 [testing]
 WEAKRANDOM = YES
 
-[testing_old]
-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 = ${DATADIR}/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 = 30 s
-CONNECTION_LIMIT = 16
-#DATA_OUTPUT_FILE=data_output