REST/NAMESTORE: rework API

[oweals/gnunet.git] / src / cadet / test_cadet.conf

diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index 72e63eef2b7e4e1b24fe1cf0aa5c31c2d58534a3..30e496aff6854a78819698bbf1d65cfc90805c40 100644 (file)
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -7,7 +7,7 @@ OVERLAY_TOPOLOGY = LINE
 #BINARY = gnunet-service-cadet-enc
 #PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-REFRESH_CONNECTION_TIME = 333 ms
+REFRESH_CONNECTION_TIME = 1 s
 ID_ANNOUNCE_TIME = 5 s
 CONNECT_TIMEOUT = 30 s
 DEFAULT_TTL = 16
@@ -32,6 +32,8 @@ NEIGHBOUR_LIMIT = 50
 #MANIPULATE_DELAY_IN = 10 ms
 #MANIPULATE_DELAY_OUT = 10 ms
 
+[nat]
+ENABLE_UPNP = NO
 
 [ats]
 # Network specific inbound/outbound quotas
@@ -57,12 +59,7 @@ BLUETOOTH_QUOTA_OUT = unlimited
 USE_EPHEMERAL_KEYS = NO
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-cadet/
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-DISABLEV6 = YES
-USE_LOCALADDR = YES
+GNUNET_TEST_HOME = $GNUNET_TMP/test-cadet/
 
 [peerinfo]
 NO_IO = YES
@@ -71,33 +68,37 @@ NO_IO = YES
 WORKBITS = 0
 
 [hostlist]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [fs]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
+
+[rps]
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO