tolerate additional IPv4 address now available for gnunet.org

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

diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index fc52243389ff728e905b7e0974f5994a14eb41af..68716d28721c597c1cb30c2dd1c8b1a387791fc4 100644 (file)
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -1,48 +1,31 @@
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
+@INLINE@ template_cfg_peer1.conf
+[PATHS]
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p1/
 
 [transport-wlan]
 INTERFACE = mon0
 TESTMODE = 1
-#PREFIX = gdbserver :2345
 
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
+[arm]
+PORT = 12164
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
+[statistics]
+PORT = 12163
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
+
+[resolver]
+PORT = 12162
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
+
+[peerinfo]
+PORT = 12161
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
-PLUGINS = wlan
-DEBUG = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12160
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+PLUGINS = wlan
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
 #PREFIX = valgrind --leak-check=full --show-reachable=yes
@@ -50,67 +33,3 @@ UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = valgrind --tool=massif
 #PREFIX = gdbserver :2345
 
-[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 = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-
-[arm]
-DEFAULTSERVICES = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-#CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-
-[dns]
-AUTOSTART = NO
-
-