From c8209edd23a78f90a06db835e351dfc3c621d47b Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Tue, 29 Oct 2013 10:41:46 +0000 Subject: - use configuration template for duplicate configurations --- src/testbed/test_testbed_api.conf | 81 +------------------- src/testbed/test_testbed_api_statistics.conf | 86 +-------------------- src/testbed/test_testbed_api_template.conf | 80 ++++++++++++++++++++ src/testbed/test_testbed_api_test_timeout.conf | 88 +--------------------- ...st_testbed_api_testbed_run_topology2dtorus.conf | 76 +------------------ ...est_testbed_api_testbed_run_topologyclique.conf | 77 +------------------ ...t_testbed_api_testbed_run_topologyfromfile.conf | 69 +---------------- .../test_testbed_api_testbed_run_topologyline.conf | 77 +------------------ ...est_testbed_api_testbed_run_topologyrandom.conf | 76 +------------------ .../test_testbed_api_testbed_run_topologyring.conf | 77 +------------------ ..._testbed_api_testbed_run_topologyscalefree.conf | 77 +------------------ ...testbed_api_testbed_run_topologysmallworld.conf | 80 +------------------- ...bed_api_testbed_run_topologysmallworldring.conf | 80 +------------------- 13 files changed, 103 insertions(+), 921 deletions(-) create mode 100644 src/testbed/test_testbed_api_template.conf diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf index beaf78eee..e5f286d5b 100644 --- a/src/testbed/test_testbed_api.conf +++ b/src/testbed/test_testbed_api.conf @@ -1,80 +1 @@ -[testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -TOPOLOGY = RANDOM -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = udp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-udp] -TIMEOUT = 300 s -PORT = 12368 - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO - -[consensus] -AUTOSTART = NO - -[gns] -AUTOSTART = NO - -[statistics] -AUTOSTART = NO - -[peerinfo] -NO_IO = YES +@INLINE@ test_testbed_api_template.conf diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf index f6bfa2c9e..65366835d 100644 --- a/src/testbed/test_testbed_api_statistics.conf +++ b/src/testbed/test_testbed_api_statistics.conf @@ -1,91 +1,9 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -NEIGHBOUR_LIMIT = 100 OVERLAY_TOPOLOGY = 2D_TORUS MAX_PARALLEL_SERVICE_CONNECTIONS = 2 -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO - -[consensus] -AUTOSTART = NO - -[gns] -AUTOSTART = NO [statistics] AUTOSTART = YES PORT = 30 - -[peerinfo] -NO_IO = YES diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf new file mode 100644 index 000000000..c72377346 --- /dev/null +++ b/src/testbed/test_testbed_api_template.conf @@ -0,0 +1,80 @@ +[testbed] +AUTOSTART = NO +PORT = 12113 +ACCEPT_FROM = 127.0.0.1; +HOSTNAME = localhost +OVERLAY_TOPOLOGY = NONE +#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args + +[fs] +AUTOSTART = NO + +[resolver] +AUTOSTART = NO + +[mesh] +AUTOSTART = NO + +[dht] +AUTOSTART = NO + +[dhtcache] +QUOTA = 1 MB +DATABASE = heap + +[transport] +PLUGINS = udp +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +NEIGHBOUR_LIMIT = 50 +PORT = 12365 + +[ats] +WAN_QUOTA_OUT = 3932160 +WAN_QUOTA_IN = 3932160 + +[core] +PORT = 12092 +AUTOSTART = YES +USE_EPHEMERAL_KEYS = NO + +[arm] +DEFAULTSERVICES = core transport +PORT = 12366 + +[transport-udp] +TIMEOUT = 300 s +PORT = 12368 + +[gnunetd] +HOSTKEY = $GNUNET_TEST_HOME/.hostkey + +[PATHS] +GNUNET_TEST_HOME = /tmp/test-testbed/ + +[dns] +AUTOSTART = NO + +[nse] +AUTOSTART = NO + +[vpn] +AUTOSTART = NO + +[nat] +RETURN_LOCAL_ADDRESSES = YES + +[gns-helper-service-w32] +AUTOSTART = NO + +[consensus] +AUTOSTART = NO + +[gns] +AUTOSTART = NO + +[statistics] +AUTOSTART = NO + +[peerinfo] +NO_IO = YES diff --git a/src/testbed/test_testbed_api_test_timeout.conf b/src/testbed/test_testbed_api_test_timeout.conf index e31cc3e29..c109fd45b 100644 --- a/src/testbed/test_testbed_api_test_timeout.conf +++ b/src/testbed/test_testbed_api_test_timeout.conf @@ -1,89 +1,5 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost OVERLAY_TOPOLOGY = CLIQUE SETUP_TIMEOUT = 2 s -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO - -[consensus] -AUTOSTART = NO - -[gns] -AUTOSTART = NO - -[statistics] -AUTOSTART = NO - -[peerinfo] -NO_IO = YES diff --git a/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf b/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf index 3b27a36ac..72704e80e 100644 --- a/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf +++ b/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf @@ -1,77 +1,5 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -NEIGHBOUR_LIMIT = 100 OVERLAY_TOPOLOGY = 2D_TORUS -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES -[gns-helper-service-w32] -AUTOSTART = NO diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf index a7e8c8d9b..9c5b8f439 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf @@ -1,77 +1,4 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -NEIGHBOUR_LIMIT = 100 OVERLAY_TOPOLOGY = CLIQUE -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO diff --git a/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf b/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf index 91f09d0e9..b0e28227c 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf @@ -1,70 +1,5 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -NEIGHBOUR_LIMIT = 100 OVERLAY_TOPOLOGY = FROM_FILE OVERLAY_TOPOLOGY_FILE = overlay_topology.txt -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = udp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-udp] -TIMEOUT = 300 s -PORT = 12368 - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf index d4d76b35f..f8e0343e0 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf @@ -1,77 +1,4 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -NEIGHBOUR_LIMIT = 100 OVERLAY_TOPOLOGY = LINE -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf index d5d41e63e..c2bd85b01 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf @@ -1,77 +1,5 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost OVERLAY_TOPOLOGY = RANDOM OVERLAY_RANDOM_LINKS = 5 -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO diff --git a/src/testbed/test_testbed_api_testbed_run_topologyring.conf b/src/testbed/test_testbed_api_testbed_run_topologyring.conf index 2dadd254f..810edd91a 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyring.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyring.conf @@ -1,77 +1,4 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -NEIGHBOUR_LIMIT = 100 OVERLAY_TOPOLOGY = RING -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO diff --git a/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf b/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf index d96cd7202..0f89ca83a 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf @@ -1,79 +1,6 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -NEIGHBOUR_LIMIT = 100 OVERLAY_TOPOLOGY = SCALE_FREE SCALE_FREE_TOPOLOGY_CAP = 70 SCALE_FREE_TOPOLOGY_M = 5 -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf index 1a4ed46da..ba13a325c 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf @@ -1,81 +1,5 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost OVERLAY_TOPOLOGY = SMALL_WORLD OVERLAY_RANDOM_LINKS = 3 -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO - -[consensus] -AUTOSTART = NO - diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf index 57f52e65e..0e1b32f13 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf @@ -1,81 +1,5 @@ +@INLINE@ test_testbed_api_template.conf + [testbed] -AUTOSTART = NO -PORT = 12113 -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost OVERLAY_TOPOLOGY = SMALL_WORLD_RING OVERLAY_RANDOM_LINKS = 3 -#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[dhtcache] -QUOTA = 1 MB -DATABASE = heap - -[transport] -PLUGINS = tcp -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12092 -AUTOSTART = YES -USE_EPHEMERAL_KEYS = NO - -[arm] -DEFAULTSERVICES = core transport -PORT = 12366 - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $GNUNET_TEST_HOME/.hostkey - -[PATHS] -GNUNET_TEST_HOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES - -[gns-helper-service-w32] -AUTOSTART = NO - -[consensus] -AUTOSTART = NO - -- cgit v1.2.3