X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdht%2Ftest_dht_2dtorus.conf;h=c3fe5135f805e11939835b4dc8cd576034b3e239;hb=79fb947eb8fba243ea65e19b40b65e04f8806865;hp=33d5a3624c6d57bcad4c1fbce0f217abdaafdd2e;hpb=a669108f0f2d602bfea9c7a8132fb761388493ad;p=oweals%2Fgnunet.git

diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 33d5a3624..c3fe5135f 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -1,35 +1,19 @@
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
 [PATHS]
-SERVICEHOME = /tmp/test_dht_topo/
-DEFAULTCONFIG = test_dht_2dtours.conf
-
-[arm]
-PORT = 10010
-DEFAULTSERVICES = core dht
-#DEBUG = YES
-
-[statistics]
-AUTOSTART = YES
-PORT = 10000
+GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/
 
 [dht]
-DEBUG = NO
 AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 10001
-
-[dns]
-AUTOSTART = NO
-PORT = 10011
+FORCESTART = YES
 
-[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
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
@@ -40,50 +24,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
-
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-NUM_PEERS = 16 
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = 2D_TORUS
-BLACKLIST_TOPOLOGY = 2D_TORUS
-#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 = ${DATADIR}/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 20
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-TOPOLOGY_OUTPUT_FILE = 2dtorus_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 = 20
-#DATA_OUTPUT_FILE=data_output
-
+[testbed]
+OVERLAY_TOPOLOGY = 2D_TORUS
 
 [nse]
+AUTOSTART = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
+
+[transport]
+PLUGINS = unix