(no commit message)

[oweals/gnunet.git] / src / transport / test_transport_api_udp_nat_peer2.conf

diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index 5ec73f6efe210fe96b3e9c3aee7c94cf7c8ad3ec..c33a12eceb8ab060c8566902e1373402cc5d2992 100644 (file)
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,35 +1,15 @@
-[transport-udp-nat]
+[transport-udp]
 PORT = 22368
 BEHIND_NAT = NO
+ALLOW_NAT = YES
 EXTERNAL_ADDRESS = 127.0.0.1
 INTERNAL_ADDRESS = 127.0.0.1
 
 [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
+AUTOSTART = NO
 
 [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
+AUTOSTART = NO
 
 [hostlist]
 HTTP-PROXY = 
@@ -51,36 +31,28 @@ 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
+AUTOSTART = NO
 
 [transport]
-PLUGINS = udp_nat
+PLUGINS = udp
 DEBUG = NO
 PREFIX = 
-ALLOW_SHUTDOWN = YES
 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/
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-peerinfo
@@ -88,9 +60,9 @@ CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22369
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-resolver
@@ -98,9 +70,9 @@ CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22364
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-statistics
@@ -108,10 +80,10 @@ CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22367
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
-DEFAULTSERVICES = 
-ALLOW_SHUTDOWN = YES
+DEFAULTSERVICES = transport
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-arm
@@ -119,9 +91,9 @@ CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22366
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [transport-tcp]
-ALLOW_SHUTDOWN = NO
 TIMEOUT = 300000
 PORT = 22368