aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-10-29 10:41:46 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-10-29 10:41:46 +0000
commitc8209edd23a78f90a06db835e351dfc3c621d47b (patch)
tree2a7f294e50af71f41c2dd90e4293c14ca087d116
parent137c59b2d463efa18f5807a443eda270ccfa3bbf (diff)
downloadgnunet-c8209edd23a78f90a06db835e351dfc3c621d47b.tar.gz
gnunet-c8209edd23a78f90a06db835e351dfc3c621d47b.zip
- use configuration template for duplicate configurations
-rw-r--r--src/testbed/test_testbed_api.conf81
-rw-r--r--src/testbed/test_testbed_api_statistics.conf86
-rw-r--r--src/testbed/test_testbed_api_template.conf80
-rw-r--r--src/testbed/test_testbed_api_test_timeout.conf88
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf76
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyclique.conf77
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf69
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyline.conf77
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyrandom.conf76
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyring.conf77
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf77
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf80
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf80
13 files changed, 103 insertions, 921 deletions
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 @@
1[testbed] @INLINE@ test_testbed_api_template.conf
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6TOPOLOGY = RANDOM
7#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
8
9[fs]
10AUTOSTART = NO
11
12[resolver]
13AUTOSTART = NO
14
15[mesh]
16AUTOSTART = NO
17
18[dht]
19AUTOSTART = NO
20
21[dhtcache]
22QUOTA = 1 MB
23DATABASE = heap
24
25[transport]
26PLUGINS = udp
27ACCEPT_FROM6 = ::1;
28ACCEPT_FROM = 127.0.0.1;
29NEIGHBOUR_LIMIT = 50
30PORT = 12365
31
32[ats]
33WAN_QUOTA_OUT = 3932160
34WAN_QUOTA_IN = 3932160
35
36[core]
37PORT = 12092
38AUTOSTART = YES
39USE_EPHEMERAL_KEYS = NO
40
41[arm]
42DEFAULTSERVICES = core transport
43PORT = 12366
44
45[transport-udp]
46TIMEOUT = 300 s
47PORT = 12368
48
49[gnunetd]
50HOSTKEY = $GNUNET_TEST_HOME/.hostkey
51
52[PATHS]
53GNUNET_TEST_HOME = /tmp/test-testbed/
54
55[dns]
56AUTOSTART = NO
57
58[nse]
59AUTOSTART = NO
60
61[vpn]
62AUTOSTART = NO
63
64[nat]
65RETURN_LOCAL_ADDRESSES = YES
66
67[gns-helper-service-w32]
68AUTOSTART = NO
69
70[consensus]
71AUTOSTART = NO
72
73[gns]
74AUTOSTART = NO
75
76[statistics]
77AUTOSTART = NO
78
79[peerinfo]
80NO_IO = YES
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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100
7OVERLAY_TOPOLOGY = 2D_TORUS 4OVERLAY_TOPOLOGY = 2D_TORUS
8MAX_PARALLEL_SERVICE_CONNECTIONS = 2 5MAX_PARALLEL_SERVICE_CONNECTIONS = 2
9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
10
11[fs]
12AUTOSTART = NO
13
14[resolver]
15AUTOSTART = NO
16
17[mesh]
18AUTOSTART = NO
19
20[dht]
21AUTOSTART = NO
22
23[dhtcache]
24QUOTA = 1 MB
25DATABASE = heap
26
27[transport]
28PLUGINS = tcp
29ACCEPT_FROM6 = ::1;
30ACCEPT_FROM = 127.0.0.1;
31NEIGHBOUR_LIMIT = 50
32PORT = 12365
33
34[ats]
35WAN_QUOTA_OUT = 3932160
36WAN_QUOTA_IN = 3932160
37
38[core]
39PORT = 12092
40AUTOSTART = YES
41USE_EPHEMERAL_KEYS = NO
42
43[arm]
44DEFAULTSERVICES = core transport
45PORT = 12366
46
47[transport-tcp]
48TIMEOUT = 300 s
49PORT = 12368
50
51[TESTING]
52NUM_PEERS = 5
53WEAKRANDOM = YES
54HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
55MAX_CONCURRENT_SSH = 10
56USE_PROGRESSBARS = YES
57PEERGROUP_TIMEOUT = 2400 s
58
59[gnunetd]
60HOSTKEY = $GNUNET_TEST_HOME/.hostkey
61
62[PATHS]
63GNUNET_TEST_HOME = /tmp/test-testbed/
64
65[dns]
66AUTOSTART = NO
67
68[nse]
69AUTOSTART = NO
70
71[vpn]
72AUTOSTART = NO
73
74[nat]
75RETURN_LOCAL_ADDRESSES = YES
76
77[gns-helper-service-w32]
78AUTOSTART = NO
79
80[consensus]
81AUTOSTART = NO
82
83[gns]
84AUTOSTART = NO
85 6
86[statistics] 7[statistics]
87AUTOSTART = YES 8AUTOSTART = YES
88PORT = 30 9PORT = 30
89
90[peerinfo]
91NO_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 @@
1[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6OVERLAY_TOPOLOGY = NONE
7#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
8
9[fs]
10AUTOSTART = NO
11
12[resolver]
13AUTOSTART = NO
14
15[mesh]
16AUTOSTART = NO
17
18[dht]
19AUTOSTART = NO
20
21[dhtcache]
22QUOTA = 1 MB
23DATABASE = heap
24
25[transport]
26PLUGINS = udp
27ACCEPT_FROM6 = ::1;
28ACCEPT_FROM = 127.0.0.1;
29NEIGHBOUR_LIMIT = 50
30PORT = 12365
31
32[ats]
33WAN_QUOTA_OUT = 3932160
34WAN_QUOTA_IN = 3932160
35
36[core]
37PORT = 12092
38AUTOSTART = YES
39USE_EPHEMERAL_KEYS = NO
40
41[arm]
42DEFAULTSERVICES = core transport
43PORT = 12366
44
45[transport-udp]
46TIMEOUT = 300 s
47PORT = 12368
48
49[gnunetd]
50HOSTKEY = $GNUNET_TEST_HOME/.hostkey
51
52[PATHS]
53GNUNET_TEST_HOME = /tmp/test-testbed/
54
55[dns]
56AUTOSTART = NO
57
58[nse]
59AUTOSTART = NO
60
61[vpn]
62AUTOSTART = NO
63
64[nat]
65RETURN_LOCAL_ADDRESSES = YES
66
67[gns-helper-service-w32]
68AUTOSTART = NO
69
70[consensus]
71AUTOSTART = NO
72
73[gns]
74AUTOSTART = NO
75
76[statistics]
77AUTOSTART = NO
78
79[peerinfo]
80NO_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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6OVERLAY_TOPOLOGY = CLIQUE 4OVERLAY_TOPOLOGY = CLIQUE
7SETUP_TIMEOUT = 2 s 5SETUP_TIMEOUT = 2 s
8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
9
10[fs]
11AUTOSTART = NO
12
13[resolver]
14AUTOSTART = NO
15
16[mesh]
17AUTOSTART = NO
18
19[dht]
20AUTOSTART = NO
21
22[dhtcache]
23QUOTA = 1 MB
24DATABASE = heap
25
26[transport]
27PLUGINS = tcp
28ACCEPT_FROM6 = ::1;
29ACCEPT_FROM = 127.0.0.1;
30NEIGHBOUR_LIMIT = 50
31PORT = 12365
32
33[ats]
34WAN_QUOTA_OUT = 3932160
35WAN_QUOTA_IN = 3932160
36
37[core]
38PORT = 12092
39AUTOSTART = YES
40USE_EPHEMERAL_KEYS = NO
41
42[arm]
43DEFAULTSERVICES = core transport
44PORT = 12366
45
46[transport-tcp]
47TIMEOUT = 300 s
48PORT = 12368
49
50[TESTING]
51NUM_PEERS = 5
52WEAKRANDOM = YES
53HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
54MAX_CONCURRENT_SSH = 10
55USE_PROGRESSBARS = YES
56PEERGROUP_TIMEOUT = 2400 s
57
58[gnunetd]
59HOSTKEY = $GNUNET_TEST_HOME/.hostkey
60
61[PATHS]
62GNUNET_TEST_HOME = /tmp/test-testbed/
63
64[dns]
65AUTOSTART = NO
66
67[nse]
68AUTOSTART = NO
69
70[vpn]
71AUTOSTART = NO
72
73[nat]
74RETURN_LOCAL_ADDRESSES = YES
75
76[gns-helper-service-w32]
77AUTOSTART = NO
78
79[consensus]
80AUTOSTART = NO
81
82[gns]
83AUTOSTART = NO
84
85[statistics]
86AUTOSTART = NO
87
88[peerinfo]
89NO_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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100
7OVERLAY_TOPOLOGY = 2D_TORUS 4OVERLAY_TOPOLOGY = 2D_TORUS
8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
9
10[fs]
11AUTOSTART = NO
12
13[resolver]
14AUTOSTART = NO
15
16[mesh]
17AUTOSTART = NO
18
19[dht]
20AUTOSTART = NO
21
22[dhtcache]
23QUOTA = 1 MB
24DATABASE = heap
25
26[transport]
27PLUGINS = tcp
28ACCEPT_FROM6 = ::1;
29ACCEPT_FROM = 127.0.0.1;
30NEIGHBOUR_LIMIT = 50
31PORT = 12365
32
33[ats]
34WAN_QUOTA_OUT = 3932160
35WAN_QUOTA_IN = 3932160
36
37[core]
38PORT = 12092
39AUTOSTART = YES
40USE_EPHEMERAL_KEYS = NO
41
42[arm]
43DEFAULTSERVICES = core transport
44PORT = 12366
45
46[transport-tcp]
47TIMEOUT = 300 s
48PORT = 12368
49
50[TESTING]
51NUM_PEERS = 5
52WEAKRANDOM = YES
53HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
54MAX_CONCURRENT_SSH = 10
55USE_PROGRESSBARS = YES
56PEERGROUP_TIMEOUT = 2400 s
57
58[gnunetd]
59HOSTKEY = $GNUNET_TEST_HOME/.hostkey
60
61[PATHS]
62GNUNET_TEST_HOME = /tmp/test-testbed/
63
64[dns]
65AUTOSTART = NO
66
67[nse]
68AUTOSTART = NO
69
70[vpn]
71AUTOSTART = NO
72
73[nat]
74RETURN_LOCAL_ADDRESSES = YES
75 5
76[gns-helper-service-w32]
77AUTOSTART = 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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100
7OVERLAY_TOPOLOGY = CLIQUE 4OVERLAY_TOPOLOGY = CLIQUE
8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
9
10[fs]
11AUTOSTART = NO
12
13[resolver]
14AUTOSTART = NO
15
16[mesh]
17AUTOSTART = NO
18
19[dht]
20AUTOSTART = NO
21
22[dhtcache]
23QUOTA = 1 MB
24DATABASE = heap
25
26[transport]
27PLUGINS = tcp
28ACCEPT_FROM6 = ::1;
29ACCEPT_FROM = 127.0.0.1;
30NEIGHBOUR_LIMIT = 50
31PORT = 12365
32
33[ats]
34WAN_QUOTA_OUT = 3932160
35WAN_QUOTA_IN = 3932160
36
37[core]
38PORT = 12092
39AUTOSTART = YES
40USE_EPHEMERAL_KEYS = NO
41
42[arm]
43DEFAULTSERVICES = core transport
44PORT = 12366
45
46[transport-tcp]
47TIMEOUT = 300 s
48PORT = 12368
49
50[TESTING]
51NUM_PEERS = 5
52WEAKRANDOM = YES
53HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
54MAX_CONCURRENT_SSH = 10
55USE_PROGRESSBARS = YES
56PEERGROUP_TIMEOUT = 2400 s
57
58[gnunetd]
59HOSTKEY = $GNUNET_TEST_HOME/.hostkey
60
61[PATHS]
62GNUNET_TEST_HOME = /tmp/test-testbed/
63
64[dns]
65AUTOSTART = NO
66
67[nse]
68AUTOSTART = NO
69
70[vpn]
71AUTOSTART = NO
72
73[nat]
74RETURN_LOCAL_ADDRESSES = YES
75
76[gns-helper-service-w32]
77AUTOSTART = 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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100
7OVERLAY_TOPOLOGY = FROM_FILE 4OVERLAY_TOPOLOGY = FROM_FILE
8OVERLAY_TOPOLOGY_FILE = overlay_topology.txt 5OVERLAY_TOPOLOGY_FILE = overlay_topology.txt
9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
10
11[fs]
12AUTOSTART = NO
13
14[resolver]
15AUTOSTART = NO
16
17[mesh]
18AUTOSTART = NO
19
20[dht]
21AUTOSTART = NO
22
23[dhtcache]
24QUOTA = 1 MB
25DATABASE = heap
26
27[transport]
28PLUGINS = udp
29ACCEPT_FROM6 = ::1;
30ACCEPT_FROM = 127.0.0.1;
31NEIGHBOUR_LIMIT = 50
32PORT = 12365
33
34[ats]
35WAN_QUOTA_OUT = 3932160
36WAN_QUOTA_IN = 3932160
37
38[core]
39PORT = 12092
40AUTOSTART = YES
41USE_EPHEMERAL_KEYS = NO
42
43[arm]
44DEFAULTSERVICES = core transport
45PORT = 12366
46
47[transport-udp]
48TIMEOUT = 300 s
49PORT = 12368
50
51[gnunetd]
52HOSTKEY = $GNUNET_TEST_HOME/.hostkey
53
54[PATHS]
55GNUNET_TEST_HOME = /tmp/test-testbed/
56
57[dns]
58AUTOSTART = NO
59
60[nse]
61AUTOSTART = NO
62
63[vpn]
64AUTOSTART = NO
65
66[nat]
67RETURN_LOCAL_ADDRESSES = YES
68
69[gns-helper-service-w32]
70AUTOSTART = 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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100
7OVERLAY_TOPOLOGY = LINE 4OVERLAY_TOPOLOGY = LINE
8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
9
10[fs]
11AUTOSTART = NO
12
13[resolver]
14AUTOSTART = NO
15
16[mesh]
17AUTOSTART = NO
18
19[dht]
20AUTOSTART = NO
21
22[dhtcache]
23QUOTA = 1 MB
24DATABASE = heap
25
26[transport]
27PLUGINS = tcp
28ACCEPT_FROM6 = ::1;
29ACCEPT_FROM = 127.0.0.1;
30NEIGHBOUR_LIMIT = 50
31PORT = 12365
32
33[ats]
34WAN_QUOTA_OUT = 3932160
35WAN_QUOTA_IN = 3932160
36
37[core]
38PORT = 12092
39AUTOSTART = YES
40USE_EPHEMERAL_KEYS = NO
41
42[arm]
43DEFAULTSERVICES = core transport
44PORT = 12366
45
46[transport-tcp]
47TIMEOUT = 300 s
48PORT = 12368
49
50[TESTING]
51NUM_PEERS = 5
52WEAKRANDOM = YES
53HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
54MAX_CONCURRENT_SSH = 10
55USE_PROGRESSBARS = YES
56PEERGROUP_TIMEOUT = 2400 s
57
58[gnunetd]
59HOSTKEY = $GNUNET_TEST_HOME/.hostkey
60
61[PATHS]
62GNUNET_TEST_HOME = /tmp/test-testbed/
63
64[dns]
65AUTOSTART = NO
66
67[nse]
68AUTOSTART = NO
69
70[vpn]
71AUTOSTART = NO
72
73[nat]
74RETURN_LOCAL_ADDRESSES = YES
75
76[gns-helper-service-w32]
77AUTOSTART = 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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6OVERLAY_TOPOLOGY = RANDOM 4OVERLAY_TOPOLOGY = RANDOM
7OVERLAY_RANDOM_LINKS = 5 5OVERLAY_RANDOM_LINKS = 5
8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
9
10[fs]
11AUTOSTART = NO
12
13[resolver]
14AUTOSTART = NO
15
16[mesh]
17AUTOSTART = NO
18
19[dht]
20AUTOSTART = NO
21
22[dhtcache]
23QUOTA = 1 MB
24DATABASE = heap
25
26[transport]
27PLUGINS = tcp
28ACCEPT_FROM6 = ::1;
29ACCEPT_FROM = 127.0.0.1;
30NEIGHBOUR_LIMIT = 50
31PORT = 12365
32
33[ats]
34WAN_QUOTA_OUT = 3932160
35WAN_QUOTA_IN = 3932160
36
37[core]
38PORT = 12092
39AUTOSTART = YES
40USE_EPHEMERAL_KEYS = NO
41
42[arm]
43DEFAULTSERVICES = core transport
44PORT = 12366
45
46[transport-tcp]
47TIMEOUT = 300 s
48PORT = 12368
49
50[TESTING]
51NUM_PEERS = 5
52WEAKRANDOM = YES
53HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
54MAX_CONCURRENT_SSH = 10
55USE_PROGRESSBARS = YES
56PEERGROUP_TIMEOUT = 2400 s
57
58[gnunetd]
59HOSTKEY = $GNUNET_TEST_HOME/.hostkey
60
61[PATHS]
62GNUNET_TEST_HOME = /tmp/test-testbed/
63
64[dns]
65AUTOSTART = NO
66
67[nse]
68AUTOSTART = NO
69
70[vpn]
71AUTOSTART = NO
72
73[nat]
74RETURN_LOCAL_ADDRESSES = YES
75
76[gns-helper-service-w32]
77AUTOSTART = 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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100
7OVERLAY_TOPOLOGY = RING 4OVERLAY_TOPOLOGY = RING
8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
9
10[fs]
11AUTOSTART = NO
12
13[resolver]
14AUTOSTART = NO
15
16[mesh]
17AUTOSTART = NO
18
19[dht]
20AUTOSTART = NO
21
22[dhtcache]
23QUOTA = 1 MB
24DATABASE = heap
25
26[transport]
27PLUGINS = tcp
28ACCEPT_FROM6 = ::1;
29ACCEPT_FROM = 127.0.0.1;
30NEIGHBOUR_LIMIT = 50
31PORT = 12365
32
33[ats]
34WAN_QUOTA_OUT = 3932160
35WAN_QUOTA_IN = 3932160
36
37[core]
38PORT = 12092
39AUTOSTART = YES
40USE_EPHEMERAL_KEYS = NO
41
42[arm]
43DEFAULTSERVICES = core transport
44PORT = 12366
45
46[transport-tcp]
47TIMEOUT = 300 s
48PORT = 12368
49
50[TESTING]
51NUM_PEERS = 5
52WEAKRANDOM = YES
53HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
54MAX_CONCURRENT_SSH = 10
55USE_PROGRESSBARS = YES
56PEERGROUP_TIMEOUT = 2400 s
57
58[gnunetd]
59HOSTKEY = $GNUNET_TEST_HOME/.hostkey
60
61[PATHS]
62GNUNET_TEST_HOME = /tmp/test-testbed/
63
64[dns]
65AUTOSTART = NO
66
67[nse]
68AUTOSTART = NO
69
70[vpn]
71AUTOSTART = NO
72
73[nat]
74RETURN_LOCAL_ADDRESSES = YES
75
76[gns-helper-service-w32]
77AUTOSTART = 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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100
7OVERLAY_TOPOLOGY = SCALE_FREE 4OVERLAY_TOPOLOGY = SCALE_FREE
8SCALE_FREE_TOPOLOGY_CAP = 70 5SCALE_FREE_TOPOLOGY_CAP = 70
9SCALE_FREE_TOPOLOGY_M = 5 6SCALE_FREE_TOPOLOGY_M = 5
10#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
11
12[fs]
13AUTOSTART = NO
14
15[resolver]
16AUTOSTART = NO
17
18[mesh]
19AUTOSTART = NO
20
21[dht]
22AUTOSTART = NO
23
24[dhtcache]
25QUOTA = 1 MB
26DATABASE = heap
27
28[transport]
29PLUGINS = tcp
30ACCEPT_FROM6 = ::1;
31ACCEPT_FROM = 127.0.0.1;
32NEIGHBOUR_LIMIT = 50
33PORT = 12365
34
35[ats]
36WAN_QUOTA_OUT = 3932160
37WAN_QUOTA_IN = 3932160
38
39[core]
40PORT = 12092
41AUTOSTART = YES
42USE_EPHEMERAL_KEYS = NO
43
44[arm]
45DEFAULTSERVICES = core transport
46PORT = 12366
47
48[transport-tcp]
49TIMEOUT = 300 s
50PORT = 12368
51
52[TESTING]
53NUM_PEERS = 5
54WEAKRANDOM = YES
55HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
56MAX_CONCURRENT_SSH = 10
57USE_PROGRESSBARS = YES
58PEERGROUP_TIMEOUT = 2400 s
59
60[gnunetd]
61HOSTKEY = $GNUNET_TEST_HOME/.hostkey
62
63[PATHS]
64GNUNET_TEST_HOME = /tmp/test-testbed/
65
66[dns]
67AUTOSTART = NO
68
69[nse]
70AUTOSTART = NO
71
72[vpn]
73AUTOSTART = NO
74
75[nat]
76RETURN_LOCAL_ADDRESSES = YES
77
78[gns-helper-service-w32]
79AUTOSTART = 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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6OVERLAY_TOPOLOGY = SMALL_WORLD 4OVERLAY_TOPOLOGY = SMALL_WORLD
7OVERLAY_RANDOM_LINKS = 3 5OVERLAY_RANDOM_LINKS = 3
8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
9
10[fs]
11AUTOSTART = NO
12
13[resolver]
14AUTOSTART = NO
15
16[mesh]
17AUTOSTART = NO
18
19[dht]
20AUTOSTART = NO
21
22[dhtcache]
23QUOTA = 1 MB
24DATABASE = heap
25
26[transport]
27PLUGINS = tcp
28ACCEPT_FROM6 = ::1;
29ACCEPT_FROM = 127.0.0.1;
30NEIGHBOUR_LIMIT = 50
31PORT = 12365
32
33[ats]
34WAN_QUOTA_OUT = 3932160
35WAN_QUOTA_IN = 3932160
36
37[core]
38PORT = 12092
39AUTOSTART = YES
40USE_EPHEMERAL_KEYS = NO
41
42[arm]
43DEFAULTSERVICES = core transport
44PORT = 12366
45
46[transport-tcp]
47TIMEOUT = 300 s
48PORT = 12368
49
50[TESTING]
51NUM_PEERS = 5
52WEAKRANDOM = YES
53HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
54MAX_CONCURRENT_SSH = 10
55USE_PROGRESSBARS = YES
56PEERGROUP_TIMEOUT = 2400 s
57
58[gnunetd]
59HOSTKEY = $GNUNET_TEST_HOME/.hostkey
60
61[PATHS]
62GNUNET_TEST_HOME = /tmp/test-testbed/
63
64[dns]
65AUTOSTART = NO
66
67[nse]
68AUTOSTART = NO
69
70[vpn]
71AUTOSTART = NO
72
73[nat]
74RETURN_LOCAL_ADDRESSES = YES
75
76[gns-helper-service-w32]
77AUTOSTART = NO
78
79[consensus]
80AUTOSTART = NO
81
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 @@
1@INLINE@ test_testbed_api_template.conf
2
1[testbed] 3[testbed]
2AUTOSTART = NO
3PORT = 12113
4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost
6OVERLAY_TOPOLOGY = SMALL_WORLD_RING 4OVERLAY_TOPOLOGY = SMALL_WORLD_RING
7OVERLAY_RANDOM_LINKS = 3 5OVERLAY_RANDOM_LINKS = 3
8#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
9
10[fs]
11AUTOSTART = NO
12
13[resolver]
14AUTOSTART = NO
15
16[mesh]
17AUTOSTART = NO
18
19[dht]
20AUTOSTART = NO
21
22[dhtcache]
23QUOTA = 1 MB
24DATABASE = heap
25
26[transport]
27PLUGINS = tcp
28ACCEPT_FROM6 = ::1;
29ACCEPT_FROM = 127.0.0.1;
30NEIGHBOUR_LIMIT = 50
31PORT = 12365
32
33[ats]
34WAN_QUOTA_OUT = 3932160
35WAN_QUOTA_IN = 3932160
36
37[core]
38PORT = 12092
39AUTOSTART = YES
40USE_EPHEMERAL_KEYS = NO
41
42[arm]
43DEFAULTSERVICES = core transport
44PORT = 12366
45
46[transport-tcp]
47TIMEOUT = 300 s
48PORT = 12368
49
50[TESTING]
51NUM_PEERS = 5
52WEAKRANDOM = YES
53HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
54MAX_CONCURRENT_SSH = 10
55USE_PROGRESSBARS = YES
56PEERGROUP_TIMEOUT = 2400 s
57
58[gnunetd]
59HOSTKEY = $GNUNET_TEST_HOME/.hostkey
60
61[PATHS]
62GNUNET_TEST_HOME = /tmp/test-testbed/
63
64[dns]
65AUTOSTART = NO
66
67[nse]
68AUTOSTART = NO
69
70[vpn]
71AUTOSTART = NO
72
73[nat]
74RETURN_LOCAL_ADDRESSES = YES
75
76[gns-helper-service-w32]
77AUTOSTART = NO
78
79[consensus]
80AUTOSTART = NO
81