X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api_multi_peer2.conf;h=fcfc1db033821e5ec778294b2493fd0baeaf65bc;hb=accae6c152eaacdf41b6069b88b3e5744ff06bba;hp=99ab5f8d5b7bd92519ea9be1a26084c2004b0ae3;hpb=f8e7538e60434dd3ea0548dedc6ab8fd73f46666;p=oweals%2Fgnunet.git

diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 99ab5f8d5..fcfc1db03 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,7 +1,10 @@
 [transport-tcp]
-DISABLEV6 = YES
-PORT = 40001
+PORT = 12150
+USE_LOCALADDR = YES
+
+[nat]
 BINDTO = 127.0.0.1
+DISABLEV6 = YES
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 ENABLE_UPNP = NO
@@ -9,26 +12,29 @@ EXTERNAL_ADDRESS = 127.0.0.1
 INTERNAL_ADDRESS = 127.0.0.1
 
 [transport-udp]
-PORT = 40002
+PORT = 12151
+USE_LOCALADDR = YES
 
 [transport-http]
-PORT = 40003
+PORT = 12152
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
 #BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
+USE_LOCALADDR = YES
 
 [transport-https]
-PORT = 40004
+PORT = 12153
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
 #BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
+USE_LOCALADDR = YES
 
 [transport-unix]
-PORT = 40005
+PORT = 12154
 
 [core]
 AUTOSTART = NO
@@ -38,18 +44,7 @@ AUTOSTART = NO
 
 [datastore]
 AUTOSTART = NO
-[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
+
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -70,7 +65,7 @@ FRIENDS-ONLY = NO
 MINIMUM-FRIENDS = 0
 
 [transport]
-PLUGINS = tcp udp http unix
+PLUGINS = tcp udp unix
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -80,7 +75,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22365
+PORT = 12155
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = valgrind --tool=callgrind
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
@@ -95,7 +90,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12156
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -105,7 +100,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12157
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -116,7 +111,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12158
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
@@ -127,7 +122,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12159
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]
@@ -138,7 +133,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_multi_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-2/
+SERVICEHOME = /tmp/test-transport/api-multi-p2/
 
 
 [dht]
@@ -147,3 +142,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+