X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api_udp_nat_peer2.conf;h=0852b25d91060905ed2696222b9fb010d02e664a;hb=f181f6eaf8cdb1fdb47dc98cf171ad1be842b441;hp=65e8b1d671d2de0fd0afa978b9d163caa7784da8;hpb=f8e7538e60434dd3ea0548dedc6ab8fd73f46666;p=oweals%2Fgnunet.git

diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index 65e8b1d67..0852b25d9 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,128 +1,35 @@
-[transport-udp]
-PORT = 22368
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
-ALLOW_NAT = YES
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-
-[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
-
-[core]
-AUTOSTART = NO
-
-[transport]
-PLUGINS = udp
-DEBUG = NO
-PREFIX = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22365
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
-
-[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 = 22369
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+@INLINE@ template_cfg_peer2.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
+DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf
 
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22364
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+[nat]
+ALLOW_NAT = YES
 
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22367
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+[transport-udp]
+PORT = 12070
 
 [arm]
+PORT = 12075
 DEFAULTSERVICES = transport
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22366
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 22368
-
-[TESTING][mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+[statistics]
+PORT = 12074
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
-[PATHS]
-DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+[resolver]
+PORT = 12073
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
+[peerinfo]
+PORT = 12072
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
-[dht]
-AUTOSTART = NO
+[transport]
+PORT = 12071
+PLUGINS = udp
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+DEBUG = NO
 
-[mesh]
-AUTOSTART = NO