X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdht%2Ftest_dht_2dtorus.conf;h=0e546cf685ad35df0b5410fecb211d7e508b28a4;hb=c60e83d3939da9f4e368c13ba3d2ea950b6c28d1;hp=0d7b9487959ae7af955907315c456daf3033b545;hpb=7dfd634b17df4e1505c62f2224380a0d38da2e8d;p=oweals%2Fgnunet.git

diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 0d7b94879..0e546cf68 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -1,78 +1,37 @@
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [PATHS]
-SERVICEHOME = /tmp/test_dht_2dtours/
-DEFAULTCONFIG = test_dht_2dtours.conf
-
-[arm]
-PORT = 10010
-DEFAULTSERVICES = core dht
-#DEBUG = YES
-
-[statistics]
-AUTOSTART = YES
-PORT = 10000
+GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/
 
 [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
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[core]
-TOTAL_QUOTA_IN = 1 GB
-TOTAL_QUOTA_OUT = 1 GB
-AUTOSTART = YES
-PORT = 10003
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
-[peerinfo]
-AUTOSTART = YES
-PORT = 10004
+[testbed]
+OVERLAY_TOPOLOGY = 2D_TORUS
 
-[testing]
-NUM_PEERS = 16
-WEAKRANDOM = YES
-TOPOLOGY = 2D_TORUS
-CONNECT_TOPOLOGY = NONE
-#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 = 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
+[nse]
+START_ON_DEMAND = YES
+WORKDELAY = 500 ms
+INTERVAL = 60 s
+WORKBITS = 0
 
-[test_dht_2dtorus]
-CONNECTION_LIMIT = 16
-#DATA_OUTPUT_FILE=data_output
+[transport]
+PLUGINS = unix