-dead code elimination

[oweals/gnunet.git] / src / core / test_core_api_peer2.conf

diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index cba5dbcca1ef5e38658a49053b4b63489953459c..e66c74c943c8a1fe1c6a64df3a296aec81d766b9 100644 (file)
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -1,83 +1,40 @@
+@INLINE@ test_core_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-core-peer-2/
-DEFAULTCONFIG = test_core_api_peer2.conf
-
-[resolver]
-PORT = 22464
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-#PREFIX = xterm -T resolver2 -e valgrind --tool=memcheck
-#PREFIX = xterm -e xterm -T resolver2 -e gdb --args
-#PREFIX = valgrind --leak-check=full --log-file=resolver%p
-
-[transport]
-PORT = 22465
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-PLUGINS = tcp
-#PREFIX = xterm -T transport2 -e gdb --args
-#PREFIX = xterm -e xterm -T transport2 -e gdb --args
-#PREFIX = xterm -T transport2 -e
-#PREFIX = xterm -T transport2 -e valgrind --tool=memcheck
-#DEBUG = YES
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
 
 [arm]
-PORT = 22466
+PORT = 22460
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-DEFAULTSERVICES = 
-#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
 
 [statistics]
-PORT = 22467
+PORT = 22461
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-#PREFIX = xterm -T statistics2 -e valgrind --tool=memcheck
 
-[transport-tcp]
-PORT = 22468
-BINDTO = 127.0.0.1
-#DEBUG = YES
+[resolver]
+PORT = 22462
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [peerinfo]
-PORT = 22469
+PORT = 22463
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck
-#PREFIX = xterm -T peerinfo2 -e 
-#DEBUG = YES
+
+[transport]
+PORT = 22464
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 
 [core]
-PORT = 22470
+PORT = 22475
 UNIXPATH = /tmp/gnunet-p2-service-core.sock
-#PREFIX = xterm -T core2 -e
-#PREFIX = valgrind --tool=memcheck
-#DEBUG = YES
-#BINARY=/home/grothoff/bin/gnunet-service-core
-TOTAL_QUOTA_IN = 655360000
-TOTAL_QUOTA_OUT = 655360000
-
-[testing]
-WEAKRANDOM = YES
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
 
-[dht]
-AUTOSTART = NO
+[ats]
+PORT = 22476
+UNIXPATH = /tmp/gnunet-p2-service-ats.sock
 
-[mesh]
-AUTOSTART = NO
-
-
-[dns]
-AUTOSTART = NO
+[transport-tcp]
+PORT = 22467
 
+[transport-unix]
+PORT = 22468
 
+[transport-http]
+PORT = 22469