diff options
21 files changed, 23 insertions, 3 deletions
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf index 0fd416704..c6553ea33 100644 --- a/src/dht/test_dht_api_data.conf +++ b/src/dht/test_dht_api_data.conf | |||
@@ -57,6 +57,7 @@ PORT = 2094 | |||
57 | 57 | ||
58 | [TESTING] | 58 | [TESTING] |
59 | WEAKRANDOM = NO | 59 | WEAKRANDOM = NO |
60 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
60 | 61 | ||
61 | [gnunetd] | 62 | [gnunetd] |
62 | HOSTKEY = $SERVICEHOME/.hostkey | 63 | HOSTKEY = $SERVICEHOME/.hostkey |
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf index 5df598d00..491c10c7a 100644 --- a/src/dht/test_dht_twopeer_data.conf +++ b/src/dht/test_dht_twopeer_data.conf | |||
@@ -42,6 +42,7 @@ PORT = 12368 | |||
42 | [TESTING] | 42 | [TESTING] |
43 | WEAKRANDOM = YES | 43 | WEAKRANDOM = YES |
44 | NUM_PEERS = 2 | 44 | NUM_PEERS = 2 |
45 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
45 | 46 | ||
46 | [gnunetd] | 47 | [gnunetd] |
47 | HOSTKEY = $SERVICEHOME/.hostkey | 48 | HOSTKEY = $SERVICEHOME/.hostkey |
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf index 69121e275..17a85167c 100644 --- a/src/dv/test_transport_dv_data.conf +++ b/src/dv/test_transport_dv_data.conf | |||
@@ -55,6 +55,7 @@ CONNECT_TOPOLOGY = LINE | |||
55 | BLACKLIST_TOPOLOGY = LINE | 55 | BLACKLIST_TOPOLOGY = LINE |
56 | BLACKLIST_TRANSPORTS = tcp | 56 | BLACKLIST_TRANSPORTS = tcp |
57 | F2F = YES | 57 | F2F = YES |
58 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
58 | 59 | ||
59 | [fs] | 60 | [fs] |
60 | AUTOSTART = NO | 61 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data.conf b/src/testing/test_testing_data.conf index 5a44f1162..a7a7be4ec 100644 --- a/src/testing/test_testing_data.conf +++ b/src/testing/test_testing_data.conf | |||
@@ -29,6 +29,7 @@ PORT = 2570 | |||
29 | 29 | ||
30 | [testing] | 30 | [testing] |
31 | WEAKRANDOM = YES | 31 | WEAKRANDOM = YES |
32 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
32 | 33 | ||
33 | [fs] | 34 | [fs] |
34 | AUTOSTART = NO | 35 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_remote.conf b/src/testing/test_testing_data_remote.conf index df036c49e..5bc179823 100644 --- a/src/testing/test_testing_data_remote.conf +++ b/src/testing/test_testing_data_remote.conf | |||
@@ -33,6 +33,7 @@ CONTROL_HOST = 131.159.20.42 | |||
33 | HOSTFILE = remote_hosts.txt | 33 | HOSTFILE = remote_hosts.txt |
34 | WEAKRANDOM = YES | 34 | WEAKRANDOM = YES |
35 | NUM_PEERS = 2 | 35 | NUM_PEERS = 2 |
36 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
36 | 37 | ||
37 | [dht] | 38 | [dht] |
38 | AUTOSTART = NO | 39 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf index c1e0c7552..dcc63334e 100644 --- a/src/testing/test_testing_data_topology_2d_torus.conf +++ b/src/testing/test_testing_data_topology_2d_torus.conf | |||
@@ -30,10 +30,11 @@ PORT = 2570 | |||
30 | #DEBUG = YES | 30 | #DEBUG = YES |
31 | 31 | ||
32 | [testing] | 32 | [testing] |
33 | NUM_PEERS = 5 | 33 | NUM_PEERS = 13 |
34 | WEAKRANDOM = YES | 34 | WEAKRANDOM = YES |
35 | TOPOLOGY = 2D_TORUS | 35 | TOPOLOGY = 2D_TORUS |
36 | F2F = YES | 36 | F2F = YES |
37 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
37 | 38 | ||
38 | [dht] | 39 | [dht] |
39 | AUTOSTART = NO | 40 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf index 0e720d256..f970e40a4 100644 --- a/src/testing/test_testing_data_topology_blacklist.conf +++ b/src/testing/test_testing_data_topology_blacklist.conf | |||
@@ -47,6 +47,7 @@ TOPOLOGY = CLIQUE | |||
47 | BLACKLIST_TOPOLOGY = RING | 47 | BLACKLIST_TOPOLOGY = RING |
48 | BLACKLIST_TRANSPORTS = tcp udp http | 48 | BLACKLIST_TRANSPORTS = tcp udp http |
49 | F2F = YES | 49 | F2F = YES |
50 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
50 | 51 | ||
51 | [dht] | 52 | [dht] |
52 | AUTOSTART = NO | 53 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_churn.conf b/src/testing/test_testing_data_topology_churn.conf index 13b7ca54a..650eea729 100644 --- a/src/testing/test_testing_data_topology_churn.conf +++ b/src/testing/test_testing_data_topology_churn.conf | |||
@@ -42,6 +42,7 @@ PORT = 2570 | |||
42 | [testing] | 42 | [testing] |
43 | NUM_PEERS = 12 | 43 | NUM_PEERS = 12 |
44 | WEAKRANDOM = YES | 44 | WEAKRANDOM = YES |
45 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
45 | 46 | ||
46 | [dht] | 47 | [dht] |
47 | AUTOSTART = NO | 48 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf index 7858d7661..b3c8de91e 100644 --- a/src/testing/test_testing_data_topology_clique.conf +++ b/src/testing/test_testing_data_topology_clique.conf | |||
@@ -47,6 +47,7 @@ WEAKRANDOM = YES | |||
47 | TOPOLOGY = CLIQUE | 47 | TOPOLOGY = CLIQUE |
48 | F2F = YES | 48 | F2F = YES |
49 | #DEBUG = YES | 49 | #DEBUG = YES |
50 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
50 | 51 | ||
51 | [dht] | 52 | [dht] |
52 | AUTOSTART = NO | 53 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing/test_testing_data_topology_clique_dfs.conf index 0a304e1a2..a088803b3 100644 --- a/src/testing/test_testing_data_topology_clique_dfs.conf +++ b/src/testing/test_testing_data_topology_clique_dfs.conf | |||
@@ -46,6 +46,7 @@ TOPOLOGY = CLIQUE | |||
46 | CONNECT_TOPOLOGY_OPTION = CONNECT_DFS | 46 | CONNECT_TOPOLOGY_OPTION = CONNECT_DFS |
47 | CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 | 47 | CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 |
48 | F2F = YES | 48 | F2F = YES |
49 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
49 | 50 | ||
50 | [dht] | 51 | [dht] |
51 | AUTOSTART = NO | 52 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf index 1215b2ab7..d6904d619 100644 --- a/src/testing/test_testing_data_topology_clique_minimum.conf +++ b/src/testing/test_testing_data_topology_clique_minimum.conf | |||
@@ -45,7 +45,8 @@ WEAKRANDOM = YES | |||
45 | TOPOLOGY = CLIQUE | 45 | TOPOLOGY = CLIQUE |
46 | CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM | 46 | CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM |
47 | CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 | 47 | CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 |
48 | F2F = YES | 48 | #F2F = YES |
49 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
49 | 50 | ||
50 | [dht] | 51 | [dht] |
51 | AUTOSTART = NO | 52 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing/test_testing_data_topology_clique_random.conf index f1de99829..0630d0ae7 100644 --- a/src/testing/test_testing_data_topology_clique_random.conf +++ b/src/testing/test_testing_data_topology_clique_random.conf | |||
@@ -48,6 +48,7 @@ TOPOLOGY = CLIQUE | |||
48 | CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET | 48 | CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET |
49 | CONNECT_TOPOLOGY_OPTION_MODIFIER = .15 | 49 | CONNECT_TOPOLOGY_OPTION_MODIFIER = .15 |
50 | F2F = YES | 50 | F2F = YES |
51 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
51 | 52 | ||
52 | [dht] | 53 | [dht] |
53 | AUTOSTART = NO | 54 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing/test_testing_data_topology_erdos_renyi.conf index 15bc54dd9..81e385239 100644 --- a/src/testing/test_testing_data_topology_erdos_renyi.conf +++ b/src/testing/test_testing_data_topology_erdos_renyi.conf | |||
@@ -34,6 +34,7 @@ NUM_PEERS = 5 | |||
34 | WEAKRANDOM = YES | 34 | WEAKRANDOM = YES |
35 | TOPOLOGY = ERDOS_RENYI | 35 | TOPOLOGY = ERDOS_RENYI |
36 | F2F = YES | 36 | F2F = YES |
37 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
37 | 38 | ||
38 | [dht] | 39 | [dht] |
39 | AUTOSTART = NO | 40 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf index e4382f802..460f25a66 100644 --- a/src/testing/test_testing_data_topology_internat.conf +++ b/src/testing/test_testing_data_topology_internat.conf | |||
@@ -34,6 +34,7 @@ NUM_PEERS = 5 | |||
34 | WEAKRANDOM = YES | 34 | WEAKRANDOM = YES |
35 | TOPOLOGY = INTERNAT | 35 | TOPOLOGY = INTERNAT |
36 | F2F = YES | 36 | F2F = YES |
37 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
37 | 38 | ||
38 | [dht] | 39 | [dht] |
39 | AUTOSTART = NO | 40 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf index 6a2d023dc..6ef4c3697 100644 --- a/src/testing/test_testing_data_topology_none.conf +++ b/src/testing/test_testing_data_topology_none.conf | |||
@@ -51,6 +51,7 @@ CONNECT_TOPOLOGY = RING | |||
51 | #CONNECT_TOPOLOGY_OPTION = CONNECT_DFS | 51 | #CONNECT_TOPOLOGY_OPTION = CONNECT_DFS |
52 | #CONNECT_TOPOLOGY_OPTION_MODIFIER = 20 | 52 | #CONNECT_TOPOLOGY_OPTION_MODIFIER = 20 |
53 | #DEBUG = YES | 53 | #DEBUG = YES |
54 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
54 | 55 | ||
55 | [dht] | 56 | [dht] |
56 | AUTOSTART = NO | 57 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf index 759745011..2405125af 100644 --- a/src/testing/test_testing_data_topology_ring.conf +++ b/src/testing/test_testing_data_topology_ring.conf | |||
@@ -34,7 +34,7 @@ NUM_PEERS = 5 | |||
34 | WEAKRANDOM = YES | 34 | WEAKRANDOM = YES |
35 | TOPOLOGY = RING | 35 | TOPOLOGY = RING |
36 | F2F = YES | 36 | F2F = YES |
37 | BLACKLISTING = YES | 37 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat |
38 | 38 | ||
39 | [dht] | 39 | [dht] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing/test_testing_data_topology_scale_free.conf index 1a104b88b..b55aad8b2 100644 --- a/src/testing/test_testing_data_topology_scale_free.conf +++ b/src/testing/test_testing_data_topology_scale_free.conf | |||
@@ -44,6 +44,7 @@ NUM_PEERS = 50 | |||
44 | WEAKRANDOM = YES | 44 | WEAKRANDOM = YES |
45 | TOPOLOGY = SCALE_FREE | 45 | TOPOLOGY = SCALE_FREE |
46 | F2F = YES | 46 | F2F = YES |
47 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
47 | 48 | ||
48 | [dht] | 49 | [dht] |
49 | AUTOSTART = NO | 50 | AUTOSTART = NO |
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 bf7208970..162b14c0b 100644 --- a/src/testing/test_testing_data_topology_small_world_ring.conf +++ b/src/testing/test_testing_data_topology_small_world_ring.conf | |||
@@ -34,6 +34,7 @@ NUM_PEERS = 25 | |||
34 | WEAKRANDOM = YES | 34 | WEAKRANDOM = YES |
35 | TOPOLOGY = SMALL_WORLD_RING | 35 | TOPOLOGY = SMALL_WORLD_RING |
36 | F2F = YES | 36 | F2F = YES |
37 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
37 | 38 | ||
38 | [dht] | 39 | [dht] |
39 | AUTOSTART = NO | 40 | AUTOSTART = NO |
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 b19fba607..b52fa0cdb 100644 --- a/src/testing/test_testing_data_topology_small_world_torus.conf +++ b/src/testing/test_testing_data_topology_small_world_torus.conf | |||
@@ -34,6 +34,7 @@ NUM_PEERS = 5 | |||
34 | WEAKRANDOM = YES | 34 | WEAKRANDOM = YES |
35 | TOPOLOGY = SMALL_WORLD | 35 | TOPOLOGY = SMALL_WORLD |
36 | F2F = YES | 36 | F2F = YES |
37 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
37 | 38 | ||
38 | [dht] | 39 | [dht] |
39 | AUTOSTART = NO | 40 | AUTOSTART = NO |
diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf index 47e0a18df..9976e0f74 100644 --- a/src/testing/test_testing_data_topology_stability.conf +++ b/src/testing/test_testing_data_topology_stability.conf | |||
@@ -48,6 +48,7 @@ WEAKRANDOM = YES | |||
48 | TOPOLOGY = CLIQUE | 48 | TOPOLOGY = CLIQUE |
49 | F2F = YES | 49 | F2F = YES |
50 | #DEBUG = YES | 50 | #DEBUG = YES |
51 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
51 | 52 | ||
52 | [dht] | 53 | [dht] |
53 | AUTOSTART = NO | 54 | AUTOSTART = NO |
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf index 2fa569890..758bbb3b2 100644 --- a/src/topology/test_gnunet_daemon_topology_data.conf +++ b/src/topology/test_gnunet_daemon_topology_data.conf | |||
@@ -41,3 +41,4 @@ AUTOSTART = NO | |||
41 | 41 | ||
42 | [testing] | 42 | [testing] |
43 | WEAKRANDOM = YES | 43 | WEAKRANDOM = YES |
44 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||