aboutsummaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-02 07:46:21 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-02 07:46:21 +0000
commitafb3ea4f771c7534dbee439c21a62fe0519ba832 (patch)
treee9b6f7e1862b8319d1d312b78152227af3ae087a /src/testing
parent4bd708f478f64fedb65aaf3a12e16d76b79554ac (diff)
downloadgnunet-afb3ea4f771c7534dbee439c21a62fe0519ba832.tar.gz
gnunet-afb3ea4f771c7534dbee439c21a62fe0519ba832.zip
towards simplified configs
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/test_testing_connect_peer1.conf68
-rw-r--r--src/testing/test_testing_connect_peer2.conf68
-rw-r--r--src/testing/test_testing_data.conf59
-rw-r--r--src/testing/test_testing_data_remote.conf56
-rw-r--r--src/testing/test_testing_data_topology_2d_torus.conf58
-rw-r--r--src/testing/test_testing_data_topology_blacklist.conf70
-rw-r--r--src/testing/test_testing_data_topology_churn.conf67
-rw-r--r--src/testing/test_testing_data_topology_clique.conf73
-rw-r--r--src/testing/test_testing_data_topology_clique_dfs.conf70
-rw-r--r--src/testing/test_testing_data_topology_clique_minimum.conf69
-rw-r--r--src/testing/test_testing_data_topology_clique_random.conf71
-rw-r--r--src/testing/test_testing_data_topology_erdos_renyi.conf59
-rw-r--r--src/testing/test_testing_data_topology_internat.conf59
-rw-r--r--src/testing/test_testing_data_topology_none.conf74
-rw-r--r--src/testing/test_testing_data_topology_ring.conf59
-rw-r--r--src/testing/test_testing_data_topology_scale_free.conf70
-rw-r--r--src/testing/test_testing_data_topology_small_world_ring.conf58
-rw-r--r--src/testing/test_testing_data_topology_small_world_torus.conf59
-rw-r--r--src/testing/test_testing_data_topology_stability.conf72
-rw-r--r--src/testing/test_testing_peergroup_data.conf65
20 files changed, 203 insertions, 1101 deletions
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/ 3SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/
3DEFAULTCONFIG = test_testing_connect_peer1.conf 4DEFAULTCONFIG = test_testing_connect_peer1.conf
4 5
5[resolver] 6[transport-tcp]
6PORT = 12564 7PORT = 12568
7UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 8BINDTO = 127.0.0.1
8HOSTNAME = localhost
9
10[transport]
11PORT = 12565
12UNIXPATH = /tmp/gnunet-p1-service-transport.sock
13HOSTNAME = localhost
14PLUGINS = tcp
15#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
16#PREFIX = valgrind --tool=memcheck --log-file=logs%p
17 9
18[arm] 10[arm]
19PORT = 12566 11PORT = 12566
12DEFAULTSERVICES = core
20UNIXPATH = /tmp/gnunet-p1-service-arm.sock 13UNIXPATH = /tmp/gnunet-p1-service-arm.sock
21HOSTNAME = localhost
22DEFAULTSERVICES = core
23# core in DEFAULTSERVICES required or test case will fail!
24#DEBUG = YES
25 14
26[statistics] 15[statistics]
27PORT = 12567 16PORT = 12567
28UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 17UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
29HOSTNAME = localhost
30 18
31[transport-tcp] 19[resolver]
32PORT = 12568 20PORT = 12564
33BINDTO = 127.0.0.1 21UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
34 22
35[peerinfo] 23[peerinfo]
36PORT = 12569 24PORT = 12569
37UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 25UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
38HOSTNAME = localhost 26
27[transport]
28PORT = 12565
29UNIXPATH = /tmp/gnunet-p1-service-transport.sock
39 30
40[core] 31[core]
41PORT = 12570 32PORT = 12570
42UNIXPATH = /tmp/gnunet-p1-service-core.sock 33UNIXPATH = /tmp/gnunet-p1-service-core.sock
43HOSTNAME = localhost
44#DEBUG = YES
45
46[testing]
47WEAKRANDOM = YES
48
49[fs]
50AUTOSTART = NO
51
52[datastore]
53AUTOSTART = NO
54
55[dht]
56AUTOSTART = NO
57
58[mesh]
59AUTOSTART = NO
60
61[nat]
62DISABLEV6 = YES
63ENABLE_UPNP = NO
64BEHIND_NAT = NO
65ALLOW_NAT = NO
66INTERNAL_ADDRESS = 127.0.0.1
67EXTERNAL_ADDRESS = 127.0.0.1
68USE_LOCALADDR = NO
69
70[dns]
71AUTOSTART = NO
72
73
74
75[nse]
76AUTOSTART = NO
77
78 34
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/ 3SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/
3DEFAULTCONFIG = test_testing_connect_peer2.conf 4DEFAULTCONFIG = test_testing_connect_peer2.conf
4 5
5[resolver] 6[transport-tcp]
6PORT = 22564 7PORT = 22568
7UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 8BINDTO = 127.0.0.1
8HOSTNAME = localhost
9
10[transport]
11PORT = 22565
12UNIXPATH = /tmp/gnunet-p2-service-transport.sock
13HOSTNAME = localhost
14PLUGINS = tcp
15#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
16#PREFIX = valgrind --tool=memcheck --log-file=logs%p
17 9
18[arm] 10[arm]
19PORT = 22566 11PORT = 22566
12DEFAULTSERVICES = core
20UNIXPATH = /tmp/gnunet-p2-service-arm.sock 13UNIXPATH = /tmp/gnunet-p2-service-arm.sock
21DEFAULTSERVICES = core
22#core in DEFAULTSERVICES required or test case will fail!
23HOSTNAME = localhost
24#DEBUG = YES
25 14
26[statistics] 15[statistics]
27PORT = 22567 16PORT = 22567
28UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 17UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
29HOSTNAME = localhost
30 18
31[transport-tcp] 19[resolver]
32PORT = 22568 20PORT = 22564
33BINDTO = 127.0.0.1 21UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
34 22
35[peerinfo] 23[peerinfo]
36PORT = 22569 24PORT = 22569
37UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 25UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
38HOSTNAME = localhost 26
27[transport]
28PORT = 22565
29UNIXPATH = /tmp/gnunet-p2-service-transport.sock
39 30
40[core] 31[core]
41PORT = 22570 32PORT = 22570
42UNIXPATH = /tmp/gnunet-p2-service-core.sock 33UNIXPATH = /tmp/gnunet-p2-service-core.sock
43HOSTNAME = localhost
44#DEBUG = YES
45
46[testing]
47WEAKRANDOM = YES
48
49[fs]
50AUTOSTART = NO
51
52[datastore]
53AUTOSTART = NO
54
55[dht]
56AUTOSTART = NO
57
58[mesh]
59AUTOSTART = NO
60
61[nat]
62DISABLEV6 = YES
63ENABLE_UPNP = NO
64BEHIND_NAT = NO
65ALLOW_NAT = NO
66INTERNAL_ADDRESS = 127.0.0.1
67EXTERNAL_ADDRESS = 127.0.0.1
68USE_LOCALADDR = NO
69
70[dns]
71AUTOSTART = NO
72
73
74
75[nse]
76AUTOSTART = NO
77
78 34
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data.conf 3DEFAULTCONFIG = test_testing_data.conf
4 4
5[resolver]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
12#PREFIX = valgrind --tool=memcheck --log-file=logs%p
13
14[arm] 5[arm]
15PORT = 2566
16DEFAULTSERVICES = core 6DEFAULTSERVICES = core
17 7
18[statistics]
19PORT = 2567
20
21[transport-tcp]
22PORT = 2568
23#USE_LOCALADDR = YES
24
25[peerinfo]
26PORT = 2569
27
28[core]
29PORT = 2570
30
31[testing]
32WEAKRANDOM = YES
33HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
34
35[fs]
36AUTOSTART = NO
37
38[datastore]
39AUTOSTART = NO
40
41[dht]
42AUTOSTART = NO
43
44[mesh]
45AUTOSTART = NO
46
47[nat]
48DISABLEV6 = YES
49ENABLE_UPNP = NO
50BEHIND_NAT = NO
51ALLOW_NAT = NO
52INTERNAL_ADDRESS = 127.0.0.1
53EXTERNAL_ADDRESS = 127.0.0.1
54USE_LOCALADDR = NO
55
56[dns]
57AUTOSTART = NO
58
59
60
61[nse]
62AUTOSTART = NO
63
64
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_remote.conf 3DEFAULTCONFIG = test_testing_data_remote.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
12#PREFIX = valgrind --tool=memcheck --log-file=logs%p
13
14[arm]
15PORT = 2566
16DEFAULTSERVICES =
17
18[statistics]
19AUTOSTART = NO
20PORT = 2567
21
22[transport-tcp]
23PORT = 2568
24
25[peerinfo]
26PORT = 2569
27
28[core]
29PORT = 2570
30
31[testing]
32CONTROL_HOST = 131.159.20.42 6CONTROL_HOST = 131.159.20.42
33HOSTFILE = remote_hosts.txt 7HOSTFILE = remote_hosts.txt
34WEAKRANDOM = YES
35NUM_PEERS = 5
36HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
37MAX_OUTSTANDING_SSH = 5 8MAX_OUTSTANDING_SSH = 5
38 9
39[dht] 10[statistics]
40AUTOSTART = NO
41
42[nat]
43DISABLEV6 = YES
44ENABLE_UPNP = NO
45BEHIND_NAT = NO
46ALLOW_NAT = NO
47INTERNAL_ADDRESS = 127.0.0.1
48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
50
51[dns]
52AUTOSTART = NO 11AUTOSTART = NO
53 12
13[datastore]
14AUTOSTART = YES
54 15
16[fs]
17AUTOSTART = YES
55 18
56[nse] 19[mesh]
57AUTOSTART = NO 20AUTOSTART = YES
58
59 21
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#PREFIX = valgrind --tool=memcheck --log-file=logs%p
13#DEBUG = YES
14
15[arm]
16PORT = 2566
17DEFAULTSERVICES =
18
19[statistics]
20PORT = 2567
21
22[transport-tcp]
23PORT = 2568
24
25[peerinfo]
26PORT = 2569
27
28[core]
29PORT = 2570
30#DEBUG = YES
31
32[testing]
33NUM_PEERS = 13 6NUM_PEERS = 13
34WEAKRANDOM = YES
35TOPOLOGY = 2D_TORUS 7TOPOLOGY = 2D_TORUS
36F2F = YES
37HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
38
39[dht]
40AUTOSTART = NO
41
42[nat]
43DISABLEV6 = YES
44ENABLE_UPNP = NO
45BEHIND_NAT = NO
46ALLOW_NAT = NO
47INTERNAL_ADDRESS = 127.0.0.1
48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
50
51[dns]
52AUTOSTART = NO
53
54 8
9[datastore]
10AUTOSTART = YES
55 11
56[nse] 12[fs]
57AUTOSTART = NO 13AUTOSTART = YES
58 14
15[mesh]
16AUTOSTART = YES
59 17
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_blacklist.conf 3DEFAULTCONFIG = test_testing_data_topology_blacklist.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11BLACKLIST_FILE = $SERVICEHOME/blacklist
12#PREFIX = xterm -e xterm -T transport -e gdb --args
13#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
14#PREFIX = valgrind --tool=memcheck --log-file=logs%p
15#DEBUG = YES
16
17[arm]
18PORT = 2566
19DEFAULTSERVICES =
20
21[statistics]
22PORT = 2567
23
24[transport-tcp]
25PORT = 2568
26
27[transport-udp]
28PORT = 2568
29
30[peerinfo]
31PORT = 2569
32#DEBUG = YES
33#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
34#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
35#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
36
37[core]
38PORT = 2570
39#PREFIX = xterm -e xterm -T CORE -e gdb --args
40#PREFIX = valgrind --tool=memcheck --log-file=logs%p
41#DEBUG = YES
42
43[testing]
44NUM_PEERS = 4 6NUM_PEERS = 4
45WEAKRANDOM = YES
46TOPOLOGY = CLIQUE 7TOPOLOGY = CLIQUE
47BLACKLIST_TOPOLOGY = RING 8BLACKLIST_TOPOLOGY = RING
48BLACKLIST_TRANSPORTS = tcp udp http 9BLACKLIST_TRANSPORTS = tcp udp http
49F2F = YES
50HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
51
52[dht]
53AUTOSTART = NO
54
55[nat]
56DISABLEV6 = YES
57ENABLE_UPNP = NO
58BEHIND_NAT = NO
59ALLOW_NAT = NO
60INTERNAL_ADDRESS = 127.0.0.1
61EXTERNAL_ADDRESS = 127.0.0.1
62USE_LOCALADDR = NO
63
64[dns]
65AUTOSTART = NO
66 10
11[transport-udp]
12PORT = 2568
67 13
14[datastore]
15AUTOSTART = YES
68 16
69[nse] 17[fs]
70AUTOSTART = NO 18AUTOSTART = YES
71 19
20[mesh]
21AUTOSTART = YES
72 22
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_churn.conf 3DEFAULTCONFIG = test_testing_data_topology_churn.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564 6NUM_PEERS = 12
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
13#PREFIX = valgrind --tool=memcheck --log-file=logs%p
14#DEBUG = YES
15
16[arm]
17PORT = 2566
18DEFAULTSERVICES = peerinfo transport core
19
20[statistics]
21PORT = 2567
22
23[transport-tcp]
24PORT = 2568
25 7
26[transport-udp] 8[transport-udp]
27PORT = 2568 9PORT = 2568
28 10
29[peerinfo] 11[arm]
30PORT = 2569 12DEFAULTSERVICES = peerinfo transport core
31#DEBUG = YES
32#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
33#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
34#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
35
36[core]
37PORT = 2570
38#PREFIX = xterm -e xterm -T CORE -e gdb --args
39#PREFIX = valgrind --tool=memcheck --log-file=logs%p
40#DEBUG = YES
41
42[testing]
43NUM_PEERS = 12
44WEAKRANDOM = YES
45HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
46
47[dht]
48AUTOSTART = NO
49
50[nat]
51DISABLEV6 = YES
52ENABLE_UPNP = NO
53BEHIND_NAT = NO
54ALLOW_NAT = NO
55INTERNAL_ADDRESS = 127.0.0.1
56EXTERNAL_ADDRESS = 127.0.0.1
57USE_LOCALADDR = NO
58
59[dns]
60AUTOSTART = NO
61
62 13
14[datastore]
15AUTOSTART = YES
63 16
64[nse] 17[fs]
65AUTOSTART = NO 18AUTOSTART = YES
66 19
20[mesh]
21AUTOSTART = YES
67 22
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564 6CONNECT_TIMEOUT = 180
7 7CONNECT_ATTEMPTS = 14
8[transport] 8NUM_PEERS = 4
9PORT = 2565 9TOPOLOGY = CLIQUE
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
13#PREFIX = valgrind --tool=memcheck --log-file=logs%p
14#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p
15#DEBUG = YES
16
17[arm]
18PORT = 2566
19DEFAULTSERVICES =
20
21[statistics]
22PORT = 2567
23 10
24[transport-tcp] 11[transport-tcp]
25PORT = 2568
26ENABLE_UPNP = NO 12ENABLE_UPNP = NO
27 13
28[transport-udp] 14[transport-udp]
29PORT = 2568 15PORT = 2568
30 16
31[peerinfo] 17[datastore]
32PORT = 2569 18AUTOSTART = YES
33#DEBUG = YES
34#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
35#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
36#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
37
38[core]
39PORT = 2570
40#PREFIX = xterm -e xterm -T CORE -e gdb --args
41#PREFIX = valgrind --tool=memcheck --log-file=logs%p
42#DEBUG = YES
43
44[testing]
45NUM_PEERS = 4
46WEAKRANDOM = YES
47TOPOLOGY = CLIQUE
48F2F = YES
49CONNECT_TIMEOUT = 180
50CONNECT_ATTEMPTS = 14
51#DEBUG = YES
52HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
53
54[dht]
55AUTOSTART = NO
56
57[nat]
58DISABLEV6 = YES
59ENABLE_UPNP = NO
60BEHIND_NAT = NO
61ALLOW_NAT = NO
62INTERNAL_ADDRESS = 127.0.0.1
63EXTERNAL_ADDRESS = 127.0.0.1
64USE_LOCALADDR = NO
65
66[dns]
67AUTOSTART = NO
68
69
70 19
71[nse] 20[fs]
72AUTOSTART = NO 21AUTOSTART = YES
73 22
23[mesh]
24AUTOSTART = YES
74 25
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
13#PREFIX = valgrind --tool=memcheck --log-file=logs%p
14#DEBUG = YES
15
16[arm]
17PORT = 2566
18DEFAULTSERVICES = peerinfo transport core
19
20[statistics]
21PORT = 2567
22
23[transport-tcp]
24PORT = 2568
25
26[transport-udp]
27PORT = 2568
28
29[peerinfo]
30PORT = 2569
31#DEBUG = YES
32#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
33#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
34#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
35
36[core]
37PORT = 2570
38#PREFIX = xterm -e xterm -T CORE -e gdb --args
39#PREFIX = valgrind --tool=memcheck --log-file=logs%p
40#DEBUG = YES
41
42[testing]
43NUM_PEERS = 7 6NUM_PEERS = 7
44WEAKRANDOM = YES
45TOPOLOGY = CLIQUE 7TOPOLOGY = CLIQUE
46CONNECT_TOPOLOGY_OPTION = CONNECT_DFS 8CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
47CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 9CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
48F2F = YES
49HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
50
51[dht]
52AUTOSTART = NO
53
54[nat]
55DISABLEV6 = YES
56ENABLE_UPNP = NO
57BEHIND_NAT = NO
58ALLOW_NAT = NO
59INTERNAL_ADDRESS = 127.0.0.1
60EXTERNAL_ADDRESS = 127.0.0.1
61USE_LOCALADDR = NO
62 10
63[dns] 11[transport-udp]
64AUTOSTART = NO 12PORT = 2568
65 13
14[arm]
15DEFAULTSERVICES = peerinfo transport core
66 16
17[datastore]
18AUTOSTART = YES
67 19
68[nse] 20[fs]
69AUTOSTART = NO 21AUTOSTART = YES
70 22
23[mesh]
24AUTOSTART = YES
71 25
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
13#PREFIX = valgrind --tool=memcheck --log-file=logs%p
14#DEBUG = YES
15
16[arm]
17PORT = 2566
18DEFAULTSERVICES =
19
20[statistics]
21PORT = 2567
22
23[transport-tcp]
24PORT = 2568
25
26[transport-udp]
27PORT = 2568
28
29[peerinfo]
30PORT = 2569
31#DEBUG = YES
32#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
33#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
34#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
35
36[core]
37PORT = 2570
38#PREFIX = xterm -e xterm -T CORE -e gdb --args
39#PREFIX = valgrind --tool=memcheck --log-file=logs%p
40#DEBUG = YES
41
42[testing]
43NUM_PEERS = 20 6NUM_PEERS = 20
44WEAKRANDOM = YES
45TOPOLOGY = CLIQUE 7TOPOLOGY = CLIQUE
46CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM 8CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
47CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 9CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
48#F2F = YES
49HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
50
51[dht]
52AUTOSTART = NO
53
54[nat]
55DISABLEV6 = YES
56ENABLE_UPNP = NO
57BEHIND_NAT = NO
58ALLOW_NAT = NO
59INTERNAL_ADDRESS = 127.0.0.1
60EXTERNAL_ADDRESS = 127.0.0.1
61USE_LOCALADDR = NO
62
63[dns]
64AUTOSTART = NO
65 10
11[transport-udp]
12PORT = 2568
66 13
14[datastore]
15AUTOSTART = YES
67 16
68[nse] 17[fs]
69AUTOSTART = NO 18AUTOSTART = YES
70 19
20[mesh]
21AUTOSTART = YES
71 22
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6AUTOSTART = NO
7PORT = 2564
8
9[transport]
10PORT = 2565
11PLUGINS = tcp
12#PREFIX = xterm -e xterm -T transport -e gdb --args
13#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
14#PREFIX = valgrind --tool=memcheck --log-file=logs%p
15#DEBUG = YES
16
17[arm]
18PORT = 2566
19DEFAULTSERVICES =
20
21[statistics]
22AUTOSTART = NO
23PORT = 2567
24
25[transport-tcp]
26PORT = 2568
27
28[transport-udp]
29PORT = 2568
30
31[peerinfo]
32PORT = 2569
33#DEBUG = YES
34#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
35#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
36#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
37
38[core]
39PORT = 2570
40#PREFIX = xterm -e xterm -T CORE -e gdb --args
41#PREFIX = valgrind --tool=memcheck --log-file=logs%p
42#DEBUG = YES
43
44[testing]
45NUM_PEERS = 20 6NUM_PEERS = 20
46WEAKRANDOM = YES
47TOPOLOGY = CLIQUE 7TOPOLOGY = CLIQUE
48CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET 8CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
49CONNECT_TOPOLOGY_OPTION_MODIFIER = .15 9CONNECT_TOPOLOGY_OPTION_MODIFIER = .15
50F2F = YES
51HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
52 10
53[dht] 11[transport-udp]
54AUTOSTART = NO 12PORT = 2568
55
56[nat]
57DISABLEV6 = YES
58ENABLE_UPNP = NO
59BEHIND_NAT = NO
60ALLOW_NAT = NO
61INTERNAL_ADDRESS = 127.0.0.1
62EXTERNAL_ADDRESS = 127.0.0.1
63USE_LOCALADDR = NO
64 13
65[dns] 14[statistics]
66AUTOSTART = NO 15AUTOSTART = NO
67 16
17[resolver]
18AUTOSTART = NO
68 19
20[datastore]
21AUTOSTART = YES
69 22
70[nse] 23[fs]
71AUTOSTART = NO 24AUTOSTART = YES
72 25
26[mesh]
27AUTOSTART = YES
73 28
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#PREFIX = valgrind --tool=memcheck --log-file=logs%p
13#DEBUG = YES
14
15[arm]
16PORT = 2566
17DEFAULTSERVICES =
18
19[statistics]
20PORT = 2567
21
22[transport-tcp]
23PORT = 2568
24
25[peerinfo]
26PORT = 2569
27
28[core]
29PORT = 2570
30#DEBUG = YES
31
32[testing]
33NUM_PEERS = 5
34WEAKRANDOM = YES
35TOPOLOGY = ERDOS_RENYI 6TOPOLOGY = ERDOS_RENYI
36F2F = YES
37HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
38
39[dht]
40AUTOSTART = NO
41
42[nat]
43DISABLEV6 = YES
44ENABLE_UPNP = NO
45BEHIND_NAT = NO
46ALLOW_NAT = NO
47INTERNAL_ADDRESS = 127.0.0.1
48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
50
51[dns]
52AUTOSTART = NO
53
54 7
8[datastore]
9AUTOSTART = YES
55 10
56[nse] 11[fs]
57AUTOSTART = NO 12AUTOSTART = YES
58 13
14[mesh]
15AUTOSTART = YES
59 16
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#PREFIX = valgrind --tool=memcheck --log-file=logs%p
13#DEBUG = YES
14
15[arm]
16PORT = 2566
17DEFAULTSERVICES =
18
19[statistics]
20PORT = 2567
21
22[transport-tcp]
23PORT = 2568
24
25[peerinfo]
26PORT = 2569
27
28[core]
29PORT = 2570
30#DEBUG = YES
31
32[testing]
33NUM_PEERS = 5
34WEAKRANDOM = YES
35TOPOLOGY = INTERNAT 6TOPOLOGY = INTERNAT
36F2F = YES
37HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
38
39[dht]
40AUTOSTART = NO
41
42[nat]
43DISABLEV6 = YES
44ENABLE_UPNP = NO
45BEHIND_NAT = NO
46ALLOW_NAT = NO
47INTERNAL_ADDRESS = 127.0.0.1
48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
50
51[dns]
52AUTOSTART = NO
53
54 7
8[datastore]
9AUTOSTART = YES
55 10
56[nse] 11[fs]
57AUTOSTART = NO 12AUTOSTART = YES
58 13
14[mesh]
15AUTOSTART = YES
59 16
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6AUTOSTART = NO 6NUM_PEERS = 1000
7PORT = 0 7TOPOLOGY = NONE
8 8F2F = NO
9[transport] 9BLACKLIST_TOPOLOGY = NONE
10PORT = 0 10CONNECT_TOPOLOGY = RING
11PLUGINS = tcp
12#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
13#PREFIX = valgrind --tool=massif
14 11
15[topology] 12[transport-tcp]
16PORT = 0 13BINDTO = 127.0.0.1
17 14
18[arm] 15[arm]
19PORT = 0 16PORT = 0
20DEFAULTSERVICES =
21 17
22[statistics] 18[statistics]
23AUTOSTART = NO 19AUTOSTART = NO
24PORT = 0 20PORT = 0
25 21
26[transport-tcp] 22[resolver]
27PORT = 2568 23AUTOSTART = NO
28BINDTO = 127.0.0.1 24PORT = 0
29 25
30[peerinfo] 26[peerinfo]
31PORT = 0 27PORT = 0
32 28
33[core] 29[transport]
34PORT = 0 30PORT = 0
35 31
36[hostlist] 32[core]
37PORT = 0 33PORT = 0
38 34
39[fs] 35[topology]
40PORT = 0 36PORT = 0
41 37
42[testing] 38[hostlist]
43NUM_PEERS = 1000 39PORT = 0
44WEAKRANDOM = YES
45TOPOLOGY = NONE
46F2F = NO
47BLACKLIST_TOPOLOGY = NONE
48CONNECT_TOPOLOGY = RING
49#CONNECT_TOPOLOGY = 2D_TORUS
50#CONNECT_TOPOLOGY = CLIQUE
51#CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
52#CONNECT_TOPOLOGY_OPTION_MODIFIER = 20
53#DEBUG = YES
54HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
55
56[dht]
57AUTOSTART = NO
58
59[nat]
60DISABLEV6 = YES
61ENABLE_UPNP = NO
62BEHIND_NAT = NO
63ALLOW_NAT = NO
64INTERNAL_ADDRESS = 127.0.0.1
65EXTERNAL_ADDRESS = 127.0.0.1
66USE_LOCALADDR = NO
67
68[dns]
69AUTOSTART = NO
70
71 40
41[datastore]
42AUTOSTART = YES
72 43
73[nse] 44[fs]
74AUTOSTART = NO 45AUTOSTART = YES
46PORT = 0
75 47
48[mesh]
49AUTOSTART = YES
76 50
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#PREFIX = valgrind --tool=memcheck --log-file=logs%p
13#DEBUG = YES
14
15[arm]
16PORT = 2566
17DEFAULTSERVICES =
18
19[statistics]
20PORT = 2567
21
22[transport-tcp]
23PORT = 2568
24
25[peerinfo]
26PORT = 2569
27
28[core]
29PORT = 2570
30#DEBUG = YES
31
32[testing]
33NUM_PEERS = 5
34WEAKRANDOM = YES
35TOPOLOGY = RING 6TOPOLOGY = RING
36F2F = YES
37HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
38
39[dht]
40AUTOSTART = NO
41
42[nat]
43DISABLEV6 = YES
44ENABLE_UPNP = NO
45BEHIND_NAT = NO
46ALLOW_NAT = NO
47INTERNAL_ADDRESS = 127.0.0.1
48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
50
51[dns]
52AUTOSTART = NO
53
54 7
8[datastore]
9AUTOSTART = YES
55 10
56[nse] 11[fs]
57AUTOSTART = NO 12AUTOSTART = YES
58 13
14[mesh]
15AUTOSTART = YES
59 16
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_scale_free.conf 3DEFAULTCONFIG = test_testing_data_topology_scale_free.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
13#PREFIX = valgrind --tool=memcheck --log-file=logs%p
14#DEBUG = YES
15
16[arm]
17PORT = 2566
18DEFAULTSERVICES = peerinfo transport core
19
20[statistics]
21PORT = 2567
22
23[transport-tcp]
24PORT = 2568
25
26[transport-udp]
27PORT = 2568
28
29[peerinfo]
30PORT = 2569
31#DEBUG = YES
32#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
33#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
34#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
35
36[core]
37PORT = 2570
38#PREFIX = xterm -e xterm -T CORE -e gdb --args
39#PREFIX = valgrind --tool=memcheck --log-file=logs%p
40#DEBUG = YES
41
42[testing]
43NUM_PEERS = 50 6NUM_PEERS = 50
44WEAKRANDOM = YES
45TOPOLOGY = SCALE_FREE 7TOPOLOGY = SCALE_FREE
46F2F = YES
47HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
48
49[dht]
50AUTOSTART = NO
51
52[nat]
53DISABLEV6 = YES
54ENABLE_UPNP = NO
55BEHIND_NAT = NO
56ALLOW_NAT = NO
57INTERNAL_ADDRESS = 127.0.0.1
58EXTERNAL_ADDRESS = 127.0.0.1
59USE_LOCALADDR = NO
60 8
61[dns] 9[transport-udp]
62AUTOSTART = NO 10PORT = 2568
63 11
12[arm]
13DEFAULTSERVICES = peerinfo transport core
64 14
15[datastore]
16AUTOSTART = YES
65 17
66[nse] 18[fs]
67AUTOSTART = NO 19AUTOSTART = YES
68 20
21[mesh]
22AUTOSTART = YES
69 23
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#PREFIX = valgrind --tool=memcheck --log-file=logs%p
13#DEBUG = YES
14
15[arm]
16PORT = 2566
17DEFAULTSERVICES =
18
19[statistics]
20PORT = 2567
21
22[transport-tcp]
23PORT = 2568
24
25[peerinfo]
26PORT = 2569
27
28[core]
29PORT = 2570
30#DEBUG = YES
31
32[testing]
33NUM_PEERS = 25 6NUM_PEERS = 25
34WEAKRANDOM = YES
35TOPOLOGY = SMALL_WORLD_RING 7TOPOLOGY = SMALL_WORLD_RING
36F2F = YES
37HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
38
39[dht]
40AUTOSTART = NO
41
42[nat]
43DISABLEV6 = YES
44ENABLE_UPNP = NO
45BEHIND_NAT = NO
46ALLOW_NAT = NO
47INTERNAL_ADDRESS = 127.0.0.1
48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
50
51[dns]
52AUTOSTART = NO
53
54 8
9[datastore]
10AUTOSTART = YES
55 11
56[nse] 12[fs]
57AUTOSTART = NO 13AUTOSTART = YES
58 14
15[mesh]
16AUTOSTART = YES
59 17
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#PREFIX = valgrind --tool=memcheck --log-file=logs%p
13#DEBUG = YES
14
15[arm]
16PORT = 2566
17DEFAULTSERVICES =
18
19[statistics]
20PORT = 2567
21
22[transport-tcp]
23PORT = 2568
24
25[peerinfo]
26PORT = 2569
27
28[core]
29PORT = 2570
30#DEBUG = YES
31
32[testing]
33NUM_PEERS = 5
34WEAKRANDOM = YES
35TOPOLOGY = SMALL_WORLD 6TOPOLOGY = SMALL_WORLD
36F2F = YES
37HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
38
39[dht]
40AUTOSTART = NO
41
42[nat]
43DISABLEV6 = YES
44ENABLE_UPNP = NO
45BEHIND_NAT = NO
46ALLOW_NAT = NO
47INTERNAL_ADDRESS = 127.0.0.1
48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
50
51[dns]
52AUTOSTART = NO
53
54 7
8[datastore]
9AUTOSTART = YES
55 10
56[nse] 11[fs]
57AUTOSTART = NO 12AUTOSTART = YES
58 13
14[mesh]
15AUTOSTART = YES
59 16
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#PREFIX = xterm -e xterm -T transport -e gdb --args
12#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
13#PREFIX = valgrind --tool=memcheck --log-file=logs%p
14#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p
15#DEBUG = YES
16
17[arm]
18PORT = 2566
19DEFAULTSERVICES =
20
21[statistics]
22PORT = 2567
23
24[transport-tcp]
25PORT = 2568
26
27[transport-udp]
28PORT = 2568
29
30[peerinfo]
31PORT = 2569
32#DEBUG = YES
33#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
34#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
35#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
36
37[core]
38PORT = 2570
39#PREFIX = xterm -e xterm -T CORE -e gdb --args
40#PREFIX = valgrind --tool=memcheck --log-file=logs%p
41#DEBUG = YES
42
43[testing]
44SETTLE_TIME = 600 6SETTLE_TIME = 600
45NUM_PEERS = 2 7NUM_PEERS = 2
46WEAKRANDOM = YES
47#CONNECT_TOPOLOGY = CLIQUE
48TOPOLOGY = CLIQUE 8TOPOLOGY = CLIQUE
49F2F = YES
50#DEBUG = YES
51HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
52
53[dht]
54AUTOSTART = NO
55
56[nat]
57DISABLEV6 = YES
58ENABLE_UPNP = NO
59BEHIND_NAT = NO
60ALLOW_NAT = NO
61INTERNAL_ADDRESS = 127.0.0.1
62EXTERNAL_ADDRESS = 127.0.0.1
63USE_LOCALADDR = NO
64
65[dns]
66AUTOSTART = NO
67 9
10[transport-udp]
11PORT = 2568
68 12
13[datastore]
14AUTOSTART = YES
69 15
70[nse] 16[fs]
71AUTOSTART = NO 17AUTOSTART = YES
72 18
19[mesh]
20AUTOSTART = YES
73 21
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 @@
1@INLINE@ test_testing_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_peergroup_data.conf 3DEFAULTCONFIG = test_testing_peergroup_data.conf
4 4
5[resolver] 5[TESTING]
6PORT = 2564 6CONNECT_ATTEMPTS = 2
7
8[transport]
9PORT = 2565
10PLUGINS = tcp
11#DEBUG = YES
12#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
13#PREFIX = valgrind --tool=memcheck --log-file=logs%p
14
15[arm]
16PORT = 2566
17DEFAULTSERVICES = core
18
19[statistics]
20PORT = 2567
21
22[transport-tcp]
23PORT = 2568
24
25[peerinfo]
26PORT = 2569
27
28[core]
29PORT = 2570
30
31[testing]
32WEAKRANDOM = YES
33HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
34#The following options are REQUIRED for peergroup convenience usage!
35MAX_OUTSTANDING_CONNECTIONS = 20 7MAX_OUTSTANDING_CONNECTIONS = 20
36MAX_CONCURRENT_SSH = 1 8MAX_CONCURRENT_SSH = 1
37CONNECT_ATTEMPTS = 2
38PEERGROUP_TIMEOUT = 300 9PEERGROUP_TIMEOUT = 300
39TOPOLOGY = CLIQUE 10TOPOLOGY = CLIQUE
40PERCENTAGE = 0.5 11PERCENTAGE = 0.5
@@ -46,31 +17,9 @@ BLACKLIST_TOPOLOGY = NONE
46BLACKLIST_TRANSPORTS = tcp udp 17BLACKLIST_TRANSPORTS = tcp udp
47USE_PROGRESSBARS = NO 18USE_PROGRESSBARS = NO
48 19
20[arm]
21DEFAULTSERVICES = core
49 22
50[fs] 23[mesh]
51AUTOSTART = NO 24AUTOSTART = YES
52
53[datastore]
54AUTOSTART = NO
55
56[dht]
57AUTOSTART = NO
58
59[nat]
60DISABLEV6 = YES
61ENABLE_UPNP = NO
62BEHIND_NAT = NO
63ALLOW_NAT = NO
64INTERNAL_ADDRESS = 127.0.0.1
65EXTERNAL_ADDRESS = 127.0.0.1
66USE_LOCALADDR = NO
67
68[dns]
69AUTOSTART = NO
70
71
72
73[nse]
74AUTOSTART = NO
75
76 25
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 16:01:54 +0000