simplifying config

1 files changed, 16 insertions, 61 deletions

diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf
index 264a6b566..3b5a6a87a 100644
--- a/src/transport/test_transport_ats_2addr.conf
+++ b/src/transport/test_transport_ats_2addr.conf
@@ -1,26 +1,13 @@
+@INLINE@ test_transport_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data.conf
 
-[resolver]
-PORT = 2564
+[TESTING]
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[transport]
-PORT = 2565
-PLUGINS = udp unix
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#WAN_BW_LIMIT_DOWN = 100
-#WAN_BW_LIMIT_UP = 1000000
-#LAN_BW_LIMIT_DOWN = 100
-#LAN_BW_LIMIT_UP = 100000000
-#WLAN_ENERGY_DOWN_LIMIT = 0
-#WLAN_ENERGY_UP_LIMIT = 30
-#DUMP_MLP = YES
-#DUMP_SOLUTION = YES
-ATS_MIN_INTERVAL = 100
-ATS_EXEC_INTERVAL = 250
+[transport-udp]
+PORT = 2571
 
 [arm]
 PORT = 2566
@@ -29,54 +16,22 @@ DEFAULTSERVICES = core
 [statistics]
 PORT = 2567
 
-[transport-tcp]
-USE_LOCALADDR = YES
-
-[nat]
-BINDTO = 127.0.0.1
-#BEHIND_NAT = NO
-#ALLOW_NAT = NO
-#ENABLE_UPNP = NO
-#EXTERNAL_ADDRESS = 127.0.0.1
-#INTERNAL_ADDRESS = 127.0.0.1
-
-[transport-unix]
-PORT = 2572
-
-
-[transport-udp]
-PORT = 2571
-USE_LOCALADDR = YES
+[resolver]
+PORT = 2564
 
 [peerinfo]
 PORT = 2569
 
+[transport]
+PORT = 2565
+PLUGINS = udp unix
+ATS_MIN_INTERVAL = 100
+ATS_EXEC_INTERVAL = 250
+
 [core]
+AUTOSTART = YES
 PORT = 2570
 
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
+[transport-unix]
+PORT = 2572