simplifying config

1 files changed, 24 insertions, 128 deletions

diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 222f165f0..889145fc3 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,154 +1,50 @@
-[transport-tcp]
-PORT = 12150
-USE_LOCALADDR = YES
+@INLINE@ test_transport_defaults.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-multi-p2/
+DEFAULTCONFIG = test_transport_api_multi_peer2.conf
 
 [nat]
-BINDTO = 127.0.0.1
-DISABLEV6 = YES
-BEHIND_NAT = NO
 ALLOW_NAT = NO
-ENABLE_UPNP = NO
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
+
+[transport-tcp]
+PORT = 12150
+TIMEOUT = 5000
 
 [transport-udp]
 PORT = 12151
-USE_LOCALADDR = YES
 
 [transport-http]
 PORT = 12152
-DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-USE_LOCALADDR = YES
 
 [transport-https]
 PORT = 12153
-DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-USE_LOCALADDR = YES
-
-[transport-unix]
-PORT = 12154
-
-[core]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[transport]
-PLUGINS = tcp udp unix
-#DEBUG = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12155
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-#PREFIX = valgrind --tool=callgrind
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12156
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12157
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-
-[statistics]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12158
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
-DEFAULTSERVICES = transport
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12159
+DEFAULTSERVICES = transport
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-DEFAULTCONFIG = test_transport_api_multi_peer2.conf
-SERVICEHOME = /tmp/test-transport/api-multi-p2/
-
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-
-[dns]
-AUTOSTART = NO
+[statistics]
+PORT = 12158
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
+[resolver]
+PORT = 12157
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
+[peerinfo]
+PORT = 12156
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
-[nse]
-AUTOSTART = NO
+[transport]
+PORT = 12155
+PLUGINS = tcp udp unix
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 
+[transport-unix]
+PORT = 12154