X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api_udp_nat_peer1.conf;h=23f280b5efe42244f8f25fa7b6c09428c976de4c;hb=9bbe1dc9c3dfa9de90759e540d715de6547e43cd;hp=ef7316a35be32913a159572af5de48935c59f77a;hpb=986143688bdfb45b7536838d795f3445bd6d4881;p=oweals%2Fgnunet.git

diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index ef7316a35..23f280b5e 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,111 +1,34 @@
-[transport-udp]
-PORT = 12368
+@INLINE@ template_cfg_peer1.conf
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-nat-p1/
+
+[nat]
 BEHIND_NAT = YES
 ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
+ONLY_NAT_ADDRESSES = YES
 
-[fs]
-AUTOSTART = NO
-
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[transport-udp]
+PORT = 0
 
-[datastore]
-AUTOSTART = NO
+[arm]
+PORT = 12065
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
+[statistics]
+PORT = 12064
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
+[resolver]
+PORT = 12063
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
-[core]
-AUTOSTART = NO
+[peerinfo]
+PORT = 12062
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
+PORT = 12061
 PLUGINS = udp
-DEBUG = NO
-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 = 12365
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
-#PREFIX = xterm -e xterm -T transport -e gdb --args 
-
-[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 = 12369
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12364
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12367
-UNIXPATH = /tmp/gnunet-p1-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 = 12366
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 12368
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/