RECLAIM: refactoring; cleanup

[oweals/gnunet.git] / src / dht / test_dht_line.conf

diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 56c03f61a3a0c5e2c3395ece4d8875285e5a475d..62e337ef263824cfb2e6a12d4bd2194c5ff40e89 100644 (file)
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -1,35 +1,20 @@
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [PATHS]
-SERVICEHOME = /tmp/test_dht_topo/
-DEFAULTCONFIG = test_dht_line.conf
-
-[arm]
-PORT = 10010
-DEFAULTSERVICES = core dht
-#DEBUG = YES
-
-[statistics]
-AUTOSTART = YES
-PORT = 10000
+GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/
 
 [dht]
-DEBUG = NO
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 10001
+START_ON_DEMAND = YES
+IMMEDIATE_START = YES
 
-[dns]
-AUTOSTART = NO
-PORT = 10011
-
-[transport]
-PORT = 10002
-AUTOSTART = YES
+[dhtcache]
+QUOTA = 1 MB
+DATABASE = heap
 
 [nat]
-DISABLEV6 = YES 
-BINDTO = 127.0.0.1
+DISABLEV6 = YES
+RETURN_LOCAL_ADDRESSES = YES
+USE_LOCALADDR = YES
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
@@ -40,52 +25,14 @@ EXTERNAL_ADDRESS = 127.0.0.1
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[core]
-AUTOSTART = YES
-PORT = 10003
-
-[peerinfo]
-AUTOSTART = YES
-PORT = 10004
+[testbed]
+OVERLAY_TOPOLOGY = LINE
 
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-NUM_PEERS = 5
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = LINE
-BLACKLIST_TOPOLOGY = LINE
-#TOPOLOGY_FILE = small.dat
-#CONNECT_TOPOLOGY = ERDOS_RENYI
-#CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
-#CONNECT_TOPOLOGY_OPTION_MODIFIER = 25
-#PERCENTAGE = 3
-#PROBABILITY = .1
-F2F = NO
-CONNECT_TIMEOUT = 60 s
-CONNECT_ATTEMPTS = 3
-DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-TOPOLOGY_OUTPUT_FILE = line_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_dht_topo]
-CONNECTION_LIMIT = 5
-#DATA_OUTPUT_FILE=data_output
-
-[namestore]
-AUTOSTART = NO
+[transport]
+plugins = unix
 
 [nse]
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0