From 6637758ccf9d853daa7ffb1383133464f85bdb79 Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Wed, 2 Feb 2011 13:41:16 +0000 Subject: [PATCH] Alter config files to use hostkeys from file instead of generating during testing --- src/dht/test_dht_api_data.conf | 1 + src/dht/test_dht_twopeer_data.conf | 1 + src/dv/test_transport_dv_data.conf | 1 + src/testing/test_testing_data.conf | 1 + src/testing/test_testing_data_remote.conf | 1 + src/testing/test_testing_data_topology_2d_torus.conf | 3 ++- src/testing/test_testing_data_topology_blacklist.conf | 1 + src/testing/test_testing_data_topology_churn.conf | 1 + src/testing/test_testing_data_topology_clique.conf | 1 + src/testing/test_testing_data_topology_clique_dfs.conf | 1 + src/testing/test_testing_data_topology_clique_minimum.conf | 3 ++- src/testing/test_testing_data_topology_clique_random.conf | 1 + src/testing/test_testing_data_topology_erdos_renyi.conf | 1 + src/testing/test_testing_data_topology_internat.conf | 1 + src/testing/test_testing_data_topology_none.conf | 1 + src/testing/test_testing_data_topology_ring.conf | 2 +- src/testing/test_testing_data_topology_scale_free.conf | 1 + src/testing/test_testing_data_topology_small_world_ring.conf | 1 + src/testing/test_testing_data_topology_small_world_torus.conf | 1 + src/testing/test_testing_data_topology_stability.conf | 1 + src/topology/test_gnunet_daemon_topology_data.conf | 1 + 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 [TESTING] WEAKRANDOM = NO +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [gnunetd] 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 [TESTING] WEAKRANDOM = YES NUM_PEERS = 2 +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [gnunetd] 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 BLACKLIST_TOPOLOGY = LINE BLACKLIST_TRANSPORTS = tcp F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [fs] 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 [testing] WEAKRANDOM = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [fs] 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 HOSTFILE = remote_hosts.txt WEAKRANDOM = YES NUM_PEERS = 2 +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 #DEBUG = YES [testing] -NUM_PEERS = 5 +NUM_PEERS = 13 WEAKRANDOM = YES TOPOLOGY = 2D_TORUS F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 BLACKLIST_TOPOLOGY = RING BLACKLIST_TRANSPORTS = tcp udp http F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 [testing] NUM_PEERS = 12 WEAKRANDOM = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 TOPOLOGY = CLIQUE F2F = YES #DEBUG = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 CONNECT_TOPOLOGY_OPTION = CONNECT_DFS CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 TOPOLOGY = CLIQUE CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 -F2F = YES +#F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET CONNECT_TOPOLOGY_OPTION_MODIFIER = .15 F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 WEAKRANDOM = YES TOPOLOGY = ERDOS_RENYI F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 WEAKRANDOM = YES TOPOLOGY = INTERNAT F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 #CONNECT_TOPOLOGY_OPTION = CONNECT_DFS #CONNECT_TOPOLOGY_OPTION_MODIFIER = 20 #DEBUG = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 WEAKRANDOM = YES TOPOLOGY = RING F2F = YES -BLACKLISTING = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 WEAKRANDOM = YES TOPOLOGY = SCALE_FREE F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 WEAKRANDOM = YES TOPOLOGY = SMALL_WORLD_RING F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 WEAKRANDOM = YES TOPOLOGY = SMALL_WORLD F2F = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 TOPOLOGY = CLIQUE F2F = YES #DEBUG = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat [dht] 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 [testing] WEAKRANDOM = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -- 2.25.1