From 0ea2ffb99da4645d3984fd0b207bd78d261e8356 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 1 Aug 2011 13:35:31 +0000
Subject: simplifying config

---
 .../test_transport_api_tcp_nat_peer1.conf          | 131 ++++-----------------
 1 file changed, 21 insertions(+), 110 deletions(-)

(limited to 'src/transport/test_transport_api_tcp_nat_peer1.conf')

diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 935d96780..77cf34f6c 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,125 +1,36 @@
-[transport-tcp]
-PORT = 12020
-USE_LOCALADDR = YES
+@INLINE@ test_transport_defaults.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
+DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
 
 [nat]
-DISABLEV6 = YES
-BINDTO = 127.0.0.1
 BEHIND_NAT = YES
 ENABLE_NAT_SERVER = YES
-#NAT_PUNCHED = YES
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-
-[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
-#DEBUG = YES
-#PREFIX = xterm -T transport2 --args
-#PREFIX = valgrind --leak-check=full
-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 = 29542
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-
-[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 = 12021
-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 = 12022
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+DISABLEV6 = YES
 
-[statistics]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12023
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+[transport-tcp]
+PORT = 12020
+TIMEOUT = 5000
 
 [arm]
-DEFAULTSERVICES = transport
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 1204
+DEFAULTSERVICES = transport
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-DISABLEV6 = YES
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
-SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
-
-[dht]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
+[statistics]
+PORT = 12023
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
+[resolver]
+PORT = 12022
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
+[peerinfo]
+PORT = 12021
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
-[nse]
-AUTOSTART = NO
+[transport]
+PORT = 29542
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 
 
-- 
cgit v1.2.3