Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index ff9fb4c5bfd192dc86cd041c537404411b50bb74..f2308df29ff893c7c2b74b6fbd98748a5b4ad947 100644 (file)
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -1,24 +1,13 @@
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 OVERLAY_TOPOLOGY = LINE
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
 [cadet]
 #BINARY = gnunet-service-cadet-enc
 #PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-AUTOSTART = NO
-ACCEPT_FROM = 127.0.0.1;
-REFRESH_CONNECTION_TIME = 333 ms
+REFRESH_CONNECTION_TIME = 1 s
 ID_ANNOUNCE_TIME = 5 s
 CONNECT_TIMEOUT = 30 s
 DEFAULT_TTL = 16
@@ -30,7 +19,6 @@ DISABLE_TRY_CONNECT = YES
 REKEY_PERIOD = 2 s
 
 [dht]
-AUTOSTART = NO
 DISABLE_TRY_CONNECT = YES
 FORCE_NSE = 3
 
@@ -40,61 +28,73 @@ DATABASE = heap
 
 [transport]
 PLUGINS = udp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-PORT = 12365
 #MANIPULATE_DELAY_IN = 10 ms
 #MANIPULATE_DELAY_OUT = 10 ms
 
+[nat]
+ENABLE_UPNP = NO
 
 [ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
+# Network specific inbound/outbound quotas
+UNSPECIFIED_QUOTA_IN = unlimited
+UNSPECIFIED_QUOTA_OUT = unlimited
+# LOOPBACK
+LOOPBACK_QUOTA_IN = unlimited
+LOOPBACK_QUOTA_OUT = unlimited
+# LAN
+LAN_QUOTA_IN = unlimited
+LAN_QUOTA_OUT = unlimited
+#WAN
+WAN_QUOTA_OUT = unlimited
+WAN_QUOTA_IN = unlimited
+# WLAN
+WLAN_QUOTA_IN = unlimited
+WLAN_QUOTA_OUT = unlimited
+# BLUETOOTH
+BLUETOOTH_QUOTA_IN = unlimited
+BLUETOOTH_QUOTA_OUT = unlimited
 
 [core]
-PORT = 12092
-AUTOSTART = YES
 USE_EPHEMERAL_KEYS = NO
 
-[arm]
-PORT = 12366
-
-[transport-udp]
-TIMEOUT = 300 s
-PORT = 12368
+[PATHS]
+GNUNET_TEST_HOME = $GNUNET_TMP/test-cadet/
 
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
+[peerinfo]
+NO_IO = YES
 
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-cadet/
+[nse]
+WORKBITS = 0
 
-[dns]
+[hostlist]
+FORCESTART = NO
 AUTOSTART = NO
 
-[nse]
+[fs]
+FORCESTART = NO
 AUTOSTART = NO
 
 [vpn]
+FORCESTART = NO
 AUTOSTART = NO
 
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-DISABLEV6 = YES
-USE_LOCALADDR = YES
-
-[gns-helper-service-w32]
+[revocation]
+FORCESTART = NO
 AUTOSTART = NO
 
-[consensus]
+[gns]
+FORCESTART = NO
 AUTOSTART = NO
 
-[gns]
+[namestore]
+FORCESTART = NO
 AUTOSTART = NO
 
-[statistics]
+[namecache]
+FORCESTART = NO
 AUTOSTART = NO
 
-[peerinfo]
-NO_IO = YES
+[topology]
+FORCESTART = NO
+AUTOSTART = NO