[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22818 - in gnunet/src: ats-test dht dv fs gns integration-
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r22818 - in gnunet/src: ats-test dht dv fs gns integration-tests mesh nse stream testing testing_old topology |
|
Date: |
Sun, 22 Jul 2012 15:47:09 +0200 |
Author: LRN
Date: 2012-07-22 15:47:09 +0200 (Sun, 22 Jul 2012)
New Revision: 22818
Modified:
gnunet/src/ats-test/test_transport_ats_1addr.conf
gnunet/src/ats-test/test_transport_ats_2addr.conf
gnunet/src/ats-test/test_transport_ats_4addr.conf
gnunet/src/dht/test_dht_2dtorus.conf
gnunet/src/dht/test_dht_api_data.conf
gnunet/src/dht/test_dht_line.conf
gnunet/src/dht/test_dht_multipeer_data.conf
gnunet/src/dht/test_dht_twopeer_data.conf
gnunet/src/dv/test_transport_dv_data.conf
gnunet/src/fs/test_fs_defaults.conf
gnunet/src/gns/test_gns_defaults.conf
gnunet/src/gns/test_gns_proxy.conf
gnunet/src/integration-tests/test_connection_stability.conf
gnunet/src/mesh/test_mesh_2dtorus.conf
gnunet/src/mesh/test_mesh_small.conf
gnunet/src/nse/test_nse.conf
gnunet/src/stream/test_stream_local.conf
gnunet/src/testing/test_testing_defaults.conf
gnunet/src/testing_old/test_testing_2dtorus.conf
gnunet/src/testing_old/test_testing_defaults.conf
gnunet/src/testing_old/testing_group.c
gnunet/src/topology/test_gnunet_daemon_topology_data.conf
Log:
Fix hostkey loading for old testing framework
Modified: gnunet/src/ats-test/test_transport_ats_1addr.conf
===================================================================
--- gnunet/src/ats-test/test_transport_ats_1addr.conf 2012-07-22 13:47:00 UTC
(rev 22817)
+++ gnunet/src/ats-test/test_transport_ats_1addr.conf 2012-07-22 13:47:09 UTC
(rev 22818)
@@ -4,7 +4,7 @@
DEFAULTCONFIG = test_testing_data.conf
[TESTING]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[nat]
ALLOW_NAT = NO
Modified: gnunet/src/ats-test/test_transport_ats_2addr.conf
===================================================================
--- gnunet/src/ats-test/test_transport_ats_2addr.conf 2012-07-22 13:47:00 UTC
(rev 22817)
+++ gnunet/src/ats-test/test_transport_ats_2addr.conf 2012-07-22 13:47:09 UTC
(rev 22818)
@@ -4,7 +4,7 @@
DEFAULTCONFIG = test_testing_data.conf
[TESTING]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[transport-udp]
PORT = 2571
Modified: gnunet/src/ats-test/test_transport_ats_4addr.conf
===================================================================
--- gnunet/src/ats-test/test_transport_ats_4addr.conf 2012-07-22 13:47:00 UTC
(rev 22817)
+++ gnunet/src/ats-test/test_transport_ats_4addr.conf 2012-07-22 13:47:09 UTC
(rev 22818)
@@ -4,7 +4,7 @@
DEFAULTCONFIG = test_testing_data.conf
[TESTING]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[nat]
ALLOW_NAT = NO
Modified: gnunet/src/dht/test_dht_2dtorus.conf
===================================================================
--- gnunet/src/dht/test_dht_2dtorus.conf 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/dht/test_dht_2dtorus.conf 2012-07-22 13:47:09 UTC (rev
22818)
@@ -66,7 +66,7 @@
CONNECT_TIMEOUT = 60 s
CONNECT_ATTEMPTS = 3
DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 20
USE_PROGRESSBARS = YES
PEERGROUP_TIMEOUT = 2400 s
Modified: gnunet/src/dht/test_dht_api_data.conf
===================================================================
--- gnunet/src/dht/test_dht_api_data.conf 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/dht/test_dht_api_data.conf 2012-07-22 13:47:09 UTC (rev
22818)
@@ -61,7 +61,7 @@
WEAKRANDOM = NO
[testing_old]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
Modified: gnunet/src/dht/test_dht_line.conf
===================================================================
--- gnunet/src/dht/test_dht_line.conf 2012-07-22 13:47:00 UTC (rev 22817)
+++ gnunet/src/dht/test_dht_line.conf 2012-07-22 13:47:09 UTC (rev 22818)
@@ -66,7 +66,7 @@
CONNECT_TIMEOUT = 60 s
CONNECT_ATTEMPTS = 3
DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 10
USE_PROGRESSBARS = YES
PEERGROUP_TIMEOUT = 2400 s
Modified: gnunet/src/dht/test_dht_multipeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer_data.conf 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/dht/test_dht_multipeer_data.conf 2012-07-22 13:47:09 UTC (rev
22818)
@@ -101,7 +101,7 @@
#LOGNMODIFIER = .65
#PERCENTAGE = .75
NUM_PEERS = 10
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
Modified: gnunet/src/dht/test_dht_twopeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_twopeer_data.conf 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/dht/test_dht_twopeer_data.conf 2012-07-22 13:47:09 UTC (rev
22818)
@@ -48,7 +48,7 @@
[testing_old]
NUM_PEERS = 2
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
Modified: gnunet/src/dv/test_transport_dv_data.conf
===================================================================
--- gnunet/src/dv/test_transport_dv_data.conf 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/dv/test_transport_dv_data.conf 2012-07-22 13:47:09 UTC (rev
22818)
@@ -54,7 +54,7 @@
BLACKLIST_TOPOLOGY = LINE
BLACKLIST_TRANSPORTS = tcp
F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[fs]
AUTOSTART = NO
Modified: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf 2012-07-22 13:47:00 UTC (rev 22817)
+++ gnunet/src/fs/test_fs_defaults.conf 2012-07-22 13:47:09 UTC (rev 22818)
@@ -61,7 +61,7 @@
WEAKRANDOM = YES
[testing_old]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[dhtcache]
QUOTA=65536
Modified: gnunet/src/gns/test_gns_defaults.conf
===================================================================
--- gnunet/src/gns/test_gns_defaults.conf 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/gns/test_gns_defaults.conf 2012-07-22 13:47:09 UTC (rev
22818)
@@ -29,7 +29,7 @@
NUM_PEERS = 5
WEAKRANDOM = YES
F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[dht]
AUTOSTART = NO
Modified: gnunet/src/gns/test_gns_proxy.conf
===================================================================
--- gnunet/src/gns/test_gns_proxy.conf 2012-07-22 13:47:00 UTC (rev 22817)
+++ gnunet/src/gns/test_gns_proxy.conf 2012-07-22 13:47:09 UTC (rev 22818)
@@ -12,7 +12,7 @@
[testing]
WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[gns]
AUTOSTART = YES
Modified: gnunet/src/integration-tests/test_connection_stability.conf
===================================================================
--- gnunet/src/integration-tests/test_connection_stability.conf 2012-07-22
13:47:00 UTC (rev 22817)
+++ gnunet/src/integration-tests/test_connection_stability.conf 2012-07-22
13:47:09 UTC (rev 22818)
@@ -32,7 +32,7 @@
[testing_old]
NUM_PEERS = 5
F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[dht]
AUTOSTART = NO
Modified: gnunet/src/mesh/test_mesh_2dtorus.conf
===================================================================
--- gnunet/src/mesh/test_mesh_2dtorus.conf 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/mesh/test_mesh_2dtorus.conf 2012-07-22 13:47:09 UTC (rev
22818)
@@ -77,7 +77,7 @@
CONNECT_TIMEOUT = 600 s
CONNECT_ATTEMPTS = 2
DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 10
USE_PROGRESSBARS = YES
PEERGROUP_TIMEOUT = 2400 s
Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/mesh/test_mesh_small.conf 2012-07-22 13:47:09 UTC (rev
22818)
@@ -81,7 +81,7 @@
CONNECT_TIMEOUT = 660 s
CONNECT_ATTEMPTS = 2
DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 10
USE_PROGRESSBARS = YES
PEERGROUP_TIMEOUT = 2400 s
Modified: gnunet/src/nse/test_nse.conf
===================================================================
--- gnunet/src/nse/test_nse.conf 2012-07-22 13:47:00 UTC (rev 22817)
+++ gnunet/src/nse/test_nse.conf 2012-07-22 13:47:09 UTC (rev 22818)
@@ -69,7 +69,7 @@
CONNECT_TIMEOUT = 60 s
CONNECT_ATTEMPTS = 3
#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 20
USE_PROGRESSBARS = YES
PEERGROUP_TIMEOUT = 1000 s
Modified: gnunet/src/stream/test_stream_local.conf
===================================================================
--- gnunet/src/stream/test_stream_local.conf 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/stream/test_stream_local.conf 2012-07-22 13:47:09 UTC (rev
22818)
@@ -64,7 +64,7 @@
[testing_old]
NUM_PEERS = 5
DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 10
USE_PROGRESSBARS = YES
PEERGROUP_TIMEOUT = 2400 s
Modified: gnunet/src/testing/test_testing_defaults.conf
===================================================================
--- gnunet/src/testing/test_testing_defaults.conf 2012-07-22 13:47:00 UTC
(rev 22817)
+++ gnunet/src/testing/test_testing_defaults.conf 2012-07-22 13:47:09 UTC
(rev 22818)
@@ -33,7 +33,7 @@
NUM_PEERS = 5
WEAKRANDOM = YES
F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[dht]
AUTOSTART = NO
Modified: gnunet/src/testing_old/test_testing_2dtorus.conf
===================================================================
--- gnunet/src/testing_old/test_testing_2dtorus.conf 2012-07-22 13:47:00 UTC
(rev 22817)
+++ gnunet/src/testing_old/test_testing_2dtorus.conf 2012-07-22 13:47:09 UTC
(rev 22818)
@@ -68,7 +68,7 @@
CONNECT_TIMEOUT = 600 s
CONNECT_ATTEMPTS = 2
DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 10
USE_PROGRESSBARS = YES
PEERGROUP_TIMEOUT = 2400 s
Modified: gnunet/src/testing_old/test_testing_defaults.conf
===================================================================
--- gnunet/src/testing_old/test_testing_defaults.conf 2012-07-22 13:47:00 UTC
(rev 22817)
+++ gnunet/src/testing_old/test_testing_defaults.conf 2012-07-22 13:47:09 UTC
(rev 22818)
@@ -30,7 +30,7 @@
NUM_PEERS = 5
WEAKRANDOM = YES
F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[dht]
AUTOSTART = NO
Modified: gnunet/src/testing_old/testing_group.c
===================================================================
--- gnunet/src/testing_old/testing_group.c 2012-07-22 13:47:00 UTC (rev
22817)
+++ gnunet/src/testing_old/testing_group.c 2012-07-22 13:47:09 UTC (rev
22818)
@@ -5940,9 +5940,26 @@
GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING_OLD",
"HOSTKEYSFILE",
&hostkeys_file))
{
+ /* This is a hack to make old testing able to load keys from datadir,
+ * just as new testing does.
+ * No need to document it, just convert everything to the new testing
+ * framework...
+ */
+ char *DATADIR = "${DATADIR}";
+ size_t ddl = strlen (DATADIR);
+ if (strncmp (hostkeys_file, DATADIR, ddl) == 0)
+ {
+ char *data_dir;
+ char *filename;
+ data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+ GNUNET_asprintf (&filename, "%s%s", data_dir, &hostkeys_file[ddl]);
+ GNUNET_free (data_dir);
+ GNUNET_free (hostkeys_file);
+ hostkeys_file = filename;
+ }
if (GNUNET_YES != GNUNET_DISK_file_test (hostkeys_file))
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Could not read hostkeys file!\n"));
+ _("Could not read hostkeys file `%s'!\n"), hostkeys_file);
else
{
/* Check hostkey file size, read entire thing into memory */
Modified: gnunet/src/topology/test_gnunet_daemon_topology_data.conf
===================================================================
--- gnunet/src/topology/test_gnunet_daemon_topology_data.conf 2012-07-22
13:47:00 UTC (rev 22817)
+++ gnunet/src/topology/test_gnunet_daemon_topology_data.conf 2012-07-22
13:47:09 UTC (rev 22818)
@@ -53,7 +53,7 @@
WEAKRANDOM = YES
[testing_old]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
[dns]
AUTOSTART = NO
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22818 - in gnunet/src: ats-test dht dv fs gns integration-tests mesh nse stream testing testing_old topology,
gnunet <=