X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api_udp_nat_peer1.conf;h=12e1bafb554c4a0e4c28343b1a280c5086be037f;hb=accae6c152eaacdf41b6069b88b3e5744ff06bba;hp=56978a5d677e00409553c34f9ee750744449d2e4;hpb=e1fe5a5ca9711cb615e4c85daf002364592814b9;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 56978a5d6..12e1bafb5 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,35 +1,14 @@
-[transport-udp-nat]
-PORT = 12368
-BEHIND_NAT = NO
+[transport-udp]
+PORT = 12060
+USE_LOCALADDR = YES
+
+[nat]
+BEHIND_NAT = YES
+BINDTO = 127.0.0.1
+ALLOW_NAT = NO
+ONLY_NAT_ADDRESSES = YES
+INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
-STARTING_PORT = 22222
-
-[fs]
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
-
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
-
-[datastore]
-DATABASE = sqlite
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-QUOTA = 100000000
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-datastore
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2093
 
 [hostlist]
 HTTP-PROXY = 
@@ -50,80 +29,63 @@ AUTOCONNECT = YES
 FRIENDS-ONLY = NO
 MINIMUM-FRIENDS = 0
 
-[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2092
-
 [transport]
-PLUGINS = udp_nat
-DEBUG = YES
-ALLOW_SHUTDOWN = YES
+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
+PORT = 12061
+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 
+#PREFIX = xterm -e xterm -T transport -e gdb --args 
 
 [peerinfo]
 TRUST = $SERVICEHOME/data/credit/
 HOSTS = $SERVICEHOME/data/hosts/
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12062
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12364
+PORT = 12063
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12064
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
-DEFAULTSERVICES = 
-ALLOW_SHUTDOWN = YES
+DEFAULTSERVICES = transport
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
-
-[transport-tcp]
-ALLOW_SHUTDOWN = NO
-TIMEOUT = 300000
-PORT = 12368
+PORT = 12065
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
 [TESTING]
 WEAKRANDOM = YES
@@ -133,5 +95,24 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
+
+[mesh]
+AUTOSTART = NO
+
+[fs]
+AUTOSTART = NO
+
+[datastore-sqlite]
+FILENAME = $SERVICEHOME/datastore/sqlite.db
+
+[datastore]
+AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+[core]
+AUTOSTART = NO
+