projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1cbbc66
)
Alter config files to use hostkeys from file instead of generating during testing
author
Nathan S. Evans
<evans@in.tum.de>
Wed, 2 Feb 2011 13:41:16 +0000
(13:41 +0000)
committer
Nathan S. Evans
<evans@in.tum.de>
Wed, 2 Feb 2011 13:41:16 +0000
(13:41 +0000)
21 files changed:
src/dht/test_dht_api_data.conf
patch
|
blob
|
history
src/dht/test_dht_twopeer_data.conf
patch
|
blob
|
history
src/dv/test_transport_dv_data.conf
patch
|
blob
|
history
src/testing/test_testing_data.conf
patch
|
blob
|
history
src/testing/test_testing_data_remote.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_2d_torus.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_blacklist.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_churn.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_clique.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_clique_dfs.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_clique_minimum.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_clique_random.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_erdos_renyi.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_internat.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_none.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_ring.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_scale_free.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_small_world_ring.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_small_world_torus.conf
patch
|
blob
|
history
src/testing/test_testing_data_topology_stability.conf
patch
|
blob
|
history
src/topology/test_gnunet_daemon_topology_data.conf
patch
|
blob
|
history
diff --git
a/src/dht/test_dht_api_data.conf
b/src/dht/test_dht_api_data.conf
index 0fd416704d41efcb062562015cd20a7366f743b5..c6553ea33e5371a038cccb52bec0b352adeeaf37 100644
(file)
--- 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
[TESTING]
WEAKRANDOM = NO
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
diff --git
a/src/dht/test_dht_twopeer_data.conf
b/src/dht/test_dht_twopeer_data.conf
index 5df598d005ae262e624560bec732163877dd51ac..491c10c7aa0e19676b211f29125ee576cd988fc8 100644
(file)
--- 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
[TESTING]
WEAKRANDOM = YES
NUM_PEERS = 2
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
diff --git
a/src/dv/test_transport_dv_data.conf
b/src/dv/test_transport_dv_data.conf
index 69121e27596002f4c3057d2398919b119b38778c..17a85167cfec4423e9ae3dec42e8d1ab190b6c2e 100644
(file)
--- 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
BLACKLIST_TOPOLOGY = LINE
BLACKLIST_TRANSPORTS = tcp
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[fs]
AUTOSTART = NO
[fs]
AUTOSTART = NO
diff --git
a/src/testing/test_testing_data.conf
b/src/testing/test_testing_data.conf
index 5a44f1162b92bdd642618ccfe32de19d30410eb0..a7a7be4ecac4319175dd43b8d93e1f3d6da61cdc 100644
(file)
--- a/
src/testing/test_testing_data.conf
+++ b/
src/testing/test_testing_data.conf
@@
-29,6
+29,7
@@
PORT = 2570
[testing]
WEAKRANDOM = YES
[testing]
WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[fs]
AUTOSTART = NO
[fs]
AUTOSTART = NO
diff --git
a/src/testing/test_testing_data_remote.conf
b/src/testing/test_testing_data_remote.conf
index df036c49eff84b5999d5e936be799bf149ac45a9..5bc179823b599d614a242521c52e67b2b45bee99 100644
(file)
--- 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
HOSTFILE = remote_hosts.txt
WEAKRANDOM = YES
NUM_PEERS = 2
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[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 c1e0c7552cef900e5f571cc9a695a0e801a91c70..dcc63334e3087bc7adfea92d193b741fd58fa621 100644
(file)
--- 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]
#DEBUG = YES
[testing]
-NUM_PEERS =
5
+NUM_PEERS =
13
WEAKRANDOM = YES
TOPOLOGY = 2D_TORUS
F2F = YES
WEAKRANDOM = YES
TOPOLOGY = 2D_TORUS
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
diff --git
a/src/testing/test_testing_data_topology_blacklist.conf
b/src/testing/test_testing_data_topology_blacklist.conf
index 0e720d2562620a4ae8588fe7391e8a79d0075348..f970e40a41323bb2e50da368ba549e5097e9f0f3 100644
(file)
--- 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
BLACKLIST_TOPOLOGY = RING
BLACKLIST_TRANSPORTS = tcp udp http
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
diff --git
a/src/testing/test_testing_data_topology_churn.conf
b/src/testing/test_testing_data_topology_churn.conf
index 13b7ca54ab19ceef5681bc446109145d4a151693..650eea729bc994f238a278f3c8a91172ab2a6c31 100644
(file)
--- 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
[testing]
NUM_PEERS = 12
WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
diff --git
a/src/testing/test_testing_data_topology_clique.conf
b/src/testing/test_testing_data_topology_clique.conf
index 7858d76618f2bc273fca3c977abf5f7758e6615a..b3c8de91eab225e69721fa8d4aa5f575496a4412 100644
(file)
--- 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
TOPOLOGY = CLIQUE
F2F = YES
#DEBUG = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[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 0a304e1a2299997f2265e408e7f8a64a1ca83969..a088803b3de0a8b363da94210c0372b896b9bc83 100644
(file)
--- 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
CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[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 1215b2ab7f860efb8d96b924ab30d9ba4ac2d33d..d6904d6197c68a92cfbbc29a5a17d4eeb0dbebe0 100644
(file)
--- 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
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
[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 f1de99829ae8f2cf75b42b44804c6ad34434dcae..0630d0ae779bcd94fd34beb172d085cf26ffddf0 100644
(file)
--- 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
CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
CONNECT_TOPOLOGY_OPTION_MODIFIER = .15
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[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 15bc54dd912901671a5eba4297ff1f00fcf0fc09..81e385239a749a6c34d50b235862b965ad4bb084 100644
(file)
--- 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
WEAKRANDOM = YES
TOPOLOGY = ERDOS_RENYI
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
diff --git
a/src/testing/test_testing_data_topology_internat.conf
b/src/testing/test_testing_data_topology_internat.conf
index e4382f8021960ab3fa47522973df3f7026181103..460f25a668e95688b2700e61a0c3f9fa8f7e3cfb 100644
(file)
--- 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
WEAKRANDOM = YES
TOPOLOGY = INTERNAT
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
diff --git
a/src/testing/test_testing_data_topology_none.conf
b/src/testing/test_testing_data_topology_none.conf
index 6a2d023dc4af8f436e3f25abd07c141aaf49eb21..6ef4c3697b9095cc70291a4ba98c6bce5e368404 100644
(file)
--- 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
#CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
#CONNECT_TOPOLOGY_OPTION_MODIFIER = 20
#DEBUG = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
diff --git
a/src/testing/test_testing_data_topology_ring.conf
b/src/testing/test_testing_data_topology_ring.conf
index 7597450113ff04a6cf22e2bfbbc505219e56454c..2405125af5dd6c1189ef8cbaf65695accc7c43a2 100644
(file)
--- 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
WEAKRANDOM = YES
TOPOLOGY = RING
F2F = YES
-BLACKLISTING = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[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 1a104b88b27352942e66768efeb9bce1c26a4497..b55aad8b20440925c13aaa73f710b76084120ffe 100644
(file)
--- 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
WEAKRANDOM = YES
TOPOLOGY = SCALE_FREE
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[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 bf72089704bb627b3d9b2e27df3e585db6061960..162b14c0b2a0b5fd9cb465bf2b3755238c50d2f2 100644
(file)
--- 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
WEAKRANDOM = YES
TOPOLOGY = SMALL_WORLD_RING
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[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 b19fba607627aecbb6915eebb078a6891b66c525..b52fa0cdbfc86ef6a14db019869303a91247c756 100644
(file)
--- 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
WEAKRANDOM = YES
TOPOLOGY = SMALL_WORLD
F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
diff --git
a/src/testing/test_testing_data_topology_stability.conf
b/src/testing/test_testing_data_topology_stability.conf
index 47e0a18df8ad7998d0eb6a9ca4f6b4c42ef6aa12..9976e0f74ab671db1bd0bac5d63591efdcc3662d 100644
(file)
--- 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
TOPOLOGY = CLIQUE
F2F = YES
#DEBUG = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
diff --git
a/src/topology/test_gnunet_daemon_topology_data.conf
b/src/topology/test_gnunet_daemon_topology_data.conf
index 2fa5698901b1295db3ac8734d97d608b6516629f..758bbb3b2c76d182169e76c324e4fa6ddbb4ce2c 100644
(file)
--- 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
[testing]
WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat