X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftransport%2Ftest_transport_api_multi_peer2.conf;h=c660c3c411af0be371b58e761b262ef6fc0d388d;hb=66963559294951161370c50f2430a31d54448f86;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..c660c3c41 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,149 +1,45 @@
-[transport-tcp]
-DISABLEV6 = YES
-PORT = 40001
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
+@INLINE@ template_cfg_peer2.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-multi-p2/
+
+[nat]
 ALLOW_NAT = NO
-ENABLE_UPNP = NO
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
+
+[transport-tcp]
+PORT = 12150
+TIMEOUT = 5 s
 
 [transport-udp]
-PORT = 40002
+PORT = 12151
 
 [transport-http]
-PORT = 40003
-DEBUG = NO
-USE_IPv6 = YES
-USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
+PORT = 12152
 
 [transport-https]
-PORT = 40004
-DEBUG = NO
-USE_IPv6 = YES
-USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-
-[transport-unix]
-PORT = 40005
-
-[core]
-AUTOSTART = NO
-
-[fs]
-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/
-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 udp http unix
-#DEBUG = YES
-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 = 22365
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-#PREFIX = valgrind --tool=callgrind
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full
-
-[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
-
-[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
-
-[statistics]
-AUTOSTART = YES
-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
+PORT = 12153
 
 [arm]
+PORT = 12159
 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
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+[statistics]
+PORT = 12158
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
-[PATHS]
-DEFAULTCONFIG = test_transport_api_multi_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-2/
+[resolver]
+PORT = 12157
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
+[peerinfo]
+PORT = 12156
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
-[dht]
-AUTOSTART = NO
+[transport]
+PORT = 12155
+PLUGINS = tcp udp
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 
-[mesh]
-AUTOSTART = NO
+[transport-unix]
+PORT = 12154