gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r14316 - in gnunet/src: dht dv testing topology


From: gnunet
Subject: [GNUnet-SVN] r14316 - in gnunet/src: dht dv testing topology
Date: Wed, 2 Feb 2011 14:41:16 +0100

Author: nevans
Date: 2011-02-02 14:41:16 +0100 (Wed, 02 Feb 2011)
New Revision: 14316

Modified:
   gnunet/src/dht/test_dht_api_data.conf
   gnunet/src/dht/test_dht_twopeer_data.conf
   gnunet/src/dv/test_transport_dv_data.conf
   gnunet/src/testing/test_testing_data.conf
   gnunet/src/testing/test_testing_data_remote.conf
   gnunet/src/testing/test_testing_data_topology_2d_torus.conf
   gnunet/src/testing/test_testing_data_topology_blacklist.conf
   gnunet/src/testing/test_testing_data_topology_churn.conf
   gnunet/src/testing/test_testing_data_topology_clique.conf
   gnunet/src/testing/test_testing_data_topology_clique_dfs.conf
   gnunet/src/testing/test_testing_data_topology_clique_minimum.conf
   gnunet/src/testing/test_testing_data_topology_clique_random.conf
   gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf
   gnunet/src/testing/test_testing_data_topology_internat.conf
   gnunet/src/testing/test_testing_data_topology_none.conf
   gnunet/src/testing/test_testing_data_topology_ring.conf
   gnunet/src/testing/test_testing_data_topology_scale_free.conf
   gnunet/src/testing/test_testing_data_topology_small_world_ring.conf
   gnunet/src/testing/test_testing_data_topology_small_world_torus.conf
   gnunet/src/testing/test_testing_data_topology_stability.conf
   gnunet/src/topology/test_gnunet_daemon_topology_data.conf
Log:
Alter config files to use hostkeys from file instead of generating during 
testing

Modified: gnunet/src/dht/test_dht_api_data.conf
===================================================================
--- gnunet/src/dht/test_dht_api_data.conf       2011-02-02 13:01:41 UTC (rev 
14315)
+++ gnunet/src/dht/test_dht_api_data.conf       2011-02-02 13:41:16 UTC (rev 
14316)
@@ -57,6 +57,7 @@
 
 [TESTING]
 WEAKRANDOM = NO
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey

Modified: gnunet/src/dht/test_dht_twopeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_twopeer_data.conf   2011-02-02 13:01:41 UTC (rev 
14315)
+++ gnunet/src/dht/test_dht_twopeer_data.conf   2011-02-02 13:41:16 UTC (rev 
14316)
@@ -42,6 +42,7 @@
 [TESTING]
 WEAKRANDOM = YES
 NUM_PEERS = 2
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey

Modified: gnunet/src/dv/test_transport_dv_data.conf
===================================================================
--- gnunet/src/dv/test_transport_dv_data.conf   2011-02-02 13:01:41 UTC (rev 
14315)
+++ gnunet/src/dv/test_transport_dv_data.conf   2011-02-02 13:41:16 UTC (rev 
14316)
@@ -55,6 +55,7 @@
 BLACKLIST_TOPOLOGY = LINE
 BLACKLIST_TRANSPORTS = tcp
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [fs]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data.conf
===================================================================
--- gnunet/src/testing/test_testing_data.conf   2011-02-02 13:01:41 UTC (rev 
14315)
+++ gnunet/src/testing/test_testing_data.conf   2011-02-02 13:41:16 UTC (rev 
14316)
@@ -29,6 +29,7 @@
 
 [testing]
 WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [fs]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_remote.conf
===================================================================
--- gnunet/src/testing/test_testing_data_remote.conf    2011-02-02 13:01:41 UTC 
(rev 14315)
+++ gnunet/src/testing/test_testing_data_remote.conf    2011-02-02 13:41:16 UTC 
(rev 14316)
@@ -33,6 +33,7 @@
 HOSTFILE = remote_hosts.txt
 WEAKRANDOM = YES
 NUM_PEERS = 2
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_2d_torus.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_2d_torus.conf 2011-02-02 
13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_2d_torus.conf 2011-02-02 
13:41:16 UTC (rev 14316)
@@ -30,10 +30,11 @@
 #DEBUG = YES
 
 [testing]
-NUM_PEERS = 5
+NUM_PEERS = 13
 WEAKRANDOM = YES
 TOPOLOGY = 2D_TORUS
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_blacklist.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_blacklist.conf        
2011-02-02 13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_blacklist.conf        
2011-02-02 13:41:16 UTC (rev 14316)
@@ -47,6 +47,7 @@
 BLACKLIST_TOPOLOGY = RING
 BLACKLIST_TRANSPORTS = tcp udp http
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_churn.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_churn.conf    2011-02-02 
13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_churn.conf    2011-02-02 
13:41:16 UTC (rev 14316)
@@ -42,6 +42,7 @@
 [testing]
 NUM_PEERS = 12
 WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_clique.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique.conf   2011-02-02 
13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_clique.conf   2011-02-02 
13:41:16 UTC (rev 14316)
@@ -47,6 +47,7 @@
 TOPOLOGY = CLIQUE
 F2F = YES
 #DEBUG = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_clique_dfs.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_dfs.conf       
2011-02-02 13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_clique_dfs.conf       
2011-02-02 13:41:16 UTC (rev 14316)
@@ -46,6 +46,7 @@
 CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
 CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_clique_minimum.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_minimum.conf   
2011-02-02 13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_clique_minimum.conf   
2011-02-02 13:41:16 UTC (rev 14316)
@@ -45,7 +45,8 @@
 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

Modified: gnunet/src/testing/test_testing_data_topology_clique_random.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_random.conf    
2011-02-02 13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_clique_random.conf    
2011-02-02 13:41:16 UTC (rev 14316)
@@ -48,6 +48,7 @@
 CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
 CONNECT_TOPOLOGY_OPTION_MODIFIER = .15
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf      
2011-02-02 13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf      
2011-02-02 13:41:16 UTC (rev 14316)
@@ -34,6 +34,7 @@
 WEAKRANDOM = YES
 TOPOLOGY = ERDOS_RENYI
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_internat.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_internat.conf 2011-02-02 
13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_internat.conf 2011-02-02 
13:41:16 UTC (rev 14316)
@@ -34,6 +34,7 @@
 WEAKRANDOM = YES
 TOPOLOGY = INTERNAT
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_none.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_none.conf     2011-02-02 
13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_none.conf     2011-02-02 
13:41:16 UTC (rev 14316)
@@ -51,6 +51,7 @@
 #CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
 #CONNECT_TOPOLOGY_OPTION_MODIFIER = 20
 #DEBUG = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_ring.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_ring.conf     2011-02-02 
13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_ring.conf     2011-02-02 
13:41:16 UTC (rev 14316)
@@ -34,7 +34,7 @@
 WEAKRANDOM = YES
 TOPOLOGY = RING
 F2F = YES
-BLACKLISTING = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_scale_free.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_scale_free.conf       
2011-02-02 13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_scale_free.conf       
2011-02-02 13:41:16 UTC (rev 14316)
@@ -44,6 +44,7 @@
 WEAKRANDOM = YES
 TOPOLOGY = SCALE_FREE
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_small_world_ring.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_small_world_ring.conf 
2011-02-02 13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_small_world_ring.conf 
2011-02-02 13:41:16 UTC (rev 14316)
@@ -34,6 +34,7 @@
 WEAKRANDOM = YES
 TOPOLOGY = SMALL_WORLD_RING
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_small_world_torus.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_small_world_torus.conf        
2011-02-02 13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_small_world_torus.conf        
2011-02-02 13:41:16 UTC (rev 14316)
@@ -34,6 +34,7 @@
 WEAKRANDOM = YES
 TOPOLOGY = SMALL_WORLD
 F2F = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/testing/test_testing_data_topology_stability.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_stability.conf        
2011-02-02 13:01:41 UTC (rev 14315)
+++ gnunet/src/testing/test_testing_data_topology_stability.conf        
2011-02-02 13:41:16 UTC (rev 14316)
@@ -48,6 +48,7 @@
 TOPOLOGY = CLIQUE
 F2F = YES
 #DEBUG = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/topology/test_gnunet_daemon_topology_data.conf
===================================================================
--- gnunet/src/topology/test_gnunet_daemon_topology_data.conf   2011-02-02 
13:01:41 UTC (rev 14315)
+++ gnunet/src/topology/test_gnunet_daemon_topology_data.conf   2011-02-02 
13:41:16 UTC (rev 14316)
@@ -41,3 +41,4 @@
 
 [testing]
 WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat




reply via email to

[Prev in Thread] Current Thread [Next in Thread]