-modify timeout values further

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

diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index e49810569fa9bb983544d61585f05ca9aab006c5..459ebf376dd14bb1fe952dab23972d4dba522ee6 100644 (file)
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test_dht_2dtours/
+SERVICEHOME = /tmp/test_dht_topo/
 DEFAULTCONFIG = test_dht_2dtours.conf
 
 [arm]
@@ -36,9 +36,11 @@ ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
 [core]
-TOTAL_QUOTA_IN = 91024000
-TOTAL_QUOTA_OUT = 91024000
 AUTOSTART = YES
 PORT = 10003
 
@@ -47,10 +49,13 @@ AUTOSTART = YES
 PORT = 10004
 
 [testing]
-NUM_PEERS = 16
 WEAKRANDOM = YES
-TOPOLOGY = 2D_TORUS
-CONNECT_TOPOLOGY = NONE
+
+[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
@@ -58,13 +63,13 @@ CONNECT_TOPOLOGY = NONE
 #PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
+MAX_CONCURRENT_SSH = 20
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = 2dtorus_topo_initial
 MAX_OUTSTANDING_CONNECTIONS = 75
 #SINGLE_PEERINFO_PER_HOST = YES
@@ -73,6 +78,12 @@ MAX_OUTSTANDING_CONNECTIONS = 75
 #NUM_STATISTICS_PER_HOST = 10
 DELETE_FILES = YES
 
-[test_dht_2dtorus]
-CONNECTION_LIMIT = 16
-DATA_OUTPUT_FILE=data_output
+[test_dht_topo]
+CONNECTION_LIMIT = 20
+#DATA_OUTPUT_FILE=data_output
+
+
+[nse]
+WORKDELAY = 500 ms
+INTERVAL = 60 s
+WORKBITS = 0