diff options
Diffstat (limited to 'src')
217 files changed, 305 insertions, 283 deletions
diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf index 1f1ac282f..d8354477e 100644 --- a/src/arm/test_arm_api_data.conf +++ b/src/arm/test_arm_api_data.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunetd-arm/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunetd-arm/ |
3 | 3 | ||
4 | [arm] | 4 | [arm] |
5 | PORT = 23354 | 5 | PORT = 23354 |
diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf index 8a1b6a14f..9a0fa1e93 100644 --- a/src/ats/test_ats_api.conf +++ b/src/ats/test_ats_api.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-ats-api-scheduling/ | 2 | GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/ |
3 | 3 | ||
4 | [arm] | 4 | [arm] |
5 | PORT = 12001 | 5 | PORT = 12001 |
diff --git a/src/ats/test_ats_mlp.conf b/src/ats/test_ats_mlp.conf index 05e444f09..d6c1541c8 100644 --- a/src/ats/test_ats_mlp.conf +++ b/src/ats/test_ats_mlp.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-ats-api-scheduling/ | 2 | GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/ |
3 | 3 | ||
4 | [arm] | 4 | [arm] |
5 | PORT = 12001 | 5 | PORT = 12001 |
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf index 0c494c8ad..d461f9460 100644 --- a/src/core/test_core_api_peer1.conf +++ b/src/core/test_core_api_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-peer-1/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-1/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12460 | 6 | PORT = 12460 |
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf index a72989b4b..436846f5c 100644 --- a/src/core/test_core_api_peer2.conf +++ b/src/core/test_core_api_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-peer-2/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-2/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 22460 | 6 | PORT = 22460 |
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf index 8df557226..971d68cd0 100644 --- a/src/core/test_core_api_send_to_self.conf +++ b/src/core/test_core_api_send_to_self.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = ~/.gnunet/ | 3 | GNUNET_TEST_HOME = ~/.gnunet/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 2425 | 6 | PORT = 2425 |
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf index df08d9619..b690ba151 100644 --- a/src/core/test_core_defaults.conf +++ b/src/core/test_core_defaults.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-core/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-core/ |
3 | 3 | ||
4 | [arm] | 4 | [arm] |
5 | DEFAULTSERVICES = | 5 | DEFAULTSERVICES = |
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf index f5fc63579..ba0257d34 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12488 | 6 | PORT = 12488 |
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf index 95a2e6c4e..9f4527a2f 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/ |
4 | 4 | ||
5 | 5 | ||
6 | [arm] | 6 | [arm] |
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf index 0ed10b706..268b8fc00 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12488 | 6 | PORT = 12488 |
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf index 119e6688a..721f5c268 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 22486 | 6 | PORT = 22486 |
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf index d8ae5189a..c62b4607c 100644 --- a/src/core/test_core_quota_peer1.conf +++ b/src/core/test_core_quota_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12468 | 6 | PORT = 12468 |
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf index cf1870f88..452eef63e 100644 --- a/src/core/test_core_quota_peer2.conf +++ b/src/core/test_core_quota_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-2/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 22476 | 6 | PORT = 22476 |
diff --git a/src/datastore/perf_plugin_datastore_data_heap.conf b/src/datastore/perf_plugin_datastore_data_heap.conf index 7ee215c0a..6f9c701ba 100644 --- a/src/datastore/perf_plugin_datastore_data_heap.conf +++ b/src/datastore/perf_plugin_datastore_data_heap.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/perf-gnunet-datastore-heap/ | 3 | GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-heap/ |
4 | 4 | ||
5 | 5 | ||
6 | [datastore] | 6 | [datastore] |
diff --git a/src/datastore/perf_plugin_datastore_data_mysql.conf b/src/datastore/perf_plugin_datastore_data_mysql.conf index 006b146af..9d7330462 100644 --- a/src/datastore/perf_plugin_datastore_data_mysql.conf +++ b/src/datastore/perf_plugin_datastore_data_mysql.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/ | 3 | GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-mysql/ |
4 | 4 | ||
5 | [datastore] | 5 | [datastore] |
6 | DATABASE = mysql | 6 | DATABASE = mysql |
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf b/src/datastore/perf_plugin_datastore_data_postgres.conf index 052fa486e..ee7c180dc 100644 --- a/src/datastore/perf_plugin_datastore_data_postgres.conf +++ b/src/datastore/perf_plugin_datastore_data_postgres.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/ | 3 | GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-postgres/ |
4 | 4 | ||
5 | [datastore] | 5 | [datastore] |
6 | DATABASE = postgres | 6 | DATABASE = postgres |
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf b/src/datastore/perf_plugin_datastore_data_sqlite.conf index 5f97597d6..756b44c5c 100644 --- a/src/datastore/perf_plugin_datastore_data_sqlite.conf +++ b/src/datastore/perf_plugin_datastore_data_sqlite.conf | |||
@@ -1,4 +1,4 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/ | 3 | GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-sqlite/ |
4 | 4 | ||
diff --git a/src/datastore/test_datastore_api_data_heap.conf b/src/datastore/test_datastore_api_data_heap.conf index 0e6994d5b..db571c12a 100644 --- a/src/datastore/test_datastore_api_data_heap.conf +++ b/src/datastore/test_datastore_api_data_heap.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-heap/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-heap/ |
4 | 4 | ||
5 | [TESTING] | 5 | [TESTING] |
6 | WEAKRANDOM = YES | 6 | WEAKRANDOM = YES |
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf index 92967b976..38b9058f6 100644 --- a/src/datastore/test_datastore_api_data_mysql.conf +++ b/src/datastore/test_datastore_api_data_mysql.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-mysql/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-mysql/ |
4 | 4 | ||
5 | [TESTING] | 5 | [TESTING] |
6 | WEAKRANDOM = YES | 6 | WEAKRANDOM = YES |
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf index a1a21689b..dbce6e4d0 100644 --- a/src/datastore/test_datastore_api_data_postgres.conf +++ b/src/datastore/test_datastore_api_data_postgres.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-postgres/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-postgres/ |
4 | 4 | ||
5 | [TESTING] | 5 | [TESTING] |
6 | WEAKRANDOM = YES | 6 | WEAKRANDOM = YES |
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf index 953aef248..3104ed7df 100644 --- a/src/datastore/test_datastore_api_data_sqlite.conf +++ b/src/datastore/test_datastore_api_data_sqlite.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-sqlite/ |
4 | 4 | ||
5 | [TESTING] | 5 | [TESTING] |
6 | WEAKRANDOM = YES | 6 | WEAKRANDOM = YES |
diff --git a/src/datastore/test_plugin_datastore_data_heap.conf b/src/datastore/test_plugin_datastore_data_heap.conf index 6e352b95b..c91bff764 100644 --- a/src/datastore/test_plugin_datastore_data_heap.conf +++ b/src/datastore/test_plugin_datastore_data_heap.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-heap/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-heap/ |
4 | 4 | ||
5 | [datastore] | 5 | [datastore] |
6 | DATABASE = heap | 6 | DATABASE = heap |
diff --git a/src/datastore/test_plugin_datastore_data_mysql.conf b/src/datastore/test_plugin_datastore_data_mysql.conf index 845454b12..53a188997 100644 --- a/src/datastore/test_plugin_datastore_data_mysql.conf +++ b/src/datastore/test_plugin_datastore_data_mysql.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-mysql/ |
4 | 4 | ||
5 | [datastore] | 5 | [datastore] |
6 | DATABASE = mysql | 6 | DATABASE = mysql |
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf b/src/datastore/test_plugin_datastore_data_postgres.conf index 8b8523d40..bebc97e85 100644 --- a/src/datastore/test_plugin_datastore_data_postgres.conf +++ b/src/datastore/test_plugin_datastore_data_postgres.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-postgres/ |
4 | 4 | ||
5 | [datastore] | 5 | [datastore] |
6 | DATABASE = postgres | 6 | DATABASE = postgres |
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf b/src/datastore/test_plugin_datastore_data_sqlite.conf index dcdea7dde..9680dff8e 100644 --- a/src/datastore/test_plugin_datastore_data_sqlite.conf +++ b/src/datastore/test_plugin_datastore_data_sqlite.conf | |||
@@ -1,4 +1,4 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-sqlite/ |
4 | 4 | ||
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf index 63a80c542..aaa46319c 100644 --- a/src/dht/test_dht_2dtorus.conf +++ b/src/dht/test_dht_2dtorus.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test_dht_2dtorus/ | 2 | GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/ |
3 | 3 | ||
4 | [arm] | 4 | [arm] |
5 | DEFAULTSERVICES = core dht | 5 | DEFAULTSERVICES = core dht |
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf index 8529dce1e..30bf3534b 100644 --- a/src/dht/test_dht_api_data.conf +++ b/src/dht/test_dht_api_data.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-dht-api/ | 2 | GNUNET_TEST_HOME = /tmp/test-dht-api/ |
3 | 3 | ||
4 | [fs] | 4 | [fs] |
5 | AUTOSTART = NO | 5 | AUTOSTART = NO |
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf index 8f2aa9f6e..43eac0956 100644 --- a/src/dht/test_dht_api_peer1.conf +++ b/src/dht/test_dht_api_peer1.conf | |||
@@ -40,7 +40,7 @@ PORT = 12368 | |||
40 | BINDTO = 127.0.0.1 | 40 | BINDTO = 127.0.0.1 |
41 | 41 | ||
42 | [PATHS] | 42 | [PATHS] |
43 | SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/ | 43 | GNUNET_TEST_HOME = /tmp/test-gnunetd-dht-peer-1/ |
44 | 44 | ||
45 | [nat] | 45 | [nat] |
46 | DISABLEV6 = YES | 46 | DISABLEV6 = YES |
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf index 1e2aa702d..f8646ca2b 100644 --- a/src/dht/test_dht_line.conf +++ b/src/dht/test_dht_line.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test_dht_line/ | 2 | GNUNET_TEST_HOME = /tmp/test_dht_line/ |
3 | [dhtcache] | 3 | [dhtcache] |
4 | QUOTA = 1 MB | 4 | QUOTA = 1 MB |
5 | DATABASE = heap | 5 | DATABASE = heap |
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf index 2b8ef5bde..7ba9f8381 100644 --- a/src/dht/test_dht_monitor.conf +++ b/src/dht/test_dht_monitor.conf | |||
@@ -22,7 +22,7 @@ DEFAULTSERVICES = dht core | |||
22 | OVERLAY_TOPOLOGY = LINE | 22 | OVERLAY_TOPOLOGY = LINE |
23 | 23 | ||
24 | [PATHS] | 24 | [PATHS] |
25 | SERVICEHOME = /tmp/test-dht-monitor/ | 25 | GNUNET_TEST_HOME = /tmp/test-dht-monitor/ |
26 | 26 | ||
27 | [nat] | 27 | [nat] |
28 | DISABLEV6 = YES | 28 | DISABLEV6 = YES |
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf index 1d8389a9e..f8abaec23 100644 --- a/src/dht/test_dht_multipeer.conf +++ b/src/dht/test_dht_multipeer.conf | |||
@@ -26,10 +26,10 @@ OVERLAY_TOPOLOGY = FROM_FILE | |||
26 | OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat | 26 | OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat |
27 | 27 | ||
28 | [gnunetd] | 28 | [gnunetd] |
29 | HOSTKEY = $SERVICEHOME/.hostkey | 29 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
30 | 30 | ||
31 | [PATHS] | 31 | [PATHS] |
32 | SERVICEHOME = /tmp/test-dht-multipeer/ | 32 | GNUNET_TEST_HOME = /tmp/test-dht-multipeer/ |
33 | 33 | ||
34 | [nat] | 34 | [nat] |
35 | DISABLEV6 = YES | 35 | DISABLEV6 = YES |
diff --git a/src/dv/template_dv.conf b/src/dv/template_dv.conf index 69f5ca4f2..723e4a1cf 100644 --- a/src/dv/template_dv.conf +++ b/src/dv/template_dv.conf | |||
@@ -34,7 +34,7 @@ OF84RAOAU2B1SOSEHJH6350MA0F7C98U55RI76LGIQOM7O33TFHPNUFB47CDBSCOLIINMVJ2U82445AB | |||
34 | [transport-blacklist-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O] | 34 | [transport-blacklist-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O] |
35 | 35 | ||
36 | [PATHS] | 36 | [PATHS] |
37 | SERVICEHOME = /tmp/test-gnunet-dv-testing/ | 37 | GNUNET_TEST_HOME = /tmp/test-gnunet-dv-testing/ |
38 | 38 | ||
39 | [peerinfo] | 39 | [peerinfo] |
40 | USE_INCLUDED_HELLOS = NO | 40 | USE_INCLUDED_HELLOS = NO |
diff --git a/src/experimentation/test_experimentation_clique.conf b/src/experimentation/test_experimentation_clique.conf index bc6a34dcc..646753ef6 100644 --- a/src/experimentation/test_experimentation_clique.conf +++ b/src/experimentation/test_experimentation_clique.conf | |||
@@ -54,7 +54,7 @@ TIMEOUT = 300 s | |||
54 | PORT = 12368 | 54 | PORT = 12368 |
55 | 55 | ||
56 | [PATHS] | 56 | [PATHS] |
57 | SERVICEHOME = /tmp/test-experimentation/ | 57 | GNUNET_TEST_HOME = /tmp/test-experimentation/ |
58 | 58 | ||
59 | [dns] | 59 | [dns] |
60 | AUTOSTART = NO | 60 | AUTOSTART = NO |
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf index 89b89aa76..155c38269 100644 --- a/src/fs/fs_test_lib_data.conf +++ b/src/fs/fs_test_lib_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-fs-test-lib/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-fs-test-lib/ |
4 | 4 | ||
5 | [ats] | 5 | [ats] |
6 | WAN_QUOTA_IN = 3932160 | 6 | WAN_QUOTA_IN = 3932160 |
diff --git a/src/fs/perf_gnunet_service_fs_p2p.conf b/src/fs/perf_gnunet_service_fs_p2p.conf index c9e472eee..7c93eee42 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.conf +++ b/src/fs/perf_gnunet_service_fs_p2p.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ fs_test_lib_data.conf | 1 | @INLINE@ fs_test_lib_data.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-fs-test-lib/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-fs-test-lib/ |
4 | 4 | ||
5 | [fs] | 5 | [fs] |
6 | GAUGER_HEAP = "2-peer 10 MB P2P download" | 6 | GAUGER_HEAP = "2-peer 10 MB P2P download" |
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf index 40e85ad4c..a9e5e779c 100644 --- a/src/fs/test_fs_data.conf +++ b/src/fs/test_fs_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-data/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-data/ |
4 | 4 | ||
5 | [fs] | 5 | [fs] |
6 | ACTIVEMIGRATION = NO | 6 | ACTIVEMIGRATION = NO |
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf index 0f26895b6..2e980daab 100644 --- a/src/fs/test_fs_defaults.conf +++ b/src/fs/test_fs_defaults.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-lib/ | 2 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-lib/ |
3 | 3 | ||
4 | [resolver] | 4 | [resolver] |
5 | PORT = 4364 | 5 | PORT = 4364 |
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf index 694926afc..cb0f8ede1 100644 --- a/src/fs/test_fs_download_data.conf +++ b/src/fs/test_fs_download_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-download/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/ |
4 | 4 | ||
5 | [download-test] | 5 | [download-test] |
6 | # set to 'YES' to test non-anonymous download | 6 | # set to 'YES' to test non-anonymous download |
diff --git a/src/fs/test_fs_download_indexed.conf b/src/fs/test_fs_download_indexed.conf index 61954c137..153cb17b2 100644 --- a/src/fs/test_fs_download_indexed.conf +++ b/src/fs/test_fs_download_indexed.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-download/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/ |
4 | 4 | ||
5 | [download-test] | 5 | [download-test] |
6 | # set to 'YES' to test non-anonymous download | 6 | # set to 'YES' to test non-anonymous download |
diff --git a/src/fs/test_fs_download_mesh.conf b/src/fs/test_fs_download_mesh.conf index 3ee0b4152..da61f5ce9 100644 --- a/src/fs/test_fs_download_mesh.conf +++ b/src/fs/test_fs_download_mesh.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-download/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/ |
4 | 4 | ||
5 | [download-test] | 5 | [download-test] |
6 | # set to 'YES' to test non-anonymous download | 6 | # set to 'YES' to test non-anonymous download |
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf index ea43807b1..e053116c5 100644 --- a/src/fs/test_fs_file_information_data.conf +++ b/src/fs/test_fs_file_information_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-file-information/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-file-information/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf index 99d446680..c6e6af8f0 100644 --- a/src/fs/test_fs_list_indexed_data.conf +++ b/src/fs/test_fs_list_indexed_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-list-indexed/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf index 625eb2d51..0e6c3c947 100644 --- a/src/fs/test_fs_namespace_data.conf +++ b/src/fs/test_fs_namespace_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-namespace/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-namespace/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf index 14e69197b..2c87ea43e 100644 --- a/src/fs/test_fs_publish_data.conf +++ b/src/fs/test_fs_publish_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-publish/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-publish/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf index 812a7bfe2..88424189e 100644 --- a/src/fs/test_fs_search_data.conf +++ b/src/fs/test_fs_search_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-search/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-search/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf index fa28fbbbd..0bcc89df8 100644 --- a/src/fs/test_fs_unindex_data.conf +++ b/src/fs/test_fs_unindex_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-unindex/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-unindex/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_uri_data.conf b/src/fs/test_fs_uri_data.conf index abc5a73e9..5355fbc85 100644 --- a/src/fs/test_fs_uri_data.conf +++ b/src/fs/test_fs_uri_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-uri/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-uri/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | DEFAULTSERVICES = topology hostlist | 6 | DEFAULTSERVICES = topology hostlist |
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf index 4394805e5..2038fd500 100644 --- a/src/fs/test_gnunet_fs_idx_data.conf +++ b/src/fs/test_gnunet_fs_idx_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-py-idx/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-idx/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf index e41f6bfe3..84e498603 100644 --- a/src/fs/test_gnunet_fs_psd_data.conf +++ b/src/fs/test_gnunet_fs_psd_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-py-psd/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-psd/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf index fcdcda96d..10af5cefd 100644 --- a/src/fs/test_gnunet_fs_rec_data.conf +++ b/src/fs/test_gnunet_fs_rec_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-py-rec/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-rec/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf index 3d740e49a..b231c0d3e 100644 --- a/src/fs/test_gnunet_service_fs_migration_data.conf +++ b/src/fs/test_gnunet_service_fs_migration_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-service-fs-migration/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-service-fs-migration/ |
4 | 4 | ||
5 | [testbed] | 5 | [testbed] |
6 | OVERLAY_TOPOLOGY = CLIQUE | 6 | OVERLAY_TOPOLOGY = CLIQUE |
diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf index 2652b98a3..769952cc8 100644 --- a/src/gns/test_gns_defaults.conf +++ b/src/gns/test_gns_defaults.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-gns-testing/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-gns-testing/ |
3 | 3 | ||
4 | [dhtcache] | 4 | [dhtcache] |
5 | DATABASE = heap | 5 | DATABASE = heap |
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf index 94042a5e9..5d77e157a 100644 --- a/src/gns/test_gns_lookup.conf +++ b/src/gns/test_gns_lookup.conf | |||
@@ -9,7 +9,7 @@ PLUGINS = | |||
9 | DEFAULTSERVICES = | 9 | DEFAULTSERVICES = |
10 | 10 | ||
11 | [PATHS] | 11 | [PATHS] |
12 | SERVICEHOME = /tmp/test-gnunet-gns-peer-1/ | 12 | GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/ |
13 | 13 | ||
14 | [gns] | 14 | [gns] |
15 | #PREFIX = valgrind --leak-check=full --track-origins=yes | 15 | #PREFIX = valgrind --leak-check=full --track-origins=yes |
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf index b098edb60..547e5580b 100644 --- a/src/gns/test_gns_proxy.conf +++ b/src/gns/test_gns_proxy.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-gns-proxy/ | 2 | GNUNET_TEST_HOME = /tmp/gnunet-test-gns-proxy/ |
3 | 3 | ||
4 | [transport] | 4 | [transport] |
5 | PLUGINS = tcp | 5 | PLUGINS = tcp |
@@ -15,7 +15,7 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat | |||
15 | 15 | ||
16 | [gns] | 16 | [gns] |
17 | AUTOSTART = YES | 17 | AUTOSTART = YES |
18 | ZONEKEY = $SERVICEHOME/.hostkey | 18 | ZONEKEY = $GNUNET_TEST_HOME/.hostkey |
19 | HIJACK_DNS = YES | 19 | HIJACK_DNS = YES |
20 | 20 | ||
21 | [gns-proxy] | 21 | [gns-proxy] |
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf index c7f9f7132..5830c427b 100644 --- a/src/gns/test_gns_simple_lookup.conf +++ b/src/gns/test_gns_simple_lookup.conf | |||
@@ -42,7 +42,7 @@ PORT = 12368 | |||
42 | BINDTO = 127.0.0.1 | 42 | BINDTO = 127.0.0.1 |
43 | 43 | ||
44 | [PATHS] | 44 | [PATHS] |
45 | SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/ | 45 | GNUNET_TEST_HOME = /tmp/test-gnunetd-gns-peer-1/ |
46 | 46 | ||
47 | 47 | ||
48 | [nat] | 48 | [nat] |
@@ -67,7 +67,7 @@ PRIVATE_ZONE = private | |||
67 | PRIVATE_ZONEKEY = zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey | 67 | PRIVATE_ZONEKEY = zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey |
68 | SHORTEN_ZONE = short | 68 | SHORTEN_ZONE = short |
69 | SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey | 69 | SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey |
70 | #ZONEKEY = $SERVICEHOME/gns/zonekey.zkey | 70 | #ZONEKEY = $GNUNET_TEST_HOME/gns/zonekey.zkey |
71 | HIJACK_DNS = NO | 71 | HIJACK_DNS = NO |
72 | UNIXPATH = /tmp/gnunet-service-gns.sock | 72 | UNIXPATH = /tmp/gnunet-service-gns.sock |
73 | AUTO_IMPORT_PKEY = YES | 73 | AUTO_IMPORT_PKEY = YES |
@@ -92,7 +92,7 @@ BINARY = gnunet-service-namestore | |||
92 | ACCEPT_FROM = 127.0.0.1; | 92 | ACCEPT_FROM = 127.0.0.1; |
93 | ACCEPT_FROM6 = ::1; | 93 | ACCEPT_FROM6 = ::1; |
94 | DATABASE = sqlite | 94 | DATABASE = sqlite |
95 | ZONEFILE_DIRECTORY = $SERVICEHOME | 95 | ZONEFILE_DIRECTORY = $GNUNET_TEST_HOME |
96 | 96 | ||
97 | [namestore-sqlite] | 97 | [namestore-sqlite] |
98 | FILENAME = $SERVICEHOME/sqlite-default.db | 98 | FILENAME = $GNUNET_TEST_HOME/sqlite-default.db |
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf index 40e7c7f7e..3c1bfa563 100644 --- a/src/hostlist/hostlist.conf +++ b/src/hostlist/hostlist.conf | |||
@@ -1,14 +1,14 @@ | |||
1 | [hostlist] | 1 | [hostlist] |
2 | # port for hostlist http server | 2 | # port for hostlist http server |
3 | HTTPPORT = 8080 | 3 | HTTPPORT = 8080 |
4 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 4 | HOSTLISTFILE = $GNUNET_CONFIG_HOME/hostlist/learned.txt |
5 | BINARY = gnunet-daemon-hostlist | 5 | BINARY = gnunet-daemon-hostlist |
6 | # consider having "-e" as default as well once implemented | 6 | # consider having "-e" as default as well once implemented |
7 | OPTIONS = -b | 7 | OPTIONS = -b |
8 | SERVERS = http://v10.gnunet.org/hostlist | 8 | SERVERS = http://v10.gnunet.org/hostlist |
9 | # http://ioerror.gnunet.org:65535/ | 9 | # http://ioerror.gnunet.org:65535/ |
10 | # proxy for downloading hostlists | 10 | # proxy for downloading hostlists |
11 | HTTP-PROXY = | 11 | HTTP-PROXY = |
12 | # bind hostlist http server to a specific IPv4 or IPv6 | 12 | # bind hostlist http server to a specific IPv4 or IPv6 |
13 | # BINDTOIP = | 13 | # BINDTOIP = |
14 | 14 | ||
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf index 0a345f6bf..377ba4a41 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12968 | 6 | PORT = 12968 |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf index c3833381a..547a9e2ff 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 22968 | 6 | PORT = 22968 |
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf index a11097b8c..93308b4bd 100644 --- a/src/hostlist/test_hostlist_defaults.conf +++ b/src/hostlist/test_hostlist_defaults.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-hostlist/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/ |
3 | 3 | ||
4 | [resolver] | 4 | [resolver] |
5 | PORT = 12464 | 5 | PORT = 12464 |
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf index b08660a33..f65ba0ae5 100644 --- a/src/hostlist/test_learning_adv_peer.conf +++ b/src/hostlist/test_learning_adv_peer.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 22968 | 6 | PORT = 22968 |
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf index 95de70530..db1a397f3 100644 --- a/src/hostlist/test_learning_learn_peer.conf +++ b/src/hostlist/test_learning_learn_peer.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12968 | 6 | PORT = 12968 |
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf index f70fbda5f..57cca3343 100644 --- a/src/hostlist/test_learning_learn_peer2.conf +++ b/src/hostlist/test_learning_learn_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-3/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 32968 | 6 | PORT = 32968 |
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index 40653542e..08b08762d 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | 3 | ||
4 | [PATHS] | 4 | [PATHS] |
5 | SERVICEHOME = /tmp/c_bootstrap_server/ | 5 | GNUNET_TEST_HOME = /tmp/c_bootstrap_server/ |
6 | 6 | ||
7 | [PEER] | 7 | [PEER] |
8 | PRIVATE_KEY = hostkeys/c_bootstrap_server | 8 | PRIVATE_KEY = hostkeys/c_bootstrap_server |
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index cee8b98cc..5f42f22e1 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf | |||
@@ -50,7 +50,7 @@ UNIXPATH = /tmp/test-service-peerinfo-52 | |||
50 | PORT = 20067 | 50 | PORT = 20067 |
51 | 51 | ||
52 | [PATHS] | 52 | [PATHS] |
53 | SERVICEHOME = /tmp/c_nat_client | 53 | GNUNET_TEST_HOME = /tmp/c_nat_client |
54 | 54 | ||
55 | [PEER] | 55 | [PEER] |
56 | PRIVATE_KEY = hostkeys/c_nat_client | 56 | PRIVATE_KEY = hostkeys/c_nat_client |
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index f254bcdd8..87daeb41d 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf | |||
@@ -1,7 +1,7 @@ | |||
1 | @INLINE@ confs/test_defaults.conf | 1 | @INLINE@ confs/test_defaults.conf |
2 | 2 | ||
3 | [PATHS] | 3 | [PATHS] |
4 | SERVICEHOME = /tmp/c_no_nat_client/ | 4 | GNUNET_TEST_HOME = /tmp/c_no_nat_client/ |
5 | 5 | ||
6 | [PEER] | 6 | [PEER] |
7 | PRIVATE_KEY = hostkeys/c_no_nat_client | 7 | PRIVATE_KEY = hostkeys/c_no_nat_client |
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf index d399079e1..46f0ddd24 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf | |||
@@ -73,7 +73,7 @@ UNIXPATH = /tmp/test-service-statistics-30 | |||
73 | PORT = 20037 | 73 | PORT = 20037 |
74 | 74 | ||
75 | [PATHS] | 75 | [PATHS] |
76 | SERVICEHOME = /tmp/c_no_nat_client_2/ | 76 | GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/ |
77 | DEFAULTCONFIG = c_no_nat_client_2.conf | 77 | DEFAULTCONFIG = c_no_nat_client_2.conf |
78 | 78 | ||
79 | [PEER] | 79 | [PEER] |
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf index d720b7ecd..67ed37ea6 100644 --- a/src/integration-tests/confs/c_no_nat_client_http.conf +++ b/src/integration-tests/confs/c_no_nat_client_http.conf | |||
@@ -74,7 +74,7 @@ UNIXPATH = /tmp/test-service-statistics-16 | |||
74 | PORT = 20019 | 74 | PORT = 20019 |
75 | 75 | ||
76 | [PATHS] | 76 | [PATHS] |
77 | SERVICEHOME = /tmp/c_no_nat_client/ | 77 | GNUNET_TEST_HOME = /tmp/c_no_nat_client/ |
78 | DEFAULTCONFIG = c_no_nat_client_http.conf | 78 | DEFAULTCONFIG = c_no_nat_client_http.conf |
79 | 79 | ||
80 | [template] | 80 | [template] |
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf index 0e4abd3d0..a581d7f02 100644 --- a/src/integration-tests/confs/c_no_nat_client_http_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf | |||
@@ -76,7 +76,7 @@ UNIXPATH = /tmp/test-service-statistics-30 | |||
76 | PORT = 20037 | 76 | PORT = 20037 |
77 | 77 | ||
78 | [PATHS] | 78 | [PATHS] |
79 | SERVICEHOME = /tmp/c_no_nat_client_2/ | 79 | GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/ |
80 | DEFAULTCONFIG = c_no_nat_client_http_2.conf | 80 | DEFAULTCONFIG = c_no_nat_client_http_2.conf |
81 | 81 | ||
82 | [template] | 82 | [template] |
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf index bd6208ed3..c1129b519 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix.conf | |||
@@ -79,7 +79,7 @@ UNIXPATH = /tmp/test-service-statistics-16 | |||
79 | PORT = 20019 | 79 | PORT = 20019 |
80 | 80 | ||
81 | [PATHS] | 81 | [PATHS] |
82 | SERVICEHOME = /tmp/c_no_nat_client/ | 82 | GNUNET_TEST_HOME = /tmp/c_no_nat_client/ |
83 | DEFAULTCONFIG = c_no_nat_client_unix.conf | 83 | DEFAULTCONFIG = c_no_nat_client_unix.conf |
84 | 84 | ||
85 | [template] | 85 | [template] |
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf index 724f4fb7e..f4d91d336 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf | |||
@@ -76,7 +76,7 @@ UNIXPATH = /tmp/test-service-statistics-30 | |||
76 | PORT = 20037 | 76 | PORT = 20037 |
77 | 77 | ||
78 | [PATHS] | 78 | [PATHS] |
79 | SERVICEHOME = /tmp/c_no_nat_client_2/ | 79 | GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/ |
80 | DEFAULTCONFIG = c_no_nat_client_unix_2.conf | 80 | DEFAULTCONFIG = c_no_nat_client_unix_2.conf |
81 | 81 | ||
82 | [template] | 82 | [template] |
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf index 204e7ffd2..ca8d684cc 100644 --- a/src/integration-tests/confs/c_normal_client_tcp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp.conf | |||
@@ -45,7 +45,7 @@ USE_INCLUDED_HELLOS = YES | |||
45 | PORT = 20067 | 45 | PORT = 20067 |
46 | 46 | ||
47 | [PATHS] | 47 | [PATHS] |
48 | SERVICEHOME = /tmp/c_normal_client | 48 | GNUNET_TEST_HOME = /tmp/c_normal_client |
49 | 49 | ||
50 | [nse] | 50 | [nse] |
51 | UNIXPATH = /tmp/test-service-nse-54 | 51 | UNIXPATH = /tmp/test-service-nse-54 |
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf index 6abaf5917..5aaf8ee51 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf | |||
@@ -49,7 +49,7 @@ USE_INCLUDED_HELLOS = YES | |||
49 | PORT = 20067 | 49 | PORT = 20067 |
50 | 50 | ||
51 | [PATHS] | 51 | [PATHS] |
52 | SERVICEHOME = /tmp/c_normal_client | 52 | GNUNET_TEST_HOME = /tmp/c_normal_client |
53 | 53 | ||
54 | [nse] | 54 | [nse] |
55 | UNIXPATH = /tmp/test-service-nse-54 | 55 | UNIXPATH = /tmp/test-service-nse-54 |
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf index 8b3b2b663..7b01fc9a3 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf | |||
@@ -52,7 +52,7 @@ USE_INCLUDED_HELLOS = YES | |||
52 | PORT = 20067 | 52 | PORT = 20067 |
53 | 53 | ||
54 | [PATHS] | 54 | [PATHS] |
55 | SERVICEHOME = /tmp/c_normal_client | 55 | GNUNET_TEST_HOME = /tmp/c_normal_client |
56 | 56 | ||
57 | [nse] | 57 | [nse] |
58 | UNIXPATH = /tmp/test-service-nse-54 | 58 | UNIXPATH = /tmp/test-service-nse-54 |
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf index 7da40e583..b1f3c33be 100644 --- a/src/integration-tests/confs/test_defaults.conf +++ b/src/integration-tests/confs/test_defaults.conf | |||
@@ -30,7 +30,7 @@ PORT = 20070 | |||
30 | [datastore] | 30 | [datastore] |
31 | UNIX_MATCH_UID = YES | 31 | UNIX_MATCH_UID = YES |
32 | QUOTA = 100 MB | 32 | QUOTA = 100 MB |
33 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 33 | BLOOMFILTER = $GNUNET_TEST_HOME/fs/bloomfilter |
34 | 34 | ||
35 | [dhtcache] | 35 | [dhtcache] |
36 | DATABASE = sqlite | 36 | DATABASE = sqlite |
@@ -47,11 +47,11 @@ INTERNAL_ADDRESS = 127.0.0.1 | |||
47 | BINDTO = 127.0.0.1 | 47 | BINDTO = 127.0.0.1 |
48 | 48 | ||
49 | [fs] | 49 | [fs] |
50 | INDEXDB = $SERVICEHOME/idxinfo.lst | 50 | INDEXDB = $GNUNET_TEST_HOME/idxinfo.lst |
51 | IDENTITY_DIR = $SERVICEHOME/identities/ | 51 | IDENTITY_DIR = $GNUNET_TEST_HOME/identities/ |
52 | STATE_DIR = $SERVICEHOME/persistence/ | 52 | STATE_DIR = $GNUNET_TEST_HOME/persistence/ |
53 | UPDATE_DIR = $SERVICEHOME/updates/ | 53 | UPDATE_DIR = $GNUNET_TEST_HOME/updates/ |
54 | TRUST = $SERVICEHOME/data/credit/ | 54 | TRUST = $GNUNET_TEST_HOME/data/credit/ |
55 | 55 | ||
56 | [transport] | 56 | [transport] |
57 | PLUGINS = tcp | 57 | PLUGINS = tcp |
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf index 2bb87a828..7d04cd97d 100644 --- a/src/mesh/test_mesh.conf +++ b/src/mesh/test_mesh.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-mesh/ | 2 | GNUNET_TEST_HOME = /tmp/test-mesh/ |
3 | 3 | ||
4 | [mesh] | 4 | [mesh] |
5 | BINARY = gnunet-service-mesh-enc | 5 | BINARY = gnunet-service-mesh-enc |
diff --git a/src/mesh/test_mesh_drop.conf b/src/mesh/test_mesh_drop.conf index fb6c52475..16d4f7637 100644 --- a/src/mesh/test_mesh_drop.conf +++ b/src/mesh/test_mesh_drop.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-mesh/ | 2 | GNUNET_TEST_HOME = /tmp/test-mesh/ |
3 | 3 | ||
4 | [mesh] | 4 | [mesh] |
5 | #BINARY = gnunet-service-mesh | 5 | #BINARY = gnunet-service-mesh |
diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf index 68f972e25..41670cdb1 100644 --- a/src/namestore/test_namestore_api.conf +++ b/src/namestore/test_namestore_api.conf | |||
@@ -8,7 +8,7 @@ AUTOSTART = YES | |||
8 | DATABASE = sqlite | 8 | DATABASE = sqlite |
9 | 9 | ||
10 | [namestore-sqlite] | 10 | [namestore-sqlite] |
11 | FILENAME = $SERVICEHOME/namestore/sqlite_test.db | 11 | FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db |
12 | 12 | ||
13 | [namestore-postgres] | 13 | [namestore-postgres] |
14 | CONFIG = connect_timeout=10; dbname=gnunetcheck | 14 | CONFIG = connect_timeout=10; dbname=gnunetcheck |
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf index 03467d1e6..9722828ac 100644 --- a/src/nat/test_nat_data.conf +++ b/src/nat/test_nat_data.conf | |||
@@ -1,11 +1,11 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/nat-test | 2 | GNUNET_TEST_HOME = /tmp/nat-test |
3 | # SERVICEHOME = /var/lib/gnunet/ | 3 | # GNUNET_TEST_HOME = /var/lib/gnunet/ |
4 | # configuration file is assumed to be the default, | 4 | # configuration file is assumed to be the default, |
5 | # which is what we want by default... | 5 | # which is what we want by default... |
6 | 6 | ||
7 | [gnunetd] | 7 | [gnunetd] |
8 | HOSTKEY = $SERVICEHOME/.hostkey | 8 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
9 | 9 | ||
10 | [TESTING] | 10 | [TESTING] |
11 | WEAKRANDOM = NO | 11 | WEAKRANDOM = NO |
@@ -54,7 +54,7 @@ DEFAULTSERVICES = topology hostlist | |||
54 | UNIXPATH = /tmp/gnunet-service-arm.sock | 54 | UNIXPATH = /tmp/gnunet-service-arm.sock |
55 | UNIX_MATCH_UID = YES | 55 | UNIX_MATCH_UID = YES |
56 | UNIX_MATCH_GID = YES | 56 | UNIX_MATCH_GID = YES |
57 | # GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs | 57 | # GLOBAL_POSTFIX = -l $GNUNET_TEST_HOME/{}-logs |
58 | # GLOBAL_PREFIX = | 58 | # GLOBAL_PREFIX = |
59 | # USERNAME = | 59 | # USERNAME = |
60 | # MAXBUF = | 60 | # MAXBUF = |
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf index b30240c57..161af6c48 100644 --- a/src/nat/test_nat_test_data.conf +++ b/src/nat/test_nat_test_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/nat-test | 2 | GNUNET_TEST_HOME = /tmp/nat-test |
3 | # SERVICEHOME = /var/lib/gnunet/ | 3 | # GNUNET_TEST_HOME = /var/lib/gnunet/ |
4 | # configuration file is assumed to be the default, | 4 | # configuration file is assumed to be the default, |
5 | # which is what we want by default... | 5 | # which is what we want by default... |
6 | 6 | ||
diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf index aeda85a75..caf68396d 100644 --- a/src/nse/nse_infiniband.conf +++ b/src/nse/nse_infiniband.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/nse-profiler/ | 2 | GNUNET_TEST_HOME = /tmp/nse-profiler/ |
3 | 3 | ||
4 | [testbed] | 4 | [testbed] |
5 | AUTOSTART = NO | 5 | AUTOSTART = NO |
@@ -25,7 +25,7 @@ AUTOSTART = NO | |||
25 | WORKDELAY = 60 s | 25 | WORKDELAY = 60 s |
26 | INTERVAL = 10 s | 26 | INTERVAL = 10 s |
27 | WORKBITS = 0 | 27 | WORKBITS = 0 |
28 | PROOFFILE = $SERVICEHOME/nse.proof | 28 | PROOFFILE = $GNUNET_TEST_HOME/nse.proof |
29 | HISTOGRAM_DIR = /home/totakura/nse/test/histograms | 29 | HISTOGRAM_DIR = /home/totakura/nse/test/histograms |
30 | 30 | ||
31 | [arm] | 31 | [arm] |
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf index db4f637dc..134fe64c4 100644 --- a/src/nse/nse_profiler_test.conf +++ b/src/nse/nse_profiler_test.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/nse-profiler/ | 2 | GNUNET_TEST_HOME = /tmp/nse-profiler/ |
3 | 3 | ||
4 | [testbed] | 4 | [testbed] |
5 | AUTOSTART = NO | 5 | AUTOSTART = NO |
@@ -23,7 +23,7 @@ AUTOSTART = NO | |||
23 | WORKDELAY = 60 s | 23 | WORKDELAY = 60 s |
24 | INTERVAL = 10 s | 24 | INTERVAL = 10 s |
25 | WORKBITS = 0 | 25 | WORKBITS = 0 |
26 | PROOFFILE = $SERVICEHOME/nse.proof | 26 | PROOFFILE = $GNUNET_TEST_HOME/nse.proof |
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | DEFAULTSERVICES = core nse | 29 | DEFAULTSERVICES = core nse |
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf index 5652fa4ea..d8cd2580b 100644 --- a/src/nse/test_nse.conf +++ b/src/nse/test_nse.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-nse-multipeer/ | 2 | GNUNET_TEST_HOME = /tmp/test-nse-multipeer/ |
3 | 3 | ||
4 | [nse] | 4 | [nse] |
5 | PORT = 22353 | 5 | PORT = 22353 |
@@ -8,14 +8,14 @@ BINARY = gnunet-service-nse | |||
8 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse | 8 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse |
9 | #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p | 9 | #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p |
10 | AUTOSTART = YES | 10 | AUTOSTART = YES |
11 | PROOFFILE = $SERVICEHOME/proof.nse | 11 | PROOFFILE = $GNUNET_TEST_HOME/proof.nse |
12 | # Overriding network settings for faster testing (do NOT use | 12 | # Overriding network settings for faster testing (do NOT use |
13 | # these values in production just because they are here) | 13 | # these values in production just because they are here) |
14 | WORKDELAY = 1 ms | 14 | WORKDELAY = 1 ms |
15 | INTERVAL = 60 s | 15 | INTERVAL = 60 s |
16 | WORKBITS = 1 | 16 | WORKBITS = 1 |
17 | 17 | ||
18 | HISTOGRAM = $SERVICEHOME/nse-histogram | 18 | HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram |
19 | 19 | ||
20 | 20 | ||
21 | [arm] | 21 | [arm] |
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf index a4c16ac16..eef151763 100644 --- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf +++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-peerinfo/ | 2 | GNUNET_TEST_HOME = /tmp/gnunet-test-peerinfo/ |
3 | 3 | ||
4 | [gnunetd] | 4 | [gnunetd] |
5 | #HOSTKEY = test_gnunet_peerinfo.hostkey | 5 | #HOSTKEY = test_gnunet_peerinfo.hostkey |
diff --git a/src/peerinfo/test_peerinfo_api_data.conf b/src/peerinfo/test_peerinfo_api_data.conf index ddbd02b5e..e3b37b1ea 100644 --- a/src/peerinfo/test_peerinfo_api_data.conf +++ b/src/peerinfo/test_peerinfo_api_data.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-peerinfo/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-peerinfo/ |
3 | 3 | ||
4 | [peerinfo] | 4 | [peerinfo] |
5 | PORT = 22354 | 5 | PORT = 22354 |
diff --git a/src/psycstore/test_psycstore.conf b/src/psycstore/test_psycstore.conf index c524f2ae6..5a20273a2 100644 --- a/src/psycstore/test_psycstore.conf +++ b/src/psycstore/test_psycstore.conf | |||
@@ -11,4 +11,4 @@ UNIX_MATCH_GID = YES | |||
11 | DATABASE = sqlite | 11 | DATABASE = sqlite |
12 | 12 | ||
13 | [psycstore-sqlite] | 13 | [psycstore-sqlite] |
14 | FILENAME = $SERVICEHOME/psycstore/sqlite_test.db | 14 | FILENAME = $GNUNET_TEST_HOME/psycstore/sqlite_test.db |
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf index 269def876..60584948e 100644 --- a/src/pt/test_gns_vpn.conf +++ b/src/pt/test_gns_vpn.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-gns-vpn/ | 2 | GNUNET_TEST_HOME = /tmp/gnunet-test-gns-vpn/ |
3 | 3 | ||
4 | [transport] | 4 | [transport] |
5 | PLUGINS = tcp | 5 | PLUGINS = tcp |
@@ -47,7 +47,7 @@ TTL = 3600000 | |||
47 | 47 | ||
48 | [gns] | 48 | [gns] |
49 | AUTOSTART = YES | 49 | AUTOSTART = YES |
50 | ZONEKEY = $SERVICEHOME/.hostkey | 50 | ZONEKEY = $GNUNET_TEST_HOME/.hostkey |
51 | HIJACK_DNS = YES | 51 | HIJACK_DNS = YES |
52 | 52 | ||
53 | [namestore] | 53 | [namestore] |
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf index c0cdd5b51..38f479775 100644 --- a/src/pt/test_gnunet_vpn.conf +++ b/src/pt/test_gnunet_vpn.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-vpn/ | 2 | GNUNET_TEST_HOME = /tmp/gnunet-test-vpn/ |
3 | 3 | ||
4 | [transport] | 4 | [transport] |
5 | PLUGINS = tcp | 5 | PLUGINS = tcp |
diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf index 87935261c..4977d3b19 100644 --- a/src/regex/test_regex_api_data.conf +++ b/src/regex/test_regex_api_data.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-regex-api/ | 2 | GNUNET_TEST_HOME = /tmp/test-regex-api/ |
3 | 3 | ||
4 | [fs] | 4 | [fs] |
5 | AUTOSTART = NO | 5 | AUTOSTART = NO |
diff --git a/src/set/test_set.conf b/src/set/test_set.conf index 0eeb1cb72..2b8f11fd7 100644 --- a/src/set/test_set.conf +++ b/src/set/test_set.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | # @INLINE@ test_set_defaults.conf | 1 | # @INLINE@ test_set_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-set/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunet-set/ |
4 | 4 | ||
5 | [set] | 5 | [set] |
6 | AUTOSTART = YES | 6 | AUTOSTART = YES |
diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf index 1ef8f95b3..c0ea8630d 100644 --- a/src/statistics/test_statistics_api_data.conf +++ b/src/statistics/test_statistics_api_data.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunetd-statistics/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-statistics/ |
3 | 3 | ||
4 | [statistics] | 4 | [statistics] |
5 | PORT = 22353 | 5 | PORT = 22353 |
@@ -7,7 +7,7 @@ UNIXPATH = /tmp/test-statistics-service-statistics.unix | |||
7 | 7 | ||
8 | [arm] | 8 | [arm] |
9 | PORT = 22354 | 9 | PORT = 22354 |
10 | DEFAULTSERVICES = | 10 | DEFAULTSERVICES = |
11 | UNIXPATH = /tmp/test-statistics-service-arm.unix | 11 | UNIXPATH = /tmp/test-statistics-service-arm.unix |
12 | 12 | ||
13 | [fs] | 13 | [fs] |
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf index 4be0c74da..beaf78eee 100644 --- a/src/testbed/test_testbed_api.conf +++ b/src/testbed/test_testbed_api.conf | |||
@@ -47,10 +47,10 @@ TIMEOUT = 300 s | |||
47 | PORT = 12368 | 47 | PORT = 12368 |
48 | 48 | ||
49 | [gnunetd] | 49 | [gnunetd] |
50 | HOSTKEY = $SERVICEHOME/.hostkey | 50 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
51 | 51 | ||
52 | [PATHS] | 52 | [PATHS] |
53 | SERVICEHOME = /tmp/test-testbed/ | 53 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
54 | 54 | ||
55 | [dns] | 55 | [dns] |
56 | AUTOSTART = NO | 56 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in index 8255ba152..5fbfd0b8d 100644 --- a/src/testbed/test_testbed_api_barriers.conf.in +++ b/src/testbed/test_testbed_api_barriers.conf.in | |||
@@ -53,7 +53,7 @@ TIMEOUT = 300 s | |||
53 | PORT = 12368 | 53 | PORT = 12368 |
54 | 54 | ||
55 | [PATHS] | 55 | [PATHS] |
56 | SERVICEHOME = /tmp/test-testbed/ | 56 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
57 | 57 | ||
58 | [dns] | 58 | [dns] |
59 | AUTOSTART = NO | 59 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf index 6ab91d260..f6bfa2c9e 100644 --- a/src/testbed/test_testbed_api_statistics.conf +++ b/src/testbed/test_testbed_api_statistics.conf | |||
@@ -57,10 +57,10 @@ USE_PROGRESSBARS = YES | |||
57 | PEERGROUP_TIMEOUT = 2400 s | 57 | PEERGROUP_TIMEOUT = 2400 s |
58 | 58 | ||
59 | [gnunetd] | 59 | [gnunetd] |
60 | HOSTKEY = $SERVICEHOME/.hostkey | 60 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
61 | 61 | ||
62 | [PATHS] | 62 | [PATHS] |
63 | SERVICEHOME = /tmp/test-testbed/ | 63 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
64 | 64 | ||
65 | [dns] | 65 | [dns] |
66 | AUTOSTART = NO | 66 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_test_timeout.conf b/src/testbed/test_testbed_api_test_timeout.conf index 6a59353c8..e31cc3e29 100644 --- a/src/testbed/test_testbed_api_test_timeout.conf +++ b/src/testbed/test_testbed_api_test_timeout.conf | |||
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES | |||
56 | PEERGROUP_TIMEOUT = 2400 s | 56 | PEERGROUP_TIMEOUT = 2400 s |
57 | 57 | ||
58 | [gnunetd] | 58 | [gnunetd] |
59 | HOSTKEY = $SERVICEHOME/.hostkey | 59 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
60 | 60 | ||
61 | [PATHS] | 61 | [PATHS] |
62 | SERVICEHOME = /tmp/test-testbed/ | 62 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf b/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf index 3dcc66ae3..3b27a36ac 100644 --- a/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf +++ b/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf | |||
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES | |||
56 | PEERGROUP_TIMEOUT = 2400 s | 56 | PEERGROUP_TIMEOUT = 2400 s |
57 | 57 | ||
58 | [gnunetd] | 58 | [gnunetd] |
59 | HOSTKEY = $SERVICEHOME/.hostkey | 59 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
60 | 60 | ||
61 | [PATHS] | 61 | [PATHS] |
62 | SERVICEHOME = /tmp/test-testbed/ | 62 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf index 0dbf1dcc9..a7e8c8d9b 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf | |||
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES | |||
56 | PEERGROUP_TIMEOUT = 2400 s | 56 | PEERGROUP_TIMEOUT = 2400 s |
57 | 57 | ||
58 | [gnunetd] | 58 | [gnunetd] |
59 | HOSTKEY = $SERVICEHOME/.hostkey | 59 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
60 | 60 | ||
61 | [PATHS] | 61 | [PATHS] |
62 | SERVICEHOME = /tmp/test-testbed/ | 62 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf b/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf index 82b0f5de4..91f09d0e9 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf | |||
@@ -49,10 +49,10 @@ TIMEOUT = 300 s | |||
49 | PORT = 12368 | 49 | PORT = 12368 |
50 | 50 | ||
51 | [gnunetd] | 51 | [gnunetd] |
52 | HOSTKEY = $SERVICEHOME/.hostkey | 52 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
53 | 53 | ||
54 | [PATHS] | 54 | [PATHS] |
55 | SERVICEHOME = /tmp/test-testbed/ | 55 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
56 | 56 | ||
57 | [dns] | 57 | [dns] |
58 | AUTOSTART = NO | 58 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf index 5ecca7de7..d4d76b35f 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf | |||
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES | |||
56 | PEERGROUP_TIMEOUT = 2400 s | 56 | PEERGROUP_TIMEOUT = 2400 s |
57 | 57 | ||
58 | [gnunetd] | 58 | [gnunetd] |
59 | HOSTKEY = $SERVICEHOME/.hostkey | 59 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
60 | 60 | ||
61 | [PATHS] | 61 | [PATHS] |
62 | SERVICEHOME = /tmp/test-testbed/ | 62 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf index 15e9e0fb4..d5d41e63e 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf | |||
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES | |||
56 | PEERGROUP_TIMEOUT = 2400 s | 56 | PEERGROUP_TIMEOUT = 2400 s |
57 | 57 | ||
58 | [gnunetd] | 58 | [gnunetd] |
59 | HOSTKEY = $SERVICEHOME/.hostkey | 59 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
60 | 60 | ||
61 | [PATHS] | 61 | [PATHS] |
62 | SERVICEHOME = /tmp/test-testbed/ | 62 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyring.conf b/src/testbed/test_testbed_api_testbed_run_topologyring.conf index b6a1e285a..2dadd254f 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyring.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyring.conf | |||
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES | |||
56 | PEERGROUP_TIMEOUT = 2400 s | 56 | PEERGROUP_TIMEOUT = 2400 s |
57 | 57 | ||
58 | [gnunetd] | 58 | [gnunetd] |
59 | HOSTKEY = $SERVICEHOME/.hostkey | 59 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
60 | 60 | ||
61 | [PATHS] | 61 | [PATHS] |
62 | SERVICEHOME = /tmp/test-testbed/ | 62 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf b/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf index cdd89f293..d96cd7202 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf | |||
@@ -58,10 +58,10 @@ USE_PROGRESSBARS = YES | |||
58 | PEERGROUP_TIMEOUT = 2400 s | 58 | PEERGROUP_TIMEOUT = 2400 s |
59 | 59 | ||
60 | [gnunetd] | 60 | [gnunetd] |
61 | HOSTKEY = $SERVICEHOME/.hostkey | 61 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
62 | 62 | ||
63 | [PATHS] | 63 | [PATHS] |
64 | SERVICEHOME = /tmp/test-testbed/ | 64 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
65 | 65 | ||
66 | [dns] | 66 | [dns] |
67 | AUTOSTART = NO | 67 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf index a0a715129..1a4ed46da 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf | |||
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES | |||
56 | PEERGROUP_TIMEOUT = 2400 s | 56 | PEERGROUP_TIMEOUT = 2400 s |
57 | 57 | ||
58 | [gnunetd] | 58 | [gnunetd] |
59 | HOSTKEY = $SERVICEHOME/.hostkey | 59 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
60 | 60 | ||
61 | [PATHS] | 61 | [PATHS] |
62 | SERVICEHOME = /tmp/test-testbed/ | 62 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf index 029f62157..57f52e65e 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf | |||
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES | |||
56 | PEERGROUP_TIMEOUT = 2400 s | 56 | PEERGROUP_TIMEOUT = 2400 s |
57 | 57 | ||
58 | [gnunetd] | 58 | [gnunetd] |
59 | HOSTKEY = $SERVICEHOME/.hostkey | 59 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey |
60 | 60 | ||
61 | [PATHS] | 61 | [PATHS] |
62 | SERVICEHOME = /tmp/test-testbed/ | 62 | GNUNET_TEST_HOME = /tmp/test-testbed/ |
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | AUTOSTART = NO |
diff --git a/src/testbed/test_testbed_logger_api.conf b/src/testbed/test_testbed_logger_api.conf index 82bffc31d..1aaf7df4c 100644 --- a/src/testbed/test_testbed_logger_api.conf +++ b/src/testbed/test_testbed_logger_api.conf | |||
@@ -1,3 +1,3 @@ | |||
1 | [testbed-logger] | 1 | [testbed-logger] |
2 | UNIXPATH=/tmp/testbed-logger.sock | 2 | UNIXPATH=/tmp/testbed-logger.sock |
3 | DIR=$SERVICEHOME/data \ No newline at end of file | 3 | DIR=$GNUNET_TEST_HOME/data \ No newline at end of file |
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf index 1a58a311f..b6e4ccdab 100644 --- a/src/testing/test_testing_defaults.conf +++ b/src/testing/test_testing_defaults.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-testing/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-testing/ |
3 | 3 | ||
4 | [resolver] | 4 | [resolver] |
5 | PORT = 2564 | 5 | PORT = 2564 |
diff --git a/src/testing/test_testing_sharedservices.conf b/src/testing/test_testing_sharedservices.conf index 393b1e518..c7014065f 100644 --- a/src/testing/test_testing_sharedservices.conf +++ b/src/testing/test_testing_sharedservices.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-testing/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-testing/ |
3 | 3 | ||
4 | [testbed-logger] | 4 | [testbed-logger] |
5 | PORT = 15000 | 5 | PORT = 15000 |
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf index 2adddeb7b..79f12e5e1 100644 --- a/src/topology/test_gnunet_daemon_topology_data.conf +++ b/src/topology/test_gnunet_daemon_topology_data.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-topology/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-topology/ |
3 | 3 | ||
4 | [resolver] | 4 | [resolver] |
5 | PORT = 2664 | 5 | PORT = 2664 |
diff --git a/src/topology/topology.conf b/src/topology/topology.conf index 278445352..5e72d57ce 100644 --- a/src/topology/topology.conf +++ b/src/topology/topology.conf | |||
@@ -2,7 +2,5 @@ | |||
2 | MINIMUM-FRIENDS = 0 | 2 | MINIMUM-FRIENDS = 0 |
3 | FRIENDS-ONLY = NO | 3 | FRIENDS-ONLY = NO |
4 | TARGET-CONNECTION-COUNT = 16 | 4 | TARGET-CONNECTION-COUNT = 16 |
5 | FRIENDS = $SERVICEHOME/friends | 5 | FRIENDS = $GNUNET_CONFIG_HOME/topology/friends.txt |
6 | BINARY = gnunet-daemon-topology | 6 | BINARY = gnunet-daemon-topology |
7 | |||
8 | |||
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf index dcea0d342..d66ab1906 100644 --- a/src/transport/template_cfg_peer1.conf +++ b/src/transport/template_cfg_peer1.conf | |||
@@ -1,9 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | |||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | 4 | ||
8 | [nat] | 5 | [nat] |
9 | RETURN_LOCAL_ADDRESSES = YES | 6 | RETURN_LOCAL_ADDRESSES = YES |
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index a1773a37b..a4b2f2b91 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf | |||
@@ -1,9 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | |||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | 4 | ||
8 | [nat] | 5 | [nat] |
9 | RETURN_LOCAL_ADDRESSES = YES | 6 | RETURN_LOCAL_ADDRESSES = YES |
@@ -35,8 +32,7 @@ UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | |||
35 | [peerinfo] | 32 | [peerinfo] |
36 | PORT = 12011 | 33 | PORT = 12011 |
37 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 34 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
38 | TRUST = $SERVICEHOME/data/credit/ | 35 | USE_INCLUDED_HELLOS = NO |
39 | USE_INCLUDED_HELLOS = NO | ||
40 | 36 | ||
41 | [transport] | 37 | [transport] |
42 | #PREFIX = valgrind --leak-check=full | 38 | #PREFIX = valgrind --leak-check=full |
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf index 189238c08..885fed8d7 100644 --- a/src/transport/test_plugin_transport_data.conf +++ b/src/transport/test_plugin_transport_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunetd-plugin-transport/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 2400 | 6 | PORT = 2400 |
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf index 77d06bee4..f20b62b85 100644 --- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci0 | 6 | INTERFACE = hci0 |
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf index f5941fdae..fe2535d9f 100644 --- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci1 | 6 | INTERFACE = hci1 |
diff --git a/src/transport/test_quota_compliance_bluetooth_peer1.conf b/src/transport/test_quota_compliance_bluetooth_peer1.conf index 77d06bee4..f20b62b85 100644 --- a/src/transport/test_quota_compliance_bluetooth_peer1.conf +++ b/src/transport/test_quota_compliance_bluetooth_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci0 | 6 | INTERFACE = hci0 |
diff --git a/src/transport/test_quota_compliance_bluetooth_peer2.conf b/src/transport/test_quota_compliance_bluetooth_peer2.conf index f5941fdae..fe2535d9f 100644 --- a/src/transport/test_quota_compliance_bluetooth_peer2.conf +++ b/src/transport/test_quota_compliance_bluetooth_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci1 | 6 | INTERFACE = hci1 |
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf index b0fb0e059..576d2fc0f 100644 --- a/src/transport/test_quota_compliance_data.conf +++ b/src/transport/test_quota_compliance_data.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ | 3 | GNUNET_TEST_HOME = /tmp/test-gnunetd-plugin-transport/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 2368 | 6 | PORT = 2368 |
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf index 885bcba3d..98d1db1cb 100644 --- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1 |
4 | 4 | ||
5 | [transport-http_client] | 5 | [transport-http_client] |
6 | 6 | ||
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf index 33f8be543..953915cf6 100644 --- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2 |
4 | 4 | ||
5 | [transport-http_server] | 5 | [transport-http_server] |
6 | PORT = 3010 | 6 | PORT = 3010 |
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 885bcba3d..98d1db1cb 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1 |
4 | 4 | ||
5 | [transport-http_client] | 5 | [transport-http_client] |
6 | 6 | ||
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 33f8be543..953915cf6 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2 |
4 | 4 | ||
5 | [transport-http_server] | 5 | [transport-http_server] |
6 | PORT = 3010 | 6 | PORT = 3010 |
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf index 271bbe056..9493fdee2 100644 --- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/ |
4 | 4 | ||
5 | [transport-https_client] | 5 | [transport-https_client] |
6 | 6 | ||
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf index 8e07ff337..eefc24f1d 100644 --- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2 |
4 | 4 | ||
5 | [transport-https_server] | 5 | [transport-https_server] |
6 | PORT = 3001 | 6 | PORT = 3001 |
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf index 271bbe056..9493fdee2 100644 --- a/src/transport/test_quota_compliance_https_peer1.conf +++ b/src/transport/test_quota_compliance_https_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/ |
4 | 4 | ||
5 | [transport-https_client] | 5 | [transport-https_client] |
6 | 6 | ||
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index 8e07ff337..eefc24f1d 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2 |
4 | 4 | ||
5 | [transport-https_server] | 5 | [transport-https_server] |
6 | PORT = 3001 | 6 | PORT = 3001 |
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf index b7eb28757..51804917c 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 4094 | 6 | PORT = 4094 |
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf index cc949df30..a31459db0 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index b7eb28757..51804917c 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 4094 | 6 | PORT = 4094 |
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index 67f171ec9..0e477e7c6 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf index 0d49d4ef8..8130083b1 100644 --- a/src/transport/test_quota_compliance_udp_peer1.conf +++ b/src/transport/test_quota_compliance_udp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/ |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 4368 | 6 | PORT = 4368 |
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index 3c57fe5d6..835ad8ff0 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2 |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 3368 | 6 | PORT = 3368 |
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf index 1e4afcebc..2282bcb57 100644 --- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 4087 | 6 | PORT = 4087 |
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf index f732e98ae..339d5d7c6 100644 --- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2 |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 3087 | 6 | PORT = 3087 |
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf index bde78468c..38dfb4fe7 100644 --- a/src/transport/test_quota_compliance_unix_peer1.conf +++ b/src/transport/test_quota_compliance_unix_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/ |
4 | 4 | ||
5 | [transport-unix] | 5 | [transport-unix] |
6 | PORT = 12120 | 6 | PORT = 12120 |
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf index 0b803ccbc..c9dc6126b 100644 --- a/src/transport/test_quota_compliance_unix_peer2.conf +++ b/src/transport/test_quota_compliance_unix_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2 |
4 | 4 | ||
5 | [transport-unix] | 5 | [transport-unix] |
6 | PORT = 12136 | 6 | PORT = 12136 |
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf index e81a3f9f1..d49a06b78 100644 --- a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf index bd5387667..137dd37ec 100644 --- a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_quota_compliance_wlan_peer1.conf b/src/transport/test_quota_compliance_wlan_peer1.conf index e81a3f9f1..d49a06b78 100644 --- a/src/transport/test_quota_compliance_wlan_peer1.conf +++ b/src/transport/test_quota_compliance_wlan_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_quota_compliance_wlan_peer2.conf b/src/transport/test_quota_compliance_wlan_peer2.conf index bd5387667..137dd37ec 100644 --- a/src/transport/test_quota_compliance_wlan_peer2.conf +++ b/src/transport/test_quota_compliance_wlan_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf index ba6afbe6e..88a4f54f6 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf index 4aeee7c7d..7d6ddec3e 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12010 | 6 | PORT = 12010 |
diff --git a/src/transport/test_transport_api_bluetooth_peer1.conf b/src/transport/test_transport_api_bluetooth_peer1.conf index baf84a21b..ccc9cec58 100644 --- a/src/transport/test_transport_api_bluetooth_peer1.conf +++ b/src/transport/test_transport_api_bluetooth_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci0 | 6 | INTERFACE = hci0 |
diff --git a/src/transport/test_transport_api_bluetooth_peer2.conf b/src/transport/test_transport_api_bluetooth_peer2.conf index 99836a732..5250cfdee 100644 --- a/src/transport/test_transport_api_bluetooth_peer2.conf +++ b/src/transport/test_transport_api_bluetooth_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci1 | 6 | INTERFACE = hci1 |
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf index 5f1d693a8..0de45c8cf 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf index 67f171ec9..0e477e7c6 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 3c1b41d06..c65c38f94 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ |
4 | 4 | ||
5 | [transport-http_client] | 5 | [transport-http_client] |
6 | 6 | ||
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index f348bf404..04e51fe93 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/ |
4 | 4 | ||
5 | [transport-http_server] | 5 | [transport-http_server] |
6 | PORT = 12090 | 6 | PORT = 12090 |
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf index 93d8bd34b..2bdc3dbd5 100644 --- a/src/transport/test_transport_api_http_reverse_peer1.conf +++ b/src/transport/test_transport_api_http_reverse_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | INLINE@ template_cfg_peer1.conf | 1 | INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ |
4 | 4 | ||
5 | 5 | ||
6 | [transport-http_client] | 6 | [transport-http_client] |
diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf index b73921f94..b38b5e56d 100644 --- a/src/transport/test_transport_api_http_reverse_peer2.conf +++ b/src/transport/test_transport_api_http_reverse_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | INLINE@ template_cfg_peer2.conf | 1 | INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/ |
4 | 4 | ||
5 | 5 | ||
6 | [transport-http_client] | 6 | [transport-http_client] |
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index 48302a640..4e0cac452 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf | |||
@@ -1,11 +1,11 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/ |
4 | 4 | ||
5 | [transport-https_client] | 5 | [transport-https_client] |
6 | PORT = 12100 | 6 | PORT = 12100 |
7 | KEY_FILE = $SERVICEHOME/https_key_p1.key | 7 | KEY_FILE = $GNUNET_TEST_HOME/https_key_p1.key |
8 | CERT_FILE = $SERVICEHOME/https_cert_p1.crt | 8 | CERT_FILE = $GNUNET_TEST_HOME/https_cert_p1.crt |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12105 | 11 | PORT = 12105 |
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index 89bef2b20..443717ebd 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/ |
4 | 4 | ||
5 | [transport-https_server] | 5 | [transport-https_server] |
6 | EXTERNAL_HOSTNAME = localhost/test | 6 | EXTERNAL_HOSTNAME = localhost/test |
@@ -11,8 +11,8 @@ EXTERNAL_HOSTNAME_USE_PORT = YES | |||
11 | # Does the external hostname use the same port? | 11 | # Does the external hostname use the same port? |
12 | USE_IPv6 = YES | 12 | USE_IPv6 = YES |
13 | #BINDTO = 127.0.0.1 | 13 | #BINDTO = 127.0.0.1 |
14 | KEY_FILE = $SERVICEHOME/https_key_p2.key | 14 | KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key |
15 | CERT_FILE = $SERVICEHOME/https_cert_p2.crt | 15 | CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt |
16 | 16 | ||
17 | [arm] | 17 | [arm] |
18 | PORT = 12115 | 18 | PORT = 12115 |
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf index dceeccb9f..004893a99 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf index caaddded2..121566e0b 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 0 | 6 | PORT = 0 |
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf b/src/transport/test_transport_api_manipulation_cfg_peer1.conf index df5d4c368..786256777 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer1.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer2.conf b/src/transport/test_transport_api_manipulation_cfg_peer2.conf index 1e16f7838..6985bf172 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer2.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf index db662826b..ed11174f0 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf +++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf index 67f171ec9..0e477e7c6 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf +++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf index db662826b..ed11174f0 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf +++ b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf index 67f171ec9..0e477e7c6 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf +++ b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index 61b0f5644..5105324f4 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-multi-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12140 | 6 | PORT = 12140 |
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index c660c3c41..54ab6b8fd 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-multi-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p2/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | ALLOW_NAT = NO | 6 | ALLOW_NAT = NO |
diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf b/src/transport/test_transport_api_reliability_bluetooth_peer1.conf index 77d06bee4..f20b62b85 100644 --- a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf +++ b/src/transport/test_transport_api_reliability_bluetooth_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci0 | 6 | INTERFACE = hci0 |
diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf b/src/transport/test_transport_api_reliability_bluetooth_peer2.conf index f5941fdae..fe2535d9f 100644 --- a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf +++ b/src/transport/test_transport_api_reliability_bluetooth_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci1 | 6 | INTERFACE = hci1 |
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf index ea5de0bc9..1e493aaba 100644 --- a/src/transport/test_transport_api_reliability_http_peer1.conf +++ b/src/transport/test_transport_api_reliability_http_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ |
4 | 4 | ||
5 | [transport-http_client] | 5 | [transport-http_client] |
6 | 6 | ||
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf index 083cd4dd8..4f7bbaf28 100644 --- a/src/transport/test_transport_api_reliability_http_peer2.conf +++ b/src/transport/test_transport_api_reliability_http_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/ |
4 | 4 | ||
5 | [transport-http_server] | 5 | [transport-http_server] |
6 | PORT = 12090 | 6 | PORT = 12090 |
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf index d5e88261a..6f20604e2 100644 --- a/src/transport/test_transport_api_reliability_https_peer1.conf +++ b/src/transport/test_transport_api_reliability_https_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/ |
4 | 4 | ||
5 | [transport-https_client] | 5 | [transport-https_client] |
6 | 6 | ||
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf index 5cc0d245a..82e5cc01d 100644 --- a/src/transport/test_transport_api_reliability_https_peer2.conf +++ b/src/transport/test_transport_api_reliability_https_peer2.conf | |||
@@ -1,11 +1,11 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/ |
4 | 4 | ||
5 | [transport-https_server] | 5 | [transport-https_server] |
6 | PORT = 12310 | 6 | PORT = 12310 |
7 | KEY_FILE = $SERVICEHOME/https_key_p2.key | 7 | KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key |
8 | CERT_FILE = $SERVICEHOME/https_cert_p2.crt | 8 | CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12315 | 11 | PORT = 12315 |
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf index 9490d405c..d248984d6 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf index b59916b7f..bb221e891 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | DISABLEV6 = YES | 6 | DISABLEV6 = YES |
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf index 5f1d693a8..0de45c8cf 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf index 181aab3de..0e1667b89 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf index e81a3f9f1..d49a06b78 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf index bd5387667..137dd37ec 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 8e33f273d..d50bac543 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-nat-p1/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf index f8b8b013e..395bbadc6 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_tcp_nat_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-nat-p2/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | DISABLEV6 = YES | 6 | DISABLEV6 = YES |
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index db662826b..ed11174f0 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 67f171ec9..0e477e7c6 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf index 665527b3e..9af0c22fa 100644 --- a/src/transport/test_transport_api_timeout_http_peer1.conf +++ b/src/transport/test_transport_api_timeout_http_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | 6 | ||
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf index 1fdc94788..e572dbe7f 100644 --- a/src/transport/test_transport_api_timeout_http_peer2.conf +++ b/src/transport/test_transport_api_timeout_http_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | 6 | ||
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf index fda69ae5c..674014afa 100644 --- a/src/transport/test_transport_api_timeout_https_peer1.conf +++ b/src/transport/test_transport_api_timeout_https_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/ |
4 | 4 | ||
5 | [transport-https_client] | 5 | [transport-https_client] |
6 | 6 | ||
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf index ca54e1718..2891cf665 100644 --- a/src/transport/test_transport_api_timeout_https_peer2.conf +++ b/src/transport/test_transport_api_timeout_https_peer2.conf | |||
@@ -1,11 +1,11 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/ |
4 | 4 | ||
5 | [transport-https_server] | 5 | [transport-https_server] |
6 | PORT = 12110 | 6 | PORT = 12110 |
7 | KEY_FILE = $SERVICEHOME/https_key_p2.key | 7 | KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key |
8 | CERT_FILE = $SERVICEHOME/https_cert_p2.crt | 8 | CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12115 | 11 | PORT = 12115 |
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf index dceeccb9f..004893a99 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer1.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf index f89c3a3f7..4e1e9791a 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer2.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | ALLOW_NAT = NO | 6 | ALLOW_NAT = NO |
diff --git a/src/transport/test_transport_api_timeout_udp_peer1.conf b/src/transport/test_transport_api_timeout_udp_peer1.conf index 7c3e33ad0..71e85bdc7 100644 --- a/src/transport/test_transport_api_timeout_udp_peer1.conf +++ b/src/transport/test_transport_api_timeout_udp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/ |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf index 9b79c3b54..c545ec7fa 100644 --- a/src/transport/test_transport_api_timeout_udp_peer2.conf +++ b/src/transport/test_transport_api_timeout_udp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/ |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf index 5d0235f73..34e6ae945 100644 --- a/src/transport/test_transport_api_timeout_unix_peer1.conf +++ b/src/transport/test_transport_api_timeout_unix_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12125 | 6 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf index 255c7e246..d0a5c0953 100644 --- a/src/transport/test_transport_api_timeout_unix_peer2.conf +++ b/src/transport/test_transport_api_timeout_unix_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12135 | 6 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index e406883e4..89e5e8d3e 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-nat-p1/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index 43ed3a91b..9f31cfa21 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-nat-p2/ |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | ALLOW_NAT = YES | 6 | ALLOW_NAT = YES |
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index 62d201e77..046cd86ca 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/ |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 0 | 6 | PORT = 0 |
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index a2d5fb515..5def1dfee 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/ |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf index 5d0235f73..34e6ae945 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12125 | 6 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index 255c7e246..d0a5c0953 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12135 | 6 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf index 77d06bee4..f20b62b85 100644 --- a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf +++ b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci0 | 6 | INTERFACE = hci0 |
diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf index f5941fdae..fe2535d9f 100644 --- a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf +++ b/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/ |
4 | 4 | ||
5 | [transport-bluetooth] | 5 | [transport-bluetooth] |
6 | INTERFACE = hci1 | 6 | INTERFACE = hci1 |
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf index a4fd104ed..7fe9a0810 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/ |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf index 755e65dce..83ecb9eb2 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/ |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf index b9669bf65..17c644b0b 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/ |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf index 46ad0177d..220866861 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/ |
4 | 4 | ||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf index 5d0235f73..34e6ae945 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer1.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12125 | 6 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf index c9dab48d7..fd8a29cff 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer2.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12135 | 6 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf index e81a3f9f1..d49a06b78 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf index bd5387667..137dd37ec 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index 3f12ce505..68b507ad9 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | INTERFACE = mon0 | 6 | INTERFACE = mon0 |
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index 451a2a666..7f18dbfb0 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/ |
4 | 4 | ||
5 | [transport-wlan] | 5 | [transport-wlan] |
6 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf index 1bbaacb41..a11c6536a 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf index 0c2906b1f..0cf3c6c4a 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf index 9f112de42..be699a6c3 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf index fcc35e6a7..1aefad0d9 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf index 730b5df43..e0cbad2b9 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf index b552ef588..590b96d13 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_blacklisting_cfg_peer1.conf b/src/transport/test_transport_blacklisting_cfg_peer1.conf index db662826b..ed11174f0 100644 --- a/src/transport/test_transport_blacklisting_cfg_peer1.conf +++ b/src/transport/test_transport_blacklisting_cfg_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_blacklisting_cfg_peer2.conf b/src/transport/test_transport_blacklisting_cfg_peer2.conf index 181aab3de..0e1667b89 100644 --- a/src/transport/test_transport_blacklisting_cfg_peer2.conf +++ b/src/transport/test_transport_blacklisting_cfg_peer2.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf index 48814b761..d34b60dbc 100644 --- a/src/transport/test_transport_defaults.conf +++ b/src/transport/test_transport_defaults.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-transport-api/ | 2 | GNUNET_TEST_HOME = /tmp/test-transport-api/ |
3 | 3 | ||
4 | [transport-tcp] | 4 | [transport-tcp] |
5 | TIMEOUT = 300 s | 5 | TIMEOUT = 300 s |
diff --git a/src/util/program.c b/src/util/program.c index aae58db49..73003891e 100644 --- a/src/util/program.c +++ b/src/util/program.c | |||
@@ -145,6 +145,8 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName, | |||
145 | #endif | 145 | #endif |
146 | char *loglev; | 146 | char *loglev; |
147 | char *logfile; | 147 | char *logfile; |
148 | char *cfg_fn; | ||
149 | const char *xdg; | ||
148 | int ret; | 150 | int ret; |
149 | unsigned int cnt; | 151 | unsigned int cnt; |
150 | unsigned long long skew_offset; | 152 | unsigned long long skew_offset; |
@@ -195,7 +197,6 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName, | |||
195 | cc.task = task; | 197 | cc.task = task; |
196 | cc.task_cls = task_cls; | 198 | cc.task_cls = task_cls; |
197 | cc.cfg = cfg = GNUNET_CONFIGURATION_create (); | 199 | cc.cfg = cfg = GNUNET_CONFIGURATION_create (); |
198 | |||
199 | /* prepare */ | 200 | /* prepare */ |
200 | #if ENABLE_NLS | 201 | #if ENABLE_NLS |
201 | setlocale (LC_ALL, ""); | 202 | setlocale (LC_ALL, ""); |
@@ -223,7 +224,15 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName, | |||
223 | qsort (allopts, cnt, sizeof (struct GNUNET_GETOPT_CommandLineOption), | 224 | qsort (allopts, cnt, sizeof (struct GNUNET_GETOPT_CommandLineOption), |
224 | &cmd_sorter); | 225 | &cmd_sorter); |
225 | loglev = NULL; | 226 | loglev = NULL; |
226 | cc.cfgfile = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE); | 227 | xdg = getenv ("XDG_CONFIG_HOME"); |
228 | if (NULL != xdg) | ||
229 | GNUNET_asprintf (&cfg_fn, | ||
230 | "%s%s%s", | ||
231 | xdg, | ||
232 | DIR_SEPARATOR_STR, | ||
233 | "gnunet.config"); | ||
234 | else | ||
235 | cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE); | ||
227 | lpfx = GNUNET_strdup (binaryName); | 236 | lpfx = GNUNET_strdup (binaryName); |
228 | if (NULL != (spc = strstr (lpfx, " "))) | 237 | if (NULL != (spc = strstr (lpfx, " "))) |
229 | *spc = '\0'; | 238 | *spc = '\0'; |
@@ -239,13 +248,15 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName, | |||
239 | GNUNET_free (lpfx); | 248 | GNUNET_free (lpfx); |
240 | return (ret == GNUNET_SYSERR) ? GNUNET_SYSERR : GNUNET_OK; | 249 | return (ret == GNUNET_SYSERR) ? GNUNET_SYSERR : GNUNET_OK; |
241 | } | 250 | } |
251 | if (NULL == cc.cfgfile) | ||
252 | cc.cfgfile = GNUNET_strdup (cfg_fn); | ||
242 | if (GNUNET_YES == | 253 | if (GNUNET_YES == |
243 | GNUNET_DISK_file_test (cc.cfgfile)) | 254 | GNUNET_DISK_file_test (cc.cfgfile)) |
244 | (void) GNUNET_CONFIGURATION_load (cfg, cc.cfgfile); | 255 | (void) GNUNET_CONFIGURATION_load (cfg, cc.cfgfile); |
245 | else | 256 | else |
246 | { | 257 | { |
247 | (void) GNUNET_CONFIGURATION_load (cfg, NULL); | 258 | (void) GNUNET_CONFIGURATION_load (cfg, NULL); |
248 | if (0 != strcmp (cc.cfgfile, GNUNET_DEFAULT_USER_CONFIG_FILE)) | 259 | if (0 != strcmp (cc.cfgfile, cfg_fn)) |
249 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 260 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
250 | _("Could not access configuration file `%s'\n"), | 261 | _("Could not access configuration file `%s'\n"), |
251 | cc.cfgfile); | 262 | cc.cfgfile); |
@@ -276,7 +287,8 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName, | |||
276 | /* clean up */ | 287 | /* clean up */ |
277 | GNUNET_SPEEDUP_stop_ (); | 288 | GNUNET_SPEEDUP_stop_ (); |
278 | GNUNET_CONFIGURATION_destroy (cfg); | 289 | GNUNET_CONFIGURATION_destroy (cfg); |
279 | GNUNET_free_non_null (cc.cfgfile); | 290 | GNUNET_free (cc.cfgfile); |
291 | GNUNET_free (cfg_fn); | ||
280 | GNUNET_free_non_null (loglev); | 292 | GNUNET_free_non_null (loglev); |
281 | GNUNET_free_non_null (logfile); | 293 | GNUNET_free_non_null (logfile); |
282 | return GNUNET_OK; | 294 | return GNUNET_OK; |
@@ -292,8 +304,8 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName, | |||
292 | * @param binaryHelp help text for the program | 304 | * @param binaryHelp help text for the program |
293 | * @param options command line options | 305 | * @param options command line options |
294 | * @param task main function to run | 306 | * @param task main function to run |
295 | * @param task_cls closure for task | 307 | * @param task_cls closure for @a task |
296 | * @return GNUNET_SYSERR on error, GNUNET_OK on success | 308 | * @return #GNUNET_SYSERR on error, #GNUNET_OK on success |
297 | */ | 309 | */ |
298 | int | 310 | int |
299 | GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, | 311 | GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, |
diff --git a/src/util/service.c b/src/util/service.c index d8ca5eba6..9190e0b13 100644 --- a/src/util/service.c +++ b/src/util/service.c | |||
@@ -1716,8 +1716,8 @@ pid_file_delete (struct GNUNET_SERVICE_Context *sctx) | |||
1716 | * @param service_name our service name | 1716 | * @param service_name our service name |
1717 | * @param options service options | 1717 | * @param options service options |
1718 | * @param task main task of the service | 1718 | * @param task main task of the service |
1719 | * @param task_cls closure for task | 1719 | * @param task_cls closure for @a task |
1720 | * @return GNUNET_SYSERR on error, GNUNET_OK | 1720 | * @return #GNUNET_SYSERR on error, #GNUNET_OK |
1721 | * if we shutdown nicely | 1721 | * if we shutdown nicely |
1722 | */ | 1722 | */ |
1723 | int | 1723 | int |
@@ -1730,6 +1730,7 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name, | |||
1730 | int err; | 1730 | int err; |
1731 | int ret; | 1731 | int ret; |
1732 | char *cfg_fn; | 1732 | char *cfg_fn; |
1733 | char *opt_cfg_fn; | ||
1733 | char *loglev; | 1734 | char *loglev; |
1734 | char *logfile; | 1735 | char *logfile; |
1735 | int do_daemonize; | 1736 | int do_daemonize; |
@@ -1739,9 +1740,10 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name, | |||
1739 | long long clock_offset; | 1740 | long long clock_offset; |
1740 | struct GNUNET_SERVICE_Context sctx; | 1741 | struct GNUNET_SERVICE_Context sctx; |
1741 | struct GNUNET_CONFIGURATION_Handle *cfg; | 1742 | struct GNUNET_CONFIGURATION_Handle *cfg; |
1743 | const char *xdg; | ||
1742 | 1744 | ||
1743 | struct GNUNET_GETOPT_CommandLineOption service_options[] = { | 1745 | struct GNUNET_GETOPT_CommandLineOption service_options[] = { |
1744 | GNUNET_GETOPT_OPTION_CFG_FILE (&cfg_fn), | 1746 | GNUNET_GETOPT_OPTION_CFG_FILE (&opt_cfg_fn), |
1745 | {'d', "daemonize", NULL, | 1747 | {'d', "daemonize", NULL, |
1746 | gettext_noop ("do daemonize (detach from terminal)"), 0, | 1748 | gettext_noop ("do daemonize (detach from terminal)"), 0, |
1747 | GNUNET_GETOPT_set_one, &do_daemonize}, | 1749 | GNUNET_GETOPT_set_one, &do_daemonize}, |
@@ -1755,7 +1757,16 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name, | |||
1755 | do_daemonize = 0; | 1757 | do_daemonize = 0; |
1756 | logfile = NULL; | 1758 | logfile = NULL; |
1757 | loglev = NULL; | 1759 | loglev = NULL; |
1758 | cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE); | 1760 | opt_cfg_fn = NULL; |
1761 | xdg = getenv ("XDG_CONFIG_HOME"); | ||
1762 | if (NULL != xdg) | ||
1763 | GNUNET_asprintf (&cfg_fn, | ||
1764 | "%s%s%s", | ||
1765 | xdg, | ||
1766 | DIR_SEPARATOR_STR, | ||
1767 | "gnunet.config"); | ||
1768 | else | ||
1769 | cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE); | ||
1759 | memset (&sctx, 0, sizeof (sctx)); | 1770 | memset (&sctx, 0, sizeof (sctx)); |
1760 | sctx.options = options; | 1771 | sctx.options = options; |
1761 | sctx.ready_confirm_fd = -1; | 1772 | sctx.ready_confirm_fd = -1; |
@@ -1777,16 +1788,18 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name, | |||
1777 | } | 1788 | } |
1778 | if (GNUNET_OK != GNUNET_log_setup (service_name, loglev, logfile)) | 1789 | if (GNUNET_OK != GNUNET_log_setup (service_name, loglev, logfile)) |
1779 | HANDLE_ERROR; | 1790 | HANDLE_ERROR; |
1791 | if (NULL == opt_cfg_fn) | ||
1792 | opt_cfg_fn = GNUNET_strdup (cfg_fn); | ||
1780 | if (GNUNET_YES == | 1793 | if (GNUNET_YES == |
1781 | GNUNET_DISK_file_test (cfg_fn)) | 1794 | GNUNET_DISK_file_test (opt_cfg_fn)) |
1782 | (void) GNUNET_CONFIGURATION_load (cfg, cfg_fn); | 1795 | (void) GNUNET_CONFIGURATION_load (cfg, opt_cfg_fn); |
1783 | else | 1796 | else |
1784 | { | 1797 | { |
1785 | (void) GNUNET_CONFIGURATION_load (cfg, NULL); | 1798 | (void) GNUNET_CONFIGURATION_load (cfg, NULL); |
1786 | if (0 != strcmp (cfg_fn, GNUNET_DEFAULT_USER_CONFIG_FILE)) | 1799 | if (0 != strcmp (opt_cfg_fn, cfg_fn)) |
1787 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1800 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1788 | _("Could not access configuration file `%s'\n"), | 1801 | _("Could not access configuration file `%s'\n"), |
1789 | cfg_fn); | 1802 | opt_cfg_fn); |
1790 | } | 1803 | } |
1791 | if (GNUNET_OK != setup_service (&sctx)) | 1804 | if (GNUNET_OK != setup_service (&sctx)) |
1792 | goto shutdown; | 1805 | goto shutdown; |
@@ -1795,7 +1808,9 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name, | |||
1795 | if (GNUNET_OK != set_user_id (&sctx)) | 1808 | if (GNUNET_OK != set_user_id (&sctx)) |
1796 | goto shutdown; | 1809 | goto shutdown; |
1797 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1810 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1798 | "Service `%s' runs with configuration from `%s'\n", service_name, cfg_fn); | 1811 | "Service `%s' runs with configuration from `%s'\n", |
1812 | service_name, | ||
1813 | opt_cfg_fn); | ||
1799 | if ((GNUNET_OK == | 1814 | if ((GNUNET_OK == |
1800 | GNUNET_CONFIGURATION_get_value_number (sctx.cfg, "TESTING", | 1815 | GNUNET_CONFIGURATION_get_value_number (sctx.cfg, "TESTING", |
1801 | "SKEW_OFFSET", &skew_offset)) && | 1816 | "SKEW_OFFSET", &skew_offset)) && |
@@ -1853,6 +1868,7 @@ shutdown: | |||
1853 | GNUNET_free_non_null (logfile); | 1868 | GNUNET_free_non_null (logfile); |
1854 | GNUNET_free_non_null (loglev); | 1869 | GNUNET_free_non_null (loglev); |
1855 | GNUNET_free (cfg_fn); | 1870 | GNUNET_free (cfg_fn); |
1871 | GNUNET_free (opt_cfg_fn); | ||
1856 | GNUNET_free_non_null (sctx.v4_denied); | 1872 | GNUNET_free_non_null (sctx.v4_denied); |
1857 | GNUNET_free_non_null (sctx.v6_denied); | 1873 | GNUNET_free_non_null (sctx.v6_denied); |
1858 | GNUNET_free_non_null (sctx.v4_allowed); | 1874 | GNUNET_free_non_null (sctx.v4_allowed); |
diff --git a/src/util/test_resolver_api_data.conf b/src/util/test_resolver_api_data.conf index 3e264ebb7..42b36d66a 100644 --- a/src/util/test_resolver_api_data.conf +++ b/src/util/test_resolver_api_data.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunetd-statistics/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunetd-statistics/ |
3 | 3 | ||
4 | [resolver] | 4 | [resolver] |
5 | PORT = 22354 | 5 | PORT = 22354 |
diff --git a/src/util/util.conf b/src/util/util.conf index b7f9deb04..7a4d3c704 100644 --- a/src/util/util.conf +++ b/src/util/util.conf | |||
@@ -5,7 +5,10 @@ | |||
5 | # defaults with the syntax "${VAR:-default}". Here, "default" can again | 5 | # defaults with the syntax "${VAR:-default}". Here, "default" can again |
6 | # be a $-expression. | 6 | # be a $-expression. |
7 | # | 7 | # |
8 | GNUNET_HOME = $HOME | 8 | # We usually want $HOME for $GNUNET_HOME, but we allow testcases to |
9 | # easily override this by setting $GNUNET_TEST_HOME. | ||
10 | # | ||
11 | GNUNET_HOME = ${GNUNET_TEST_HOME:-$HOME} | ||
9 | 12 | ||
10 | # see XDG Base Directory Specification at | 13 | # see XDG Base Directory Specification at |
11 | # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html | 14 | # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html |
@@ -24,8 +27,8 @@ GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache/}gnunet/ | |||
24 | GNUNET_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}gnunet/ | 27 | GNUNET_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}gnunet/ |
25 | 28 | ||
26 | # Legacy option... | 29 | # Legacy option... |
27 | SERVICEHOME = ~/.gnunet/ | 30 | GNUNET_TEST_HOME = ~/.gnunet/ |
28 | # SERVICEHOME = /var/lib/gnunet/ | 31 | # GNUNET_TEST_HOME = /var/lib/gnunet/ |
29 | 32 | ||
30 | # DEFAULTCONFIG = /etc/gnunet.conf | 33 | # DEFAULTCONFIG = /etc/gnunet.conf |
31 | # If 'DEFAULTCONFIG' is not defined, the current | 34 | # If 'DEFAULTCONFIG' is not defined, the current |