From: Christian Grothoff Date: Tue, 2 Aug 2011 07:46:21 +0000 (+0000) Subject: towards simplified configs X-Git-Tag: initial-import-from-subversion-38251~17526 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=afb3ea4f771c7534dbee439c21a62fe0519ba832;p=oweals%2Fgnunet.git towards simplified configs --- diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf index 7d202add5..7c5cb549d 100644 --- a/src/testing/test_testing_connect_peer1.conf +++ b/src/testing/test_testing_connect_peer1.conf @@ -1,78 +1,34 @@ +@INLINE@ test_testing_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/ DEFAULTCONFIG = test_testing_connect_peer1.conf -[resolver] -PORT = 12564 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock -HOSTNAME = localhost - -[transport] -PORT = 12565 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock -HOSTNAME = localhost -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p +[transport-tcp] +PORT = 12568 +BINDTO = 127.0.0.1 [arm] PORT = 12566 +DEFAULTSERVICES = core UNIXPATH = /tmp/gnunet-p1-service-arm.sock -HOSTNAME = localhost -DEFAULTSERVICES = core -# core in DEFAULTSERVICES required or test case will fail! -#DEBUG = YES [statistics] PORT = 12567 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock -HOSTNAME = localhost -[transport-tcp] -PORT = 12568 -BINDTO = 127.0.0.1 +[resolver] +PORT = 12564 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12569 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -HOSTNAME = localhost + +[transport] +PORT = 12565 +UNIXPATH = /tmp/gnunet-p1-service-transport.sock [core] PORT = 12570 UNIXPATH = /tmp/gnunet-p1-service-core.sock -HOSTNAME = localhost -#DEBUG = YES - -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf index c1a22c06c..301ad0d47 100644 --- a/src/testing/test_testing_connect_peer2.conf +++ b/src/testing/test_testing_connect_peer2.conf @@ -1,78 +1,34 @@ +@INLINE@ test_testing_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/ DEFAULTCONFIG = test_testing_connect_peer2.conf -[resolver] -PORT = 22564 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock -HOSTNAME = localhost - -[transport] -PORT = 22565 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -HOSTNAME = localhost -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p +[transport-tcp] +PORT = 22568 +BINDTO = 127.0.0.1 [arm] PORT = 22566 +DEFAULTSERVICES = core UNIXPATH = /tmp/gnunet-p2-service-arm.sock -DEFAULTSERVICES = core -#core in DEFAULTSERVICES required or test case will fail! -HOSTNAME = localhost -#DEBUG = YES [statistics] PORT = 22567 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock -HOSTNAME = localhost -[transport-tcp] -PORT = 22568 -BINDTO = 127.0.0.1 +[resolver] +PORT = 22564 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock [peerinfo] PORT = 22569 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -HOSTNAME = localhost + +[transport] +PORT = 22565 +UNIXPATH = /tmp/gnunet-p2-service-transport.sock [core] PORT = 22570 UNIXPATH = /tmp/gnunet-p2-service-core.sock -HOSTNAME = localhost -#DEBUG = YES - -[testing] -WEAKRANDOM = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/testing/test_testing_data.conf b/src/testing/test_testing_data.conf index 0c548c11a..c46cb0d42 100644 --- a/src/testing/test_testing_data.conf +++ b/src/testing/test_testing_data.conf @@ -1,64 +1,7 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p - [arm] -PORT = 2566 DEFAULTSERVICES = core -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 -#USE_LOCALADDR = YES - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 - -[testing] -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/testing/test_testing_data_remote.conf b/src/testing/test_testing_data_remote.conf index ea1c00065..1d527b7f7 100644 --- a/src/testing/test_testing_data_remote.conf +++ b/src/testing/test_testing_data_remote.conf @@ -1,59 +1,21 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_remote.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -AUTOSTART = NO -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 - -[testing] +[TESTING] CONTROL_HOST = 131.159.20.42 HOSTFILE = remote_hosts.txt -WEAKRANDOM = YES -NUM_PEERS = 5 -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat MAX_OUTSTANDING_SSH = 5 -[dht] -AUTOSTART = NO - -[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 - -[dns] +[statistics] AUTOSTART = NO +[datastore] +AUTOSTART = YES +[fs] +AUTOSTART = YES -[nse] -AUTOSTART = NO - +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf index 3725448b7..5f7a14f7a 100644 --- a/src/testing/test_testing_data_topology_2d_torus.conf +++ b/src/testing/test_testing_data_topology_2d_torus.conf @@ -1,59 +1,17 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 -#DEBUG = YES - -[testing] +[TESTING] NUM_PEERS = 13 -WEAKRANDOM = YES TOPOLOGY = 2D_TORUS -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf index c9154afe3..7d2018df3 100644 --- a/src/testing/test_testing_data_topology_blacklist.conf +++ b/src/testing/test_testing_data_topology_blacklist.conf @@ -1,72 +1,22 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_blacklist.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -BLACKLIST_FILE = $SERVICEHOME/blacklist -#PREFIX = xterm -e xterm -T transport -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[transport-udp] -PORT = 2568 - -[peerinfo] -PORT = 2569 -#DEBUG = YES -#PREFIX = xterm -e xterm -T peerinfo -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo -#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p - -[core] -PORT = 2570 -#PREFIX = xterm -e xterm -T CORE -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[testing] +[TESTING] NUM_PEERS = 4 -WEAKRANDOM = YES TOPOLOGY = CLIQUE BLACKLIST_TOPOLOGY = RING BLACKLIST_TRANSPORTS = tcp udp http -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO +[transport-udp] +PORT = 2568 +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_churn.conf b/src/testing/test_testing_data_topology_churn.conf index 7aae48750..bd79d2e4f 100644 --- a/src/testing/test_testing_data_topology_churn.conf +++ b/src/testing/test_testing_data_topology_churn.conf @@ -1,67 +1,22 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_churn.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = peerinfo transport core - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 +[TESTING] +NUM_PEERS = 12 [transport-udp] PORT = 2568 -[peerinfo] -PORT = 2569 -#DEBUG = YES -#PREFIX = xterm -e xterm -T peerinfo -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo -#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p - -[core] -PORT = 2570 -#PREFIX = xterm -e xterm -T CORE -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[testing] -NUM_PEERS = 12 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - +[arm] +DEFAULTSERVICES = peerinfo transport core +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf index 3781643eb..bfb493fd9 100644 --- a/src/testing/test_testing_data_topology_clique.conf +++ b/src/testing/test_testing_data_topology_clique.conf @@ -1,74 +1,25 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 +[TESTING] +CONNECT_TIMEOUT = 180 +CONNECT_ATTEMPTS = 14 +NUM_PEERS = 4 +TOPOLOGY = CLIQUE [transport-tcp] -PORT = 2568 ENABLE_UPNP = NO [transport-udp] PORT = 2568 -[peerinfo] -PORT = 2569 -#DEBUG = YES -#PREFIX = xterm -e xterm -T peerinfo -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo -#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p - -[core] -PORT = 2570 -#PREFIX = xterm -e xterm -T CORE -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[testing] -NUM_PEERS = 4 -WEAKRANDOM = YES -TOPOLOGY = CLIQUE -F2F = YES -CONNECT_TIMEOUT = 180 -CONNECT_ATTEMPTS = 14 -#DEBUG = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - - +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing/test_testing_data_topology_clique_dfs.conf index ff3ebc2a4..b0b7ed75a 100644 --- a/src/testing/test_testing_data_topology_clique_dfs.conf +++ b/src/testing/test_testing_data_topology_clique_dfs.conf @@ -1,71 +1,25 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = peerinfo transport core - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[transport-udp] -PORT = 2568 - -[peerinfo] -PORT = 2569 -#DEBUG = YES -#PREFIX = xterm -e xterm -T peerinfo -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo -#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p - -[core] -PORT = 2570 -#PREFIX = xterm -e xterm -T CORE -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[testing] +[TESTING] NUM_PEERS = 7 -WEAKRANDOM = YES TOPOLOGY = CLIQUE CONNECT_TOPOLOGY_OPTION = CONNECT_DFS CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 -[dns] -AUTOSTART = NO +[transport-udp] +PORT = 2568 +[arm] +DEFAULTSERVICES = peerinfo transport core +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf index 410d0afde..408930312 100644 --- a/src/testing/test_testing_data_topology_clique_minimum.conf +++ b/src/testing/test_testing_data_topology_clique_minimum.conf @@ -1,71 +1,22 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[transport-udp] -PORT = 2568 - -[peerinfo] -PORT = 2569 -#DEBUG = YES -#PREFIX = xterm -e xterm -T peerinfo -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo -#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p - -[core] -PORT = 2570 -#PREFIX = xterm -e xterm -T CORE -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[testing] +[TESTING] NUM_PEERS = 20 -WEAKRANDOM = YES TOPOLOGY = CLIQUE CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 -#F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO +[transport-udp] +PORT = 2568 +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing/test_testing_data_topology_clique_random.conf index d3b459e29..2ff37b45d 100644 --- a/src/testing/test_testing_data_topology_clique_random.conf +++ b/src/testing/test_testing_data_topology_clique_random.conf @@ -1,73 +1,28 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -AUTOSTART = NO -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -AUTOSTART = NO -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[transport-udp] -PORT = 2568 - -[peerinfo] -PORT = 2569 -#DEBUG = YES -#PREFIX = xterm -e xterm -T peerinfo -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo -#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p - -[core] -PORT = 2570 -#PREFIX = xterm -e xterm -T CORE -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[testing] +[TESTING] NUM_PEERS = 20 -WEAKRANDOM = YES TOPOLOGY = CLIQUE CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET CONNECT_TOPOLOGY_OPTION_MODIFIER = .15 -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -[dht] -AUTOSTART = NO - -[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-udp] +PORT = 2568 -[dns] +[statistics] AUTOSTART = NO +[resolver] +AUTOSTART = NO +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing/test_testing_data_topology_erdos_renyi.conf index 78eeb6e6e..98c08e066 100644 --- a/src/testing/test_testing_data_topology_erdos_renyi.conf +++ b/src/testing/test_testing_data_topology_erdos_renyi.conf @@ -1,59 +1,16 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 -#DEBUG = YES - -[testing] -NUM_PEERS = 5 -WEAKRANDOM = YES +[TESTING] TOPOLOGY = ERDOS_RENYI -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf index 412399bf4..ee883cce7 100644 --- a/src/testing/test_testing_data_topology_internat.conf +++ b/src/testing/test_testing_data_topology_internat.conf @@ -1,59 +1,16 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 -#DEBUG = YES - -[testing] -NUM_PEERS = 5 -WEAKRANDOM = YES +[TESTING] TOPOLOGY = INTERNAT -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf index 0811c3b12..0a05572c0 100644 --- a/src/testing/test_testing_data_topology_none.conf +++ b/src/testing/test_testing_data_topology_none.conf @@ -1,76 +1,50 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -AUTOSTART = NO -PORT = 0 - -[transport] -PORT = 0 -PLUGINS = tcp -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -#PREFIX = valgrind --tool=massif +[TESTING] +NUM_PEERS = 1000 +TOPOLOGY = NONE +F2F = NO +BLACKLIST_TOPOLOGY = NONE +CONNECT_TOPOLOGY = RING -[topology] -PORT = 0 +[transport-tcp] +BINDTO = 127.0.0.1 [arm] PORT = 0 -DEFAULTSERVICES = [statistics] AUTOSTART = NO PORT = 0 -[transport-tcp] -PORT = 2568 -BINDTO = 127.0.0.1 +[resolver] +AUTOSTART = NO +PORT = 0 [peerinfo] PORT = 0 -[core] +[transport] PORT = 0 -[hostlist] +[core] PORT = 0 -[fs] +[topology] PORT = 0 -[testing] -NUM_PEERS = 1000 -WEAKRANDOM = YES -TOPOLOGY = NONE -F2F = NO -BLACKLIST_TOPOLOGY = NONE -CONNECT_TOPOLOGY = RING -#CONNECT_TOPOLOGY = 2D_TORUS -#CONNECT_TOPOLOGY = CLIQUE -#CONNECT_TOPOLOGY_OPTION = CONNECT_DFS -#CONNECT_TOPOLOGY_OPTION_MODIFIER = 20 -#DEBUG = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - +[hostlist] +PORT = 0 +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +PORT = 0 +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf index c0632b84a..3bd0c956b 100644 --- a/src/testing/test_testing_data_topology_ring.conf +++ b/src/testing/test_testing_data_topology_ring.conf @@ -1,59 +1,16 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 -#DEBUG = YES - -[testing] -NUM_PEERS = 5 -WEAKRANDOM = YES +[TESTING] TOPOLOGY = RING -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing/test_testing_data_topology_scale_free.conf index 079872758..26b9e1369 100644 --- a/src/testing/test_testing_data_topology_scale_free.conf +++ b/src/testing/test_testing_data_topology_scale_free.conf @@ -1,69 +1,23 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_scale_free.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = peerinfo transport core - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[transport-udp] -PORT = 2568 - -[peerinfo] -PORT = 2569 -#DEBUG = YES -#PREFIX = xterm -e xterm -T peerinfo -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo -#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p - -[core] -PORT = 2570 -#PREFIX = xterm -e xterm -T CORE -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[testing] +[TESTING] NUM_PEERS = 50 -WEAKRANDOM = YES TOPOLOGY = SCALE_FREE -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 -[dns] -AUTOSTART = NO +[transport-udp] +PORT = 2568 +[arm] +DEFAULTSERVICES = peerinfo transport core +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_small_world_ring.conf b/src/testing/test_testing_data_topology_small_world_ring.conf index 2d4249da9..02048dcfd 100644 --- a/src/testing/test_testing_data_topology_small_world_ring.conf +++ b/src/testing/test_testing_data_topology_small_world_ring.conf @@ -1,59 +1,17 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 -#DEBUG = YES - -[testing] +[TESTING] NUM_PEERS = 25 -WEAKRANDOM = YES TOPOLOGY = SMALL_WORLD_RING -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_small_world_torus.conf b/src/testing/test_testing_data_topology_small_world_torus.conf index 444abf610..a8a82aa04 100644 --- a/src/testing/test_testing_data_topology_small_world_torus.conf +++ b/src/testing/test_testing_data_topology_small_world_torus.conf @@ -1,59 +1,16 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 -#DEBUG = YES - -[testing] -NUM_PEERS = 5 -WEAKRANDOM = YES +[TESTING] TOPOLOGY = SMALL_WORLD -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf index 3504200b9..4667c716d 100644 --- a/src/testing/test_testing_data_topology_stability.conf +++ b/src/testing/test_testing_data_topology_stability.conf @@ -1,73 +1,21 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data_topology_clique.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#PREFIX = xterm -e xterm -T transport -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p -#DEBUG = YES - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[transport-udp] -PORT = 2568 - -[peerinfo] -PORT = 2569 -#DEBUG = YES -#PREFIX = xterm -e xterm -T peerinfo -e gdb --args -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo -#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p - -[core] -PORT = 2570 -#PREFIX = xterm -e xterm -T CORE -e gdb --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#DEBUG = YES - -[testing] +[TESTING] SETTLE_TIME = 600 NUM_PEERS = 2 -WEAKRANDOM = YES -#CONNECT_TOPOLOGY = CLIQUE TOPOLOGY = CLIQUE -F2F = YES -#DEBUG = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO +[transport-udp] +PORT = 2568 +[datastore] +AUTOSTART = YES -[nse] -AUTOSTART = NO +[fs] +AUTOSTART = YES +[mesh] +AUTOSTART = YES diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf index 3fc828e6c..0973cd3d1 100644 --- a/src/testing/test_testing_peergroup_data.conf +++ b/src/testing/test_testing_peergroup_data.conf @@ -1,40 +1,11 @@ +@INLINE@ test_testing_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_peergroup_data.conf -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp -#DEBUG = YES -#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p - -[arm] -PORT = 2566 -DEFAULTSERVICES = core - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 - -[testing] -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -#The following options are REQUIRED for peergroup convenience usage! +[TESTING] +CONNECT_ATTEMPTS = 2 MAX_OUTSTANDING_CONNECTIONS = 20 MAX_CONCURRENT_SSH = 1 -CONNECT_ATTEMPTS = 2 PEERGROUP_TIMEOUT = 300 TOPOLOGY = CLIQUE PERCENTAGE = 0.5 @@ -46,31 +17,9 @@ BLACKLIST_TOPOLOGY = NONE BLACKLIST_TRANSPORTS = tcp udp USE_PROGRESSBARS = NO +[arm] +DEFAULTSERVICES = core -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[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 - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - +[mesh] +AUTOSTART = YES