X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api_tcp_nat_peer1.conf;h=78afb3db83c0874e5073e7f64824077223e9df6e;hb=f181f6eaf8cdb1fdb47dc98cf171ad1be842b441;hp=06f54c71767c60eeff75bc7c125da6384b1009c0;hpb=382d2ca93adf8f403ba4fcd3cce76361c2c69f89;p=oweals%2Fgnunet.git

diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 06f54c717..78afb3db8 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,110 +1,36 @@
-[transport-tcp]
-PORT = 12368
-BINDTO = 127.0.0.1
-BEHIND_NAT = YES
-ONLY_NAT_ADDRESSES = YES
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-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
-DEBUG = NO
-#PREFIX = xterm -T transport2 -e gdb --args
-#PREFIX = valgrind --leak-check=full
-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 = 12365
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-
-[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
+@INLINE@ template_cfg_peer1.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
+DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
 
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 1236
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+[nat]
+BEHIND_NAT = YES
+ENABLE_NAT_SERVER = YES
+DISABLEV6 = YES
 
-[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
+[transport-tcp]
+PORT = 0
+TIMEOUT = 5 s
 
 [arm]
-DEFAULTSERVICES = transport statistics
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12366
+PORT = 1204
+DEFAULTSERVICES = transport
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 12368
+[statistics]
+PORT = 12023
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
-[TESTING]
-WEAKRANDOM = YES
+[resolver]
+PORT = 12022
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+[peerinfo]
+PORT = 12021
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
-[PATHS]
-DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+[transport]
+PORT = 29542
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+#DEBUG = YES