From 1643c64169883ed1b9c860e3e1146a503f251f0a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 1 Aug 2011 13:43:22 +0000 Subject: [PATCH] simplifying configs --- src/core/Makefile.am | 1 + src/core/test_core_api_data.conf | 26 ++---- src/core/test_core_api_peer1.conf | 79 +++---------------- src/core/test_core_api_peer2.conf | 76 +++--------------- src/core/test_core_api_send_to_self.conf | 66 +++------------- src/core/test_core_defaults.conf | 45 +++++++++++ ...e_quota_asymmetric_recv_limited_peer1.conf | 75 +++--------------- ...e_quota_asymmetric_recv_limited_peer2.conf | 73 +++-------------- ...ore_quota_asymmetric_send_limit_peer1.conf | 74 +++-------------- ...ore_quota_asymmetric_send_limit_peer2.conf | 73 +++-------------- ...e_quota_asymmetric_send_limited_peer1.conf | 74 +++-------------- ...e_quota_asymmetric_send_limited_peer2.conf | 74 +++-------------- src/core/test_core_quota_peer1.conf | 77 +++--------------- src/core/test_core_quota_peer2.conf | 75 +++--------------- 14 files changed, 163 insertions(+), 725 deletions(-) create mode 100644 src/core/test_core_defaults.conf diff --git a/src/core/Makefile.am b/src/core/Makefile.am index bac929501..efe81a4bd 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -122,6 +122,7 @@ test_core_quota_compliance_asymmetric_recv_limited_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la EXTRA_DIST = \ + test_core_defaults.conf \ test_core_api_data.conf \ test_core_api_peer1.conf \ test_core_api_peer2.conf \ diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf index 72f747dc8..438423372 100644 --- a/src/core/test_core_api_data.conf +++ b/src/core/test_core_api_data.conf @@ -1,25 +1,13 @@ +@INLINE@ test_core_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-core/ DEFAULTCONFIG = test_core_api_data.conf -[testing] -WEAKRANDOM = YES - [arm] -#DEBUG = YES -#OPTIONS = -L DEBUG - -[dht] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO +DEFAULTSERVICES = topology hostlist +[core] +PORT = 2092 +TOTAL_QUOTA_IN = 65536 +TOTAL_QUOTA_OUT = 65536 +UNIXPATH = /tmp/gnunet-service-core.sock diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf index 11708be2e..d1ba57a7f 100644 --- a/src/core/test_core_api_peer1.conf +++ b/src/core/test_core_api_peer1.conf @@ -1,88 +1,27 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-core-peer-1/ DEFAULTCONFIG = test_core_api_peer1.conf -[resolver] -PORT = 12464 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock -#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck -#PREFIX = valgrind --leak-check=full --log-file=resolver%p - -[transport] -PORT = 12465 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock -PLUGINS = tcp -#PREFIX = xterm -T transport1 -e -#PREFIX= xterm -e xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck -#DEBUG = YES +[transport-tcp] +PORT = 12468 [arm] PORT = 12466 UNIXPATH = /tmp/gnunet-p1-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] PORT = 12467 -#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck -[transport-tcp] -PORT = 12468 -BINDTO = 127.0.0.1 -#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 +[resolver] +PORT = 12464 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12469 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo1 -e -#DEBUG = YES - -[core] -PORT = 12470 -UNIXPATH = /tmp/gnunet-p1-service-core.sock -#PREFIX = valgrind --tool=memcheck -#PREFIX = valgrind --tool=callgrind -#OPTIONS = -l log-core-1 -#PREFIX = xterm -e xterm -T core1 -e gdb --args -#PREFIX = xterm -T core1 -e -#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 - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO +[transport] +PORT = 12465 +UNIXPATH = /tmp/gnunet-p1-service-transport.sock diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf index 7d8178287..4e5071251 100644 --- a/src/core/test_core_api_peer2.conf +++ b/src/core/test_core_api_peer2.conf @@ -1,88 +1,32 @@ +@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 +[transport-tcp] +PORT = 22468 [arm] PORT = 22466 UNIXPATH = /tmp/gnunet-p2-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] PORT = 22467 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 = 22464 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock [peerinfo] PORT = 22469 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo2 -e -#DEBUG = YES + +[transport] +PORT = 22465 +UNIXPATH = /tmp/gnunet-p2-service-transport.sock [core] PORT = 22470 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 - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf index 3eb66afad..8271ea96a 100644 --- a/src/core/test_core_api_send_to_self.conf +++ b/src/core/test_core_api_send_to_self.conf @@ -1,34 +1,21 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = ~/.gnunet/ -# SERVICEHOME = /var/lib/gnunet/ -# DEFAULTCONFIG = /etc/gnunet.conf -# If 'DEFAULTCONFIG' is not defined, the current -# configuration file is assumed to be the default, -# which is what we want by default... - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[TESTING] -WEAKRANDOM = NO - -[client] -HOME = $SERVICEHOME +DEFAULTCONFIG = test_core_api_send_to_self.conf [arm] -PORT = 0 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-arm -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; +PORT = 2425 DEFAULTSERVICES = core test-sts -UNIXPATH = /tmp/gnunet-service-arm.sock + +[core] +PORT = 24512 +TOTAL_QUOTA_IN = 104857600 +TOTAL_QUOTA_OUT = 104757600 +UNIXPATH = /tmp/gnunet-service-core.sock [test-sts] AUTOSTART = YES -PORT = 0 +PORT = 9252 HOSTNAME = localhost HOME = $SERVICEHOME CONFIG = $DEFAULTCONFIG @@ -38,37 +25,4 @@ ACCEPT_FROM6 = ::1; TOTAL_QUOTA_IN = 65536 TOTAL_QUOTA_OUT = 65536 UNIXPATH = /tmp/gnunet-service-sts.sock -#DEBUG = YES - -[core] -AUTOSTART = YES -PORT = 0 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-core -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -# quotas are in bytes per second now! -TOTAL_QUOTA_IN = 104857600 -TOTAL_QUOTA_OUT = 104757600 -UNIXPATH = /tmp/gnunet-service-core.sock -# DEBUG = YES -# USERNAME = -# MAXBUF = -# TIMEOUT = -# DISABLEV6 = -# BINDTO = -# REJECT_FROM = -# REJECT_FROM6 = -# PREFIX = - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf new file mode 100644 index 000000000..5d8da2d34 --- /dev/null +++ b/src/core/test_core_defaults.conf @@ -0,0 +1,45 @@ +[PATHS] +SERVICEHOME = /tmp/test-gnunet-core/ +DEFAULTCONFIG = test_core_defaults.conf + +[arm] +DEFAULTSERVICES = + +[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 + +[core] +PORT = 12470 +UNIXPATH = /tmp/gnunet-p1-service-core.sock +TOTAL_QUOTA_IN = 655360000 +TOTAL_QUOTA_OUT = 655360000 + +[transport-tcp] +BINDTO = 127.0.0.1 + +[testing] +WEAKRANDOM = YES + +[fs] +AUTOSTART = NO + +[datastore] +AUTOSTART = NO + +[dht] +AUTOSTART = NO + +[mesh] +AUTOSTART = NO + +[dns] +AUTOSTART = NO + +[nse] +AUTOSTART = NO diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf index ee8f950f4..54ee690e2 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf @@ -1,90 +1,35 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/ DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer1.conf -[resolver] -PORT = 12484 -UNIXPATH = /tmp/gnunet-core-asym-recv-1-service-resolver.sock -#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck -#PREFIX = valgrind --leak-check=full --log-file=resolver%p - -[transport] -PORT = 12485 -UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-transport.sock -PLUGINS = tcp -#PREFIX = xterm -T transport1 -e -#PREFIX= xterm -e xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck -#DEBUG = YES +[transport-tcp] +PORT = 12488 [arm] PORT = 12486 UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] PORT = 12487 UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-statistics.sock -#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck - -[transport-tcp] -PORT = 12488 -BINDTO = 127.0.0.1 -#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 +[resolver] +PORT = 12484 +UNIXPATH = /tmp/gnunet-core-asym-recv-1-service-resolver.sock [peerinfo] PORT = 12489 UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-peerinfo.sock -#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo1 -e -#DEBUG = YES + +[transport] +PORT = 12485 +UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-transport.sock [core] PORT = 12490 TOTAL_QUOTA_IN = 1000000 TOTAL_QUOTA_OUT = 1000000 UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-core.sock -#PREFIX = valgrind --tool=memcheck -#PREFIX = valgrind --tool=callgrind -#OPTIONS = -l log-core-1 -#PREFIX = xterm -e xterm -T core1 -e gdb --args -#PREFIX = xterm -T core1 -e DEBUG = NO -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf index f9a038e80..a39b69a61 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf @@ -1,88 +1,35 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/ DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer2.conf -[resolver] -PORT = 22484 -UNIXPATH = /tmp/gnunet-core-asym-recv-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 = 22485 -UNIXPATH = /tmp/gnunet-core-asym-recv-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 +[transport-tcp] +PORT = 22488 [arm] PORT = 22486 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] PORT = 22487 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-statistics.sock -#PREFIX = xterm -T statistics2 -e valgrind --tool=memcheck - -[transport-tcp] -PORT = 22488 -BINDTO = 127.0.0.1 -#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 +[resolver] +PORT = 22484 +UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-resolver.sock [peerinfo] PORT = 22489 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-peerinfo.sock -#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo2 -e -#DEBUG = YES + +[transport] +PORT = 22485 +UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-transport.sock [core] PORT = 22490 TOTAL_QUOTA_IN = 10240 TOTAL_QUOTA_OUT = 10240 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock -#PREFIX = xterm -T core2 -e -#PREFIX = valgrind --tool=memcheck DEBUG = NO -#BINARY=/home/grothoff/bin/gnunet-service-core - -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf index 6fd36fab0..8c0542cbf 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf @@ -1,89 +1,35 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/ DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer1.conf -[resolver] -PORT = 12484 -UNIXPATH = /tmp/gnunet-core-asym-send-1-service-resolver.sock -#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck -#PREFIX = valgrind --leak-check=full --log-file=resolver%p - -[transport] -PORT = 12485 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock -PLUGINS = tcp -#PREFIX = xterm -T transport1 -e -#PREFIX= xterm -e xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck -#DEBUG = YES +[transport-tcp] +PORT = 12488 [arm] PORT = 12486 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] PORT = 12487 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock -#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck - -[transport-tcp] -PORT = 12488 -BINDTO = 127.0.0.1 -#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 +[resolver] +PORT = 12484 +UNIXPATH = /tmp/gnunet-core-asym-send-1-service-resolver.sock [peerinfo] PORT = 12489 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-peerinfo.sock -#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo1 -e -#DEBUG = YES + +[transport] +PORT = 12485 +UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock [core] PORT = 12490 TOTAL_QUOTA_IN = 10240 TOTAL_QUOTA_OUT = 10240 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock -#PREFIX = valgrind --tool=memcheck -#PREFIX = valgrind --tool=callgrind -#OPTIONS = -l log-core-1 -#PREFIX = xterm -e xterm -T core1 -e gdb --args -#PREFIX = xterm -T core1 -e DEBUG = NO -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf index 9ef0f7ccd..e2471c9bd 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf @@ -1,88 +1,35 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/ DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer2.conf -[resolver] -PORT = 22484 -UNIXPATH = /tmp/gnunet-core-asym-send-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 = 22485 -UNIXPATH = /tmp/gnunet-core-asym-send-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 +[transport-tcp] +PORT = 22488 [arm] PORT = 22486 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] PORT = 22487 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-statistics.sock -#PREFIX = xterm -T statistics2 -e valgrind --tool=memcheck - -[transport-tcp] -PORT = 22488 -BINDTO = 127.0.0.1 -#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 +[resolver] +PORT = 22484 +UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-resolver.sock [peerinfo] PORT = 22489 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-peerinfo.sock -#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo2 -e -#DEBUG = YES + +[transport] +PORT = 22485 +UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-transport.sock [core] PORT = 22490 TOTAL_QUOTA_IN = 1000000 TOTAL_QUOTA_OUT = 1000000 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock -#PREFIX = xterm -T core2 -e -#PREFIX = valgrind --tool=memcheck DEBUG = NO -#BINARY=/home/grothoff/bin/gnunet-service-core - -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf index b11214c9e..9fed64bd1 100644 --- a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf +++ b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf @@ -1,89 +1,35 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/ DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer1.conf -[resolver] -PORT = 12424 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-resolver.sock -#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck -#PREFIX = valgrind --leak-check=full --log-file=resolver%p - -[transport] -PORT = 12425 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock -PLUGINS = tcp -#PREFIX = xterm -T transport1 -e -#PREFIX= xterm -e xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck -#DEBUG = YES +[transport-tcp] +PORT = 12428 [arm] PORT = 12426 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] PORT = 12427 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock -#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck - -[transport-tcp] -PORT = 12428 -BINDTO = 127.0.0.1 -#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 +[resolver] +PORT = 12424 +UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-resolver.sock [peerinfo] PORT = 12429 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-peerinfo.sock -#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo1 -e -#DEBUG = YES + +[transport] +PORT = 12425 +UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock [core] PORT = 12430 TOTAL_QUOTA_IN = 10240 TOTAL_QUOTA_OUT = 10240 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock -#PREFIX = valgrind --tool=memcheck -#PREFIX = valgrind --tool=callgrind -#OPTIONS = -l log-core-1 -#PREFIX = xterm -e xterm -T core1 -e gdb --args -#PREFIX = xterm -T core1 -e DEBUG = NO -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf index 60f8f849c..6a766985c 100644 --- a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf +++ b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf @@ -1,89 +1,35 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/ DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer2.conf -[resolver] -PORT = 22424 -UNIXPATH = /tmp/gnunet-core-asym-send-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 = 22425 -UNIXPATH = /tmp/gnunet-core-asym-send-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 +[transport-tcp] +PORT = 22428 [arm] PORT = 22426 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] PORT = 22427 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-statistics.sock -#PREFIX = xterm -T statistics2 -e valgrind --tool=memcheck - -[transport-tcp] -PORT = 22428 -BINDTO = 127.0.0.1 -#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 +[resolver] +PORT = 22424 +UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-resolver.sock [peerinfo] PORT = 22429 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-peerinfo.sock -#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo2 -e -#DEBUG = YES + +[transport] +PORT = 22425 +UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-transport.sock [core] PORT = 22430 TOTAL_QUOTA_IN = 1000000 TOTAL_QUOTA_OUT = 1000000 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock -#PREFIX = xterm -T core2 -e -#PREFIX = valgrind --tool=memcheck DEBUG = NO -#BINARY=/home/grothoff/bin/gnunet-service-core - -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf index 02eab8ef1..18b806131 100644 --- a/src/core/test_core_quota_peer1.conf +++ b/src/core/test_core_quota_peer1.conf @@ -1,90 +1,35 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/ DEFAULTCONFIG = test_core_quota_peer1.conf -[resolver] -PORT = 12474 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-resolver.sock -#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck -#PREFIX = valgrind --leak-check=full --log-file=resolver%p - -[transport] -PORT = 12475 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-transport.sock -PLUGINS = tcp -#PREFIX = xterm -T transport1 -e -#PREFIX= xterm -e xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e gdb --args -#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck -#DEBUG = YES +[transport-tcp] +PORT = 12468 [arm] PORT = 12476 UNIXPATH = /tmp/gnunet-core-sym-p1-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] -UNIXPATH = /tmp/gnunet-core-sym-p1-service-statistics.sock PORT = 12477 +UNIXPATH = /tmp/gnunet-core-sym-p1-service-statistics.sock -#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck - -[transport-tcp] -PORT = 12468 -BINDTO = 127.0.0.1 - -[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 +[resolver] +PORT = 12474 +UNIXPATH = /tmp/gnunet-core-sym-p1-service-resolver.sock [peerinfo] PORT = 12479 UNIXPATH = /tmp/gnunet-core-sym-p1-service-peerinfo.sock -#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo1 -e -#DEBUG = YES + +[transport] +PORT = 12475 +UNIXPATH = /tmp/gnunet-core-sym-p1-service-transport.sock [core] PORT = 12480 TOTAL_QUOTA_IN = 10240 TOTAL_QUOTA_OUT = 10240 UNIXPATH = /tmp/gnunet-core-sym-p1-service-core.sock -#PREFIX = valgrind --tool=memcheck -#PREFIX = valgrind --tool=callgrind -#OPTIONS = -l log-core-1 -#PREFIX = xterm -e xterm -T core1 -e gdb --args -#PREFIX = xterm -T core1 -e DEBUG = NO -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf index 003a03e10..52ae44f33 100644 --- a/src/core/test_core_quota_peer2.conf +++ b/src/core/test_core_quota_peer2.conf @@ -1,90 +1,35 @@ +@INLINE@ test_core_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/ DEFAULTCONFIG = test_core_quota_peer2.conf -[resolver] -PORT = 22474 -UNIXPATH = /tmp/gnunet-core-sym-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 = 22475 -UNIXPATH = /tmp/gnunet-core-sym-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 +[transport-tcp] +PORT = 22478 [arm] PORT = 22476 UNIXPATH = /tmp/gnunet-core-sym-p2-service-arm.sock -DEFAULTSERVICES = -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck [statistics] PORT = 22477 UNIXPATH = /tmp/gnunet-core-sym-p2-service-statistics.sock -#PREFIX = xterm -T statistics2 -e valgrind --tool=memcheck - -[transport-tcp] -PORT = 22478 -BINDTO = 127.0.0.1 -#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 +[resolver] +PORT = 22474 +UNIXPATH = /tmp/gnunet-core-sym-p2-service-resolver.sock [peerinfo] PORT = 22479 UNIXPATH = /tmp/gnunet-core-sym-p2-service-peerinfo.sock -#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo2 -e -#DEBUG = YES + +[transport] +PORT = 22475 +UNIXPATH = /tmp/gnunet-core-sym-p2-service-transport.sock [core] PORT = 22480 TOTAL_QUOTA_IN = 10240 TOTAL_QUOTA_OUT = 10240 UNIXPATH = /tmp/gnunet-core-sym-p2-service-core.sock -#PREFIX = xterm -T core2 -e -#PREFIX = valgrind --tool=memcheck DEBUG = NO -#BINARY=/home/grothoff/bin/gnunet-service-core - -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - -- 2.25.1