aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arm/arm.conf.in1
-rw-r--r--src/arm/test_arm_api_data.conf2
-rw-r--r--src/ats-test/test_transport_ats_1addr.conf1
-rw-r--r--src/ats-test/test_transport_ats_2addr.conf1
-rw-r--r--src/ats-test/test_transport_ats_4addr.conf1
-rw-r--r--src/ats/ats.conf.in1
-rw-r--r--src/ats/test_ats_api.conf1
-rw-r--r--src/chat/chat.conf.in1
-rw-r--r--src/chat/test_chat_data.conf2
-rw-r--r--src/chat/test_chat_peer1.conf3
-rw-r--r--src/chat/test_chat_peer2.conf3
-rw-r--r--src/chat/test_chat_peer3.conf3
-rw-r--r--src/core/core.conf.in1
-rw-r--r--src/core/test_core_api_data.conf1
-rw-r--r--src/core/test_core_api_peer1.conf1
-rw-r--r--src/core/test_core_api_peer2.conf3
-rw-r--r--src/core/test_core_api_send_to_self.conf2
-rw-r--r--src/core/test_core_defaults.conf1
-rw-r--r--src/core/test_core_quota_asymmetric_recv_limited_peer1.conf1
-rw-r--r--src/core/test_core_quota_asymmetric_recv_limited_peer2.conf3
-rw-r--r--src/core/test_core_quota_asymmetric_send_limit_peer1.conf1
-rw-r--r--src/core/test_core_quota_asymmetric_send_limit_peer2.conf3
-rw-r--r--src/core/test_core_quota_peer1.conf1
-rw-r--r--src/core/test_core_quota_peer2.conf3
-rw-r--r--src/datastore/datastore.conf.in1
-rw-r--r--src/datastore/perf_plugin_datastore_data_mysql.conf1
-rw-r--r--src/datastore/perf_plugin_datastore_data_postgres.conf1
-rw-r--r--src/datastore/perf_plugin_datastore_data_sqlite.conf1
-rw-r--r--src/datastore/test_datastore_api_data_mysql.conf1
-rw-r--r--src/datastore/test_datastore_api_data_postgres.conf1
-rw-r--r--src/datastore/test_datastore_api_data_sqlite.conf1
-rw-r--r--src/datastore/test_plugin_datastore_data_mysql.conf1
-rw-r--r--src/datastore/test_plugin_datastore_data_postgres.conf1
-rw-r--r--src/datastore/test_plugin_datastore_data_sqlite.conf1
-rw-r--r--src/dht/dht.conf.in1
-rw-r--r--src/dht/test_dht_2dtorus.conf1
-rw-r--r--src/dht/test_dht_api_data.conf1
-rw-r--r--src/dht/test_dht_api_peer1.conf1
-rw-r--r--src/dht/test_dht_line.conf1
-rw-r--r--src/dht/test_dht_multipeer_data.conf5
-rw-r--r--src/dht/test_dht_twopeer_data.conf1
-rw-r--r--src/dns/dns.conf.in1
-rw-r--r--src/dv/dv.conf.in1
-rw-r--r--src/dv/test_transport_dv_data.conf2
-rw-r--r--src/exit/exit.conf1
-rw-r--r--src/fs/fs.conf.in2
-rw-r--r--src/fs/test_fs_data.conf1
-rw-r--r--src/fs/test_fs_defaults.conf1
-rw-r--r--src/fs/test_fs_download_data.conf1
-rw-r--r--src/fs/test_fs_file_information_data.conf1
-rw-r--r--src/fs/test_fs_list_indexed_data.conf1
-rw-r--r--src/fs/test_fs_namespace_data.conf1
-rw-r--r--src/fs/test_fs_publish_data.conf1
-rw-r--r--src/fs/test_fs_search_data.conf1
-rw-r--r--src/fs/test_fs_unindex_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_idx_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_ns_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_psd_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_rec_data.conf1
-rw-r--r--src/fs/test_gnunet_service_fs_migration_data.conf1
-rw-r--r--src/gns/gns-helper-service-w32.conf1
-rw-r--r--src/gns/gns.conf.in2
-rw-r--r--src/gns/test_gns_dht_default.conf3
-rw-r--r--src/gns/test_gns_proxy.conf5
-rw-r--r--src/gns/test_gns_simple_lookup.conf3
-rw-r--r--src/hostlist/hostlist.conf1
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer1.conf1
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer2.conf1
-rw-r--r--src/hostlist/test_hostlist_defaults.conf1
-rw-r--r--src/hostlist/test_learning_adv_peer.conf1
-rw-r--r--src/hostlist/test_learning_learn_peer.conf1
-rw-r--r--src/hostlist/test_learning_learn_peer2.conf1
-rw-r--r--src/integration-tests/confs/c_bootstrap_server.conf22
-rw-r--r--src/integration-tests/confs/c_bootstrap_server_w_massif.conf20
-rw-r--r--src/integration-tests/confs/c_nat_client.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client_2.conf19
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http_2.conf19
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix_2.conf19
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp.conf20
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp.conf22
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp_http.conf22
-rw-r--r--src/lockmanager/lockmanager.conf.in1
-rw-r--r--src/lockmanager/test_lockmanager_api.conf1
-rw-r--r--src/mesh/mesh.conf.in1
-rw-r--r--src/mesh/test_mesh.conf1
-rw-r--r--src/mesh/test_mesh_2dtorus.conf1
-rw-r--r--src/mesh/test_mesh_path.conf1
-rw-r--r--src/mesh/test_mesh_small.conf1
-rw-r--r--src/namestore/namestore.conf.in1
-rw-r--r--src/namestore/test_namestore_api.conf1
-rw-r--r--src/nat/test_nat_data.conf5
-rw-r--r--src/nat/test_nat_test_data.conf2
-rw-r--r--src/nse/nse.conf.in1
-rw-r--r--src/nse/nse_profiler_test.conf2
-rw-r--r--src/nse/test_nse.conf2
-rw-r--r--src/peerinfo/peerinfo.conf.in1
-rw-r--r--src/pt/pt.conf1
-rw-r--r--src/pt/test_gns_vpn.conf2
-rw-r--r--src/pt/test_gnunet_vpn.conf1
-rw-r--r--src/regex/test_regex_big.conf1
-rw-r--r--src/statistics/statistics.conf.in1
-rw-r--r--src/statistics/test_statistics_api_data.conf1
-rw-r--r--src/stream/test_stream_local.conf1
-rw-r--r--src/template/template.conf1
-rw-r--r--src/testbed/test_testbed_api.conf1
-rw-r--r--src/testbed/testbed.conf.in3
-rw-r--r--src/testing/test_testing_defaults.conf1
-rw-r--r--src/testing_old/test_testing_2dtorus.conf1
-rw-r--r--src/testing_old/test_testing_connect_peer1.conf1
-rw-r--r--src/testing_old/test_testing_connect_peer2.conf1
-rw-r--r--src/testing_old/test_testing_data.conf1
-rw-r--r--src/testing_old/test_testing_data_remote.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_2d_torus.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_blacklist.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_churn.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_clique.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_clique_dfs.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_clique_minimum.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_clique_random.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_erdos_renyi.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_internat.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_none.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_ring.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_scale_free.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_small_world_ring.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_small_world_torus.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_stability.conf1
-rw-r--r--src/testing_old/test_testing_defaults.conf1
-rw-r--r--src/testing_old/test_testing_peergroup_data.conf1
-rw-r--r--src/topology/topology.conf1
-rw-r--r--src/transport/template_cfg_peer1.conf1
-rw-r--r--src/transport/template_cfg_peer2.conf1
-rw-r--r--src/transport/test_plugin_transport_data.conf1
-rw-r--r--src/transport/test_quota_compliance_data.conf1
-rw-r--r--src/transport/test_quota_compliance_http_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_http_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_http_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_http_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_https_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_https_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_https_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_https_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_tcp_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_tcp_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_udp_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_udp_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_unix_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_unix_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_unix_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_unix_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_wlan_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_wlan_peer2.conf1
-rw-r--r--src/transport/test_transport_api_bidirectional_connect_peer1.conf3
-rw-r--r--src/transport/test_transport_api_bidirectional_connect_peer2.conf3
-rw-r--r--src/transport/test_transport_api_data.conf1
-rw-r--r--src/transport/test_transport_api_disconnect_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_disconnect_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_http_peer1.conf1
-rw-r--r--src/transport/test_transport_api_http_peer2.conf1
-rw-r--r--src/transport/test_transport_api_http_reverse_peer1.conf1
-rw-r--r--src/transport/test_transport_api_http_reverse_peer2.conf1
-rw-r--r--src/transport/test_transport_api_https_peer1.conf1
-rw-r--r--src/transport/test_transport_api_https_peer2.conf1
-rw-r--r--src/transport/test_transport_api_limited_sockets_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_limited_sockets_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf1
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_http_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_http_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_https_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_https_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_tcp_nat_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_tcp_nat_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_wlan_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_wlan_peer2.conf1
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer1.conf1
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer2.conf1
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_http_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_http_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_https_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_https_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_udp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_udp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_unix_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_unix_peer2.conf1
-rw-r--r--src/transport/test_transport_api_udp_nat_peer1.conf1
-rw-r--r--src/transport/test_transport_api_udp_nat_peer2.conf1
-rw-r--r--src/transport/test_transport_api_udp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_udp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unix_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unix_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_constant_udp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_constant_udp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_udp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_udp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_unix_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_unix_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_wlan_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_wlan_peer2.conf1
-rw-r--r--src/transport/test_transport_api_wlan_peer1.conf1
-rw-r--r--src/transport/test_transport_api_wlan_peer2.conf1
-rw-r--r--src/transport/test_transport_defaults.conf1
-rw-r--r--src/transport/test_transport_startonly.conf1
-rw-r--r--src/transport/transport.conf.in1
-rw-r--r--src/util/resolver.conf.in1
-rw-r--r--src/util/util.conf2
-rw-r--r--src/vpn/vpn.conf.in1
220 files changed, 13 insertions, 485 deletions
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 316f0e49a..e7620b8ff 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -3,7 +3,6 @@
3@UNIXONLY@ PORT = 2087 3@UNIXONLY@ PORT = 2087
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-arm 6BINARY = gnunet-service-arm
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index 7d56e65fc..cbadc47d2 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-arm/ 2SERVICEHOME = /tmp/test-gnunetd-arm/
3DEFAULTCONFIG = test_arm_api_data.conf
4 3
5[arm] 4[arm]
6PORT = 23354 5PORT = 23354
@@ -21,7 +20,6 @@ AUTOSTART = NO
21PORT = 2223 20PORT = 2223
22HOSTNAME = localhost 21HOSTNAME = localhost
23HOME = $SERVICEHOME 22HOME = $SERVICEHOME
24CONFIG = $DEFAULTCONFIG
25BINARY = mockup-service 23BINARY = mockup-service
26ACCEPT_FROM = 127.0.0.1; 24ACCEPT_FROM = 127.0.0.1;
27ACCEPT_FROM6 = ::1; 25ACCEPT_FROM6 = ::1;
diff --git a/src/ats-test/test_transport_ats_1addr.conf b/src/ats-test/test_transport_ats_1addr.conf
index e01f743d2..311e5f00d 100644
--- a/src/ats-test/test_transport_ats_1addr.conf
+++ b/src/ats-test/test_transport_ats_1addr.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_transport_defaults.conf 1@INLINE@ test_transport_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-testing/ 3SERVICEHOME = /tmp/test-gnunet-testing/
4DEFAULTCONFIG = test_testing_data.conf
5 4
6[TESTING] 5[TESTING]
7HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat 6HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
diff --git a/src/ats-test/test_transport_ats_2addr.conf b/src/ats-test/test_transport_ats_2addr.conf
index ce7d104ae..0571dbf21 100644
--- a/src/ats-test/test_transport_ats_2addr.conf
+++ b/src/ats-test/test_transport_ats_2addr.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_transport_defaults.conf 1@INLINE@ test_transport_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-testing/ 3SERVICEHOME = /tmp/test-gnunet-testing/
4DEFAULTCONFIG = test_testing_data.conf
5 4
6[TESTING] 5[TESTING]
7HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat 6HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
diff --git a/src/ats-test/test_transport_ats_4addr.conf b/src/ats-test/test_transport_ats_4addr.conf
index cd224e6b0..e4b4863b3 100644
--- a/src/ats-test/test_transport_ats_4addr.conf
+++ b/src/ats-test/test_transport_ats_4addr.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_transport_defaults.conf 1@INLINE@ test_transport_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-testing/ 3SERVICEHOME = /tmp/test-gnunet-testing/
4DEFAULTCONFIG = test_testing_data.conf
5 4
6[TESTING] 5[TESTING]
7HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat 6HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index f81016e2b..d99708174 100644
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@UNIXONLY@ PORT = 2098 3@UNIXONLY@ PORT = 2098
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-ats 6BINARY = gnunet-service-ats
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf
index efd7fc9c6..ab96f655e 100644
--- a/src/ats/test_ats_api.conf
+++ b/src/ats/test_ats_api.conf
@@ -13,7 +13,6 @@ AUTOSTART = YES
13PORT = 12002 13PORT = 12002
14HOSTNAME = localhost 14HOSTNAME = localhost
15HOME = $SERVICEHOME 15HOME = $SERVICEHOME
16CONFIG = $DEFAULTCONFIG
17BINARY = gnunet-service-ats 16BINARY = gnunet-service-ats
18ACCEPT_FROM = 127.0.0.1; 17ACCEPT_FROM = 127.0.0.1;
19ACCEPT_FROM6 = ::1; 18ACCEPT_FROM6 = ::1;
diff --git a/src/chat/chat.conf.in b/src/chat/chat.conf.in
index 41fe9b4f7..560931e67 100644
--- a/src/chat/chat.conf.in
+++ b/src/chat/chat.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@UNIXONLY@ PORT = 2090 3@UNIXONLY@ PORT = 2090
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-chat 6BINARY = gnunet-service-chat
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/chat/test_chat_data.conf b/src/chat/test_chat_data.conf
index 3052a4f55..77446151b 100644
--- a/src/chat/test_chat_data.conf
+++ b/src/chat/test_chat_data.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/gnunet-test-chat/ 2SERVICEHOME = /tmp/gnunet-test-chat/
3DEFAULTCONFIG = test_chat_data.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = $SERVICEHOME/.hostkey 5HOSTKEY = $SERVICEHOME/.hostkey
@@ -30,7 +29,6 @@ HOSTNAME = localhost
30PORT = 42471 29PORT = 42471
31HOSTNAME = localhost 30HOSTNAME = localhost
32HOME = $SERVICEHOME 31HOME = $SERVICEHOME
33CONFIG = $DEFAULTCONFIG
34BINARY = gnunet-service-chat 32BINARY = gnunet-service-chat
35 33
36[testing] 34[testing]
diff --git a/src/chat/test_chat_peer1.conf b/src/chat/test_chat_peer1.conf
index 73280da0d..0193188de 100644
--- a/src/chat/test_chat_peer1.conf
+++ b/src/chat/test_chat_peer1.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/gnunet-test-chat-peer-1/ 2SERVICEHOME = /tmp/gnunet-test-chat-peer-1/
3DEFAULTCONFIG = test_chat_peer1.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = $SERVICEHOME/.hostkey 5HOSTKEY = $SERVICEHOME/.hostkey
@@ -41,7 +40,6 @@ FRIENDS-ONLY = NO
41AUTOCONNECT = YES 40AUTOCONNECT = YES
42TARGET-CONNECTION-COUNT = 16 41TARGET-CONNECTION-COUNT = 16
43FRIENDS = $SERVICEHOME/friends 42FRIENDS = $SERVICEHOME/friends
44CONFIG = $DEFAULTCONFIG
45BINARY = gnunet-daemon-topology 43BINARY = gnunet-daemon-topology
46 44
47[peerinfo] 45[peerinfo]
@@ -58,7 +56,6 @@ UNIXPATH = /tmp/gnunet-chat-p1-service-statistics.sock
58PORT = 31008 56PORT = 31008
59HOSTNAME = localhost 57HOSTNAME = localhost
60HOME = $SERVICEHOME 58HOME = $SERVICEHOME
61CONFIG = $DEFAULTCONFIG
62BINARY = gnunet-service-chat 59BINARY = gnunet-service-chat
63 60
64[testing] 61[testing]
diff --git a/src/chat/test_chat_peer2.conf b/src/chat/test_chat_peer2.conf
index 00808b5b5..c4a31a0f3 100644
--- a/src/chat/test_chat_peer2.conf
+++ b/src/chat/test_chat_peer2.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/gnunet-test-chat-peer-2/ 2SERVICEHOME = /tmp/gnunet-test-chat-peer-2/
3DEFAULTCONFIG = test_chat_peer2.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = $SERVICEHOME/.hostkey 5HOSTKEY = $SERVICEHOME/.hostkey
@@ -41,7 +40,6 @@ FRIENDS-ONLY = NO
41AUTOCONNECT = YES 40AUTOCONNECT = YES
42TARGET-CONNECTION-COUNT = 16 41TARGET-CONNECTION-COUNT = 16
43FRIENDS = $SERVICEHOME/friends 42FRIENDS = $SERVICEHOME/friends
44CONFIG = $DEFAULTCONFIG
45BINARY = gnunet-daemon-topology 43BINARY = gnunet-daemon-topology
46 44
47[peerinfo] 45[peerinfo]
@@ -58,7 +56,6 @@ UNIXPATH = /tmp/gnunet-chat-p2-service-statistics.sock
58PORT = 32008 56PORT = 32008
59HOSTNAME = localhost 57HOSTNAME = localhost
60HOME = $SERVICEHOME 58HOME = $SERVICEHOME
61CONFIG = $DEFAULTCONFIG
62BINARY = gnunet-service-chat 59BINARY = gnunet-service-chat
63 60
64[testing] 61[testing]
diff --git a/src/chat/test_chat_peer3.conf b/src/chat/test_chat_peer3.conf
index a39452323..d8dcedc29 100644
--- a/src/chat/test_chat_peer3.conf
+++ b/src/chat/test_chat_peer3.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/gnunet-test-chat-peer-3/ 2SERVICEHOME = /tmp/gnunet-test-chat-peer-3/
3DEFAULTCONFIG = test_chat_peer3.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = $SERVICEHOME/.hostkey 5HOSTKEY = $SERVICEHOME/.hostkey
@@ -41,7 +40,6 @@ FRIENDS-ONLY = NO
41AUTOCONNECT = YES 40AUTOCONNECT = YES
42TARGET-CONNECTION-COUNT = 16 41TARGET-CONNECTION-COUNT = 16
43FRIENDS = $SERVICEHOME/friends 42FRIENDS = $SERVICEHOME/friends
44CONFIG = $DEFAULTCONFIG
45BINARY = gnunet-daemon-topology 43BINARY = gnunet-daemon-topology
46 44
47[peerinfo] 45[peerinfo]
@@ -58,7 +56,6 @@ UNIXPATH = /tmp/gnunet-chat-p3-service-statistics.sock
58PORT = 33008 56PORT = 33008
59HOSTNAME = localhost 57HOSTNAME = localhost
60HOME = $SERVICEHOME 58HOME = $SERVICEHOME
61CONFIG = $DEFAULTCONFIG
62BINARY = gnunet-service-chat 59BINARY = gnunet-service-chat
63 60
64[testing] 61[testing]
diff --git a/src/core/core.conf.in b/src/core/core.conf.in
index 61ac84e6c..fbe2f7948 100644
--- a/src/core/core.conf.in
+++ b/src/core/core.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@JAVAPORT@PORT = 2092 3@JAVAPORT@PORT = 2092
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-core 6BINARY = gnunet-service-core
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf
index 30eea2dd5..440dac5c9 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/core/test_core_api_data.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_core_api_data.conf
4 3
5[arm] 4[arm]
6DEFAULTSERVICES = topology hostlist 5DEFAULTSERVICES = topology hostlist
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index 662318a44..119354c84 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-core-peer-1/ 3SERVICEHOME = /tmp/test-gnunet-core-peer-1/
4DEFAULTCONFIG = test_core_api_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12468 6PORT = 12468
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index cd29e3f94..e66c74c94 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-core-peer-2/ 3SERVICEHOME = /tmp/test-gnunet-core-peer-2/
4DEFAULTCONFIG = test_core_api_peer2.conf
5 4
6[arm] 5[arm]
7PORT = 22460 6PORT = 22460
@@ -38,4 +37,4 @@ PORT = 22467
38PORT = 22468 37PORT = 22468
39 38
40[transport-http] 39[transport-http]
41PORT = 22469 \ No newline at end of file 40PORT = 22469
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index 673772685..704a2b6da 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = ~/.gnunet/ 3SERVICEHOME = ~/.gnunet/
4DEFAULTCONFIG = test_core_api_send_to_self.conf
5 4
6[arm] 5[arm]
7PORT = 2425 6PORT = 2425
@@ -22,7 +21,6 @@ AUTOSTART = YES
22PORT = 9252 21PORT = 9252
23HOSTNAME = localhost 22HOSTNAME = localhost
24HOME = $SERVICEHOME 23HOME = $SERVICEHOME
25CONFIG = $DEFAULTCONFIG
26BINARY = test_core_api_send_to_self 24BINARY = test_core_api_send_to_self
27ACCEPT_FROM = 127.0.0.1; 25ACCEPT_FROM = 127.0.0.1;
28ACCEPT_FROM6 = ::1; 26ACCEPT_FROM6 = ::1;
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index 9525ca258..25a682445 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunet-core/ 2SERVICEHOME = /tmp/test-gnunet-core/
3DEFAULTCONFIG = test_core_defaults.conf
4 3
5[arm] 4[arm]
6DEFAULTSERVICES = 5DEFAULTSERVICES =
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 5501fb826..dcd886280 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/ 3SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/
4DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12488 6PORT = 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 62fc69e26..13f29e91a 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/ 3SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
4DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer2.conf
5 4
6 5
7[arm] 6[arm]
@@ -42,4 +41,4 @@ PORT = 22467
42PORT = 22468 41PORT = 22468
43 42
44[transport-http] 43[transport-http]
45PORT = 22469 \ No newline at end of file 44PORT = 22469
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 568cf6b16..09c4ed049 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/ 3SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/
4DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12488 6PORT = 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 614358ba7..03d5bce12 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/ 3SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/
4DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer2.conf
5 4
6[arm] 5[arm]
7PORT = 22486 6PORT = 22486
@@ -41,4 +40,4 @@ PORT = 22467
41PORT = 22468 40PORT = 22468
42 41
43[transport-http] 42[transport-http]
44PORT = 22469 \ No newline at end of file 43PORT = 22469
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index 4ff2ee44a..4a67bfe66 100644
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/ 3SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/
4DEFAULTCONFIG = test_core_quota_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12468 6PORT = 12468
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index 1fd4ec82b..e288da064 100644
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_core_defaults.conf 1@INLINE@ test_core_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/ 3SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/
4DEFAULTCONFIG = test_core_quota_peer2.conf
5 4
6[arm] 5[arm]
7PORT = 22476 6PORT = 22476
@@ -41,4 +40,4 @@ PORT = 22467
41PORT = 22468 40PORT = 22468
42 41
43[transport-http] 42[transport-http]
44PORT = 22469 \ No newline at end of file 43PORT = 22469
diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in
index 8cdb7b739..4149417de 100644
--- a/src/datastore/datastore.conf.in
+++ b/src/datastore/datastore.conf.in
@@ -6,7 +6,6 @@ UNIX_MATCH_GID = YES
6@UNIXONLY@ PORT = 2093 6@UNIXONLY@ PORT = 2093
7HOSTNAME = localhost 7HOSTNAME = localhost
8HOME = $SERVICEHOME 8HOME = $SERVICEHOME
9CONFIG = $DEFAULTCONFIG
10BINARY = gnunet-service-datastore 9BINARY = gnunet-service-datastore
11ACCEPT_FROM = 127.0.0.1; 10ACCEPT_FROM = 127.0.0.1;
12ACCEPT_FROM6 = ::1; 11ACCEPT_FROM6 = ::1;
diff --git a/src/datastore/perf_plugin_datastore_data_mysql.conf b/src/datastore/perf_plugin_datastore_data_mysql.conf
index dd26512e9..006b146af 100644
--- a/src/datastore/perf_plugin_datastore_data_mysql.conf
+++ b/src/datastore/perf_plugin_datastore_data_mysql.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_defaults.conf 1@INLINE@ test_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/ 3SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/
4DEFAULTCONFIG = perf_plugin_datastore_data_mysql.conf
5 4
6[datastore] 5[datastore]
7DATABASE = mysql 6DATABASE = mysql
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf b/src/datastore/perf_plugin_datastore_data_postgres.conf
index 53ce6cfc9..052fa486e 100644
--- a/src/datastore/perf_plugin_datastore_data_postgres.conf
+++ b/src/datastore/perf_plugin_datastore_data_postgres.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_defaults.conf 1@INLINE@ test_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/ 3SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/
4DEFAULTCONFIG = perf_plugin_datastore_data_postgres.conf
5 4
6[datastore] 5[datastore]
7DATABASE = postgres 6DATABASE = postgres
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf b/src/datastore/perf_plugin_datastore_data_sqlite.conf
index 241d85efc..5f97597d6 100644
--- a/src/datastore/perf_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/perf_plugin_datastore_data_sqlite.conf
@@ -1,5 +1,4 @@
1@INLINE@ test_defaults.conf 1@INLINE@ test_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/ 3SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/
4DEFAULTCONFIG = perf_plugin_datastore_data_sqlite.conf
5 4
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf
index 8e5a3dc0d..92967b976 100644
--- a/src/datastore/test_datastore_api_data_mysql.conf
+++ b/src/datastore/test_datastore_api_data_mysql.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_defaults.conf 1@INLINE@ test_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-datastore-mysql/ 3SERVICEHOME = /tmp/test-gnunet-datastore-mysql/
4DEFAULTCONFIG = test_datastore_api_data_mysql.conf
5 4
6[TESTING] 5[TESTING]
7WEAKRANDOM = YES 6WEAKRANDOM = YES
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf
index 046c561f4..a1a21689b 100644
--- a/src/datastore/test_datastore_api_data_postgres.conf
+++ b/src/datastore/test_datastore_api_data_postgres.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_defaults.conf 1@INLINE@ test_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-datastore-postgres/ 3SERVICEHOME = /tmp/test-gnunet-datastore-postgres/
4DEFAULTCONFIG = test_datastore_api_data_postgres.conf
5 4
6[TESTING] 5[TESTING]
7WEAKRANDOM = YES 6WEAKRANDOM = YES
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf
index a743b8008..953aef248 100644
--- a/src/datastore/test_datastore_api_data_sqlite.conf
+++ b/src/datastore/test_datastore_api_data_sqlite.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_defaults.conf 1@INLINE@ test_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/ 3SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/
4DEFAULTCONFIG = test_datastore_api_data_sqlite.conf
5 4
6[TESTING] 5[TESTING]
7WEAKRANDOM = YES 6WEAKRANDOM = YES
diff --git a/src/datastore/test_plugin_datastore_data_mysql.conf b/src/datastore/test_plugin_datastore_data_mysql.conf
index 957818ad8..845454b12 100644
--- a/src/datastore/test_plugin_datastore_data_mysql.conf
+++ b/src/datastore/test_plugin_datastore_data_mysql.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_defaults.conf 1@INLINE@ test_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/ 3SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/
4DEFAULTCONFIG = test_plugin_datastore_data_mysql.conf
5 4
6[datastore] 5[datastore]
7DATABASE = mysql 6DATABASE = mysql
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf b/src/datastore/test_plugin_datastore_data_postgres.conf
index d79649663..8b8523d40 100644
--- a/src/datastore/test_plugin_datastore_data_postgres.conf
+++ b/src/datastore/test_plugin_datastore_data_postgres.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_defaults.conf 1@INLINE@ test_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/ 3SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/
4DEFAULTCONFIG = test_plugin_datastore_data_postgres.conf
5 4
6[datastore] 5[datastore]
7DATABASE = postgres 6DATABASE = postgres
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf b/src/datastore/test_plugin_datastore_data_sqlite.conf
index f1fcf5f7f..dcdea7dde 100644
--- a/src/datastore/test_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/test_plugin_datastore_data_sqlite.conf
@@ -1,5 +1,4 @@
1@INLINE@ test_defaults.conf 1@INLINE@ test_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/ 3SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/
4DEFAULTCONFIG = test_plugin_datastore_data_sqlite.conf
5 4
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
index 36af99895..bcc0192ab 100644
--- a/src/dht/dht.conf.in
+++ b/src/dht/dht.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@JAVAPORT@PORT = 2095 3@JAVAPORT@PORT = 2095
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-dht 6BINARY = gnunet-service-dht
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 82b930188..fa8c25011 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test_dht_topo/ 2SERVICEHOME = /tmp/test_dht_topo/
3DEFAULTCONFIG = test_dht_2dtours.conf
4 3
5[arm] 4[arm]
6PORT = 10010 5PORT = 10010
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 8d4f8c63c..42ccf9687 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-dht-api/ 2SERVICEHOME = /tmp/test-dht-api/
3DEFAULTCONFIG = test_dht_api_data.conf
4 3
5[fs] 4[fs]
6AUTOSTART = NO 5AUTOSTART = NO
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index e56024c0d..eea39e031 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -52,7 +52,6 @@ WEAKRANDOM = YES
52HOSTKEY = $SERVICEHOME/.hostkey 52HOSTKEY = $SERVICEHOME/.hostkey
53 53
54[PATHS] 54[PATHS]
55DEFAULTCONFIG = test_dht_api_peer1.conf
56SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/ 55SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
57 56
58 57
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index ff34a3c25..0ce4a4e9b 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test_dht_topo/ 2SERVICEHOME = /tmp/test_dht_topo/
3DEFAULTCONFIG = test_dht_line.conf
4 3
5[arm] 4[arm]
6PORT = 10010 5PORT = 10010
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 9cb87d248..999ed3807 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -13,7 +13,6 @@ ACCEPT_FROM = 127.0.0.1;
13#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dht/.libs/gnunet-service-dht 13#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dht/.libs/gnunet-service-dht
14#PREFIX = xterm -T dht -e gdb --args 14#PREFIX = xterm -T dht -e gdb --args
15#PREFIX = valgrind --log-file=dht_%p 15#PREFIX = valgrind --log-file=dht_%p
16CONFIG = $DEFAULTCONFIG
17HOME = $SERVICEHOME 16HOME = $SERVICEHOME
18HOSTNAME = localhost 17HOSTNAME = localhost
19PORT = 12100 18PORT = 12100
@@ -37,7 +36,6 @@ ACCEPT_FROM6 = ::1;
37ACCEPT_FROM = 127.0.0.1; 36ACCEPT_FROM = 127.0.0.1;
38NEIGHBOUR_LIMIT = 50 37NEIGHBOUR_LIMIT = 50
39BINARY = gnunet-service-transport 38BINARY = gnunet-service-transport
40CONFIG = $DEFAULTCONFIG
41HOME = $SERVICEHOME 39HOME = $SERVICEHOME
42HOSTNAME = localhost 40HOSTNAME = localhost
43PORT = 12365 41PORT = 12365
@@ -53,7 +51,6 @@ WAN_QUOTA_OUT = 1 GB
53ACCEPT_FROM6 = ::1; 51ACCEPT_FROM6 = ::1;
54ACCEPT_FROM = 127.0.0.1; 52ACCEPT_FROM = 127.0.0.1;
55BINARY = gnunet-service-core 53BINARY = gnunet-service-core
56CONFIG = $DEFAULTCONFIG
57HOME = $SERVICEHOME 54HOME = $SERVICEHOME
58HOSTNAME = localhost 55HOSTNAME = localhost
59PORT = 12092 56PORT = 12092
@@ -64,7 +61,6 @@ DEFAULTSERVICES = dht core
64ACCEPT_FROM6 = ::1; 61ACCEPT_FROM6 = ::1;
65ACCEPT_FROM = 127.0.0.1; 62ACCEPT_FROM = 127.0.0.1;
66BINARY = gnunet-service-arm 63BINARY = gnunet-service-arm
67CONFIG = $DEFAULTCONFIG
68HOME = $SERVICEHOME 64HOME = $SERVICEHOME
69HOSTNAME = localhost 65HOSTNAME = localhost
70PORT = 12366 66PORT = 12366
@@ -107,7 +103,6 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
107HOSTKEY = $SERVICEHOME/.hostkey 103HOSTKEY = $SERVICEHOME/.hostkey
108 104
109[PATHS] 105[PATHS]
110DEFAULTCONFIG = test_dht_multipeer_data.conf
111SERVICEHOME = /tmp/test-dht-multipeer/ 106SERVICEHOME = /tmp/test-dht-multipeer/
112 107
113[nat] 108[nat]
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 809338834..51e7a6b8e 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -1,5 +1,4 @@
1[PATHS] 1[PATHS]
2DEFAULTCONFIG = test_dht_twopeer_data.conf
3SERVICEHOME = /tmp/test-dht-twopeer/ 2SERVICEHOME = /tmp/test-dht-twopeer/
4 3
5[resolver] 4[resolver]
diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in
index d2c67958a..65cb392e2 100644
--- a/src/dns/dns.conf.in
+++ b/src/dns/dns.conf.in
@@ -2,7 +2,6 @@
2AUTOSTART = YES 2AUTOSTART = YES
3HOSTNAME = localhost 3HOSTNAME = localhost
4HOME = $SERVICEHOME 4HOME = $SERVICEHOME
5CONFIG = $DEFAULTCONFIG
6BINARY = gnunet-service-dns 5BINARY = gnunet-service-dns
7UNIXPATH = /tmp/gnunet-service-dns.sock 6UNIXPATH = /tmp/gnunet-service-dns.sock
8 7
diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in
index 93278df7c..158bbcdd6 100644
--- a/src/dv/dv.conf.in
+++ b/src/dv/dv.conf.in
@@ -4,7 +4,6 @@ DEBUG = NO
4ACCEPT_FROM6 = ::1; 4ACCEPT_FROM6 = ::1;
5ACCEPT_FROM = 127.0.0.1; 5ACCEPT_FROM = 127.0.0.1;
6BINARY = gnunet-service-dv 6BINARY = gnunet-service-dv
7CONFIG = $DEFAULTCONFIG
8HOME = $SERVICEHOME 7HOME = $SERVICEHOME
9HOSTNAME = localhost 8HOSTNAME = localhost
10@UNIXONLY@ PORT = 2571 9@UNIXONLY@ PORT = 2571
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 1078c369f..3daa6a7f4 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunet-dv-testing/ 2SERVICEHOME = /tmp/test-gnunet-dv-testing/
3DEFAULTCONFIG = test_transport_dv_data.conf
4 3
5[resolver] 4[resolver]
6PORT = 2564 5PORT = 2564
@@ -39,7 +38,6 @@ DEBUG = NO
39ACCEPT_FROM6 = ::1; 38ACCEPT_FROM6 = ::1;
40ACCEPT_FROM = 127.0.0.1; 39ACCEPT_FROM = 127.0.0.1;
41BINARY = gnunet-service-dv 40BINARY = gnunet-service-dv
42CONFIG = $DEFAULTCONFIG
43HOME = $SERVICEHOME 41HOME = $SERVICEHOME
44HOSTNAME = localhost 42HOSTNAME = localhost
45PORT = 2571 43PORT = 2571
diff --git a/src/exit/exit.conf b/src/exit/exit.conf
index 0d48de94b..d0a4b35f3 100644
--- a/src/exit/exit.conf
+++ b/src/exit/exit.conf
@@ -1,5 +1,4 @@
1[exit] 1[exit]
2CONFIG = $DEFAULTCONFIG
3BINARY = gnunet-daemon-exit 2BINARY = gnunet-daemon-exit
4 3
5# IPv6 address for the TUN interface (must be changed as this 4# IPv6 address for the TUN interface (must be changed as this
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index 6c4d8217d..cac59e5cb 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -8,7 +8,6 @@ UPDATE_DIR = $SERVICEHOME/fs/updates/
8@UNIXONLY@ PORT = 2094 8@UNIXONLY@ PORT = 2094
9HOSTNAME = localhost 9HOSTNAME = localhost
10HOME = $SERVICEHOME 10HOME = $SERVICEHOME
11CONFIG = $DEFAULTCONFIG
12BINARY = gnunet-service-fs 11BINARY = gnunet-service-fs
13ACCEPT_FROM = 127.0.0.1; 12ACCEPT_FROM = 127.0.0.1;
14ACCEPT_FROM6 = ::1; 13ACCEPT_FROM6 = ::1;
@@ -34,7 +33,6 @@ PREFIX = @MONKEYPREFIX@
34 33
35[gnunet-auto-share] 34[gnunet-auto-share]
36BINARY = gnunet-auto-share 35BINARY = gnunet-auto-share
37CONFIG = $DEFAULTCONFIG
38 36
39# Note: MUST specify path to auto-share directory and CAN specify other options 37# Note: MUST specify path to auto-share directory and CAN specify other options
40# to gnunet-auto-share here! 38# to gnunet-auto-share here!
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf
index f2b4e1ee7..40e85ad4c 100644
--- a/src/fs/test_fs_data.conf
+++ b/src/fs/test_fs_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-data/ 3SERVICEHOME = /tmp/gnunet-test-fs-data/
4DEFAULTCONFIG = test_fs_data.conf
5 4
6[fs] 5[fs]
7ACTIVEMIGRATION = NO 6ACTIVEMIGRATION = NO
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index e0e697ec7..d1c4d8292 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/gnunet-test-fs-lib/ 2SERVICEHOME = /tmp/gnunet-test-fs-lib/
3DEFAULTCONFIG = fs_test_lib_data.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = $SERVICEHOME/.hostkey 5HOSTKEY = $SERVICEHOME/.hostkey
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index 25aad5119..7955daa4d 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -1,5 +1,4 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-download/ 3SERVICEHOME = /tmp/gnunet-test-fs-download/
4DEFAULTCONFIG = test_fs_download_data.conf
5 4
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf
index 09cedf899..ea43807b1 100644
--- a/src/fs/test_fs_file_information_data.conf
+++ b/src/fs/test_fs_file_information_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-file-information/ 3SERVICEHOME = /tmp/gnunet-test-fs-file-information/
4DEFAULTCONFIG = test_fs_file_information_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf
index 704ba4d66..99d446680 100644
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/fs/test_fs_list_indexed_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/ 3SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/
4DEFAULTCONFIG = test_fs_list_indexed_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf
index 3cdd241d7..625eb2d51 100644
--- a/src/fs/test_fs_namespace_data.conf
+++ b/src/fs/test_fs_namespace_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-namespace/ 3SERVICEHOME = /tmp/gnunet-test-fs-namespace/
4DEFAULTCONFIG = test_fs_namespace_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf
index 234f2b0ef..14e69197b 100644
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/fs/test_fs_publish_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-publish/ 3SERVICEHOME = /tmp/gnunet-test-fs-publish/
4DEFAULTCONFIG = test_fs_publish_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf
index ea5e4c5e3..812a7bfe2 100644
--- a/src/fs/test_fs_search_data.conf
+++ b/src/fs/test_fs_search_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-search/ 3SERVICEHOME = /tmp/gnunet-test-fs-search/
4DEFAULTCONFIG = test_fs_search_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf
index 977d6e759..fa28fbbbd 100644
--- a/src/fs/test_fs_unindex_data.conf
+++ b/src/fs/test_fs_unindex_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-unindex/ 3SERVICEHOME = /tmp/gnunet-test-fs-unindex/
4DEFAULTCONFIG = test_fs_unindex_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf
index f852011a8..4394805e5 100644
--- a/src/fs/test_gnunet_fs_idx_data.conf
+++ b/src/fs/test_gnunet_fs_idx_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-py-idx/ 3SERVICEHOME = /tmp/gnunet-test-fs-py-idx/
4DEFAULTCONFIG = test_gnunet_fs_idx_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_gnunet_fs_ns_data.conf b/src/fs/test_gnunet_fs_ns_data.conf
index 5f297abfa..57e3432e1 100644
--- a/src/fs/test_gnunet_fs_ns_data.conf
+++ b/src/fs/test_gnunet_fs_ns_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-py-ns/ 3SERVICEHOME = /tmp/gnunet-test-fs-py-ns/
4DEFAULTCONFIG = test_gnunet_fs_ns_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf
index b68c6b58e..e41f6bfe3 100644
--- a/src/fs/test_gnunet_fs_psd_data.conf
+++ b/src/fs/test_gnunet_fs_psd_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-py-psd/ 3SERVICEHOME = /tmp/gnunet-test-fs-py-psd/
4DEFAULTCONFIG = test_gnunet_fs_psd_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf
index dae8b19a8..fcdcda96d 100644
--- a/src/fs/test_gnunet_fs_rec_data.conf
+++ b/src/fs/test_gnunet_fs_rec_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/gnunet-test-fs-py-rec/ 3SERVICEHOME = /tmp/gnunet-test-fs-py-rec/
4DEFAULTCONFIG = test_gnunet_fs_rec_data.conf
5 4
6[transport] 5[transport]
7PLUGINS = 6PLUGINS =
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf
index 9c05a88e9..cd14c3261 100644
--- a/src/fs/test_gnunet_service_fs_migration_data.conf
+++ b/src/fs/test_gnunet_service_fs_migration_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_fs_defaults.conf 1@INLINE@ test_fs_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-service-fs-migration/ 3SERVICEHOME = /tmp/test-gnunet-service-fs-migration/
4DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf
5 4
6 5
7[ats] 6[ats]
diff --git a/src/gns/gns-helper-service-w32.conf b/src/gns/gns-helper-service-w32.conf
index 2d01c8f9d..48652173a 100644
--- a/src/gns/gns-helper-service-w32.conf
+++ b/src/gns/gns-helper-service-w32.conf
@@ -1,5 +1,4 @@
1[gns-helper-service-w32] 1[gns-helper-service-w32]
2CONFIG = $DEFAULTCONFIG
3AUTOSTART = YES 2AUTOSTART = YES
4BINARY = gnunet-gns-helper-service-w32 3BINARY = gnunet-gns-helper-service-w32
5PORT = 5353 4PORT = 5353
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index 91c0a4dc2..303fbf90b 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -2,7 +2,6 @@
2AUTOSTART = YES 2AUTOSTART = YES
3HOSTNAME = localhost 3HOSTNAME = localhost
4HOME = $SERVICEHOME 4HOME = $SERVICEHOME
5CONFIG = $DEFAULTCONFIG
6BINARY = gnunet-service-gns 5BINARY = gnunet-service-gns
7UNIXPATH = /tmp/gnunet-service-gns.sock 6UNIXPATH = /tmp/gnunet-service-gns.sock
8@UNIXONLY@PORT = 2102 7@UNIXONLY@PORT = 2102
@@ -26,6 +25,5 @@ HTTPPORT = 18080
26ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey 25ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey
27HOSTNAME = localhost 26HOSTNAME = localhost
28HOME = $SERVICEHOME 27HOME = $SERVICEHOME
29CONFIG = $DEFAULTCONFIG
30BINARY = gnunet-gns-fcfsd 28BINARY = gnunet-gns-fcfsd
31 29
diff --git a/src/gns/test_gns_dht_default.conf b/src/gns/test_gns_dht_default.conf
index b2897509a..cca3b4338 100644
--- a/src/gns/test_gns_dht_default.conf
+++ b/src/gns/test_gns_dht_default.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_gns_defaults.conf 1@INLINE@ test_gns_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-gns-dht/ 3SERVICEHOME = /tmp/test-gnunet-gns-dht/
4DEFAULTCONFIG = test_gns_dht_default.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 22568 6PORT = 22568
@@ -67,7 +66,6 @@ ZONEKEY = $SERVICEHOME/.hostkey
67HIJACK_DNS = NO 66HIJACK_DNS = NO
68UNIXPATH = /tmp/gnunet-service-gns-default.sock 67UNIXPATH = /tmp/gnunet-service-gns-default.sock
69HOME = $SERVICEHOME 68HOME = $SERVICEHOME
70CONFIG = $DEFAULTCONFIG
71AUTO_IMPORT_PKEY = NO 69AUTO_IMPORT_PKEY = NO
72MAX_PARALLEL_BACKGROUND_QUERIES = 10 70MAX_PARALLEL_BACKGROUND_QUERIES = 10
73DEFAULT_LOOKUP_TIMEOUT = 10 71DEFAULT_LOOKUP_TIMEOUT = 10
@@ -81,7 +79,6 @@ UNIX_MATCH_UID = YES
81UNIX_MATCH_GID = YES 79UNIX_MATCH_GID = YES
82HOSTNAME = localhost 80HOSTNAME = localhost
83HOME = $SERVICEHOME 81HOME = $SERVICEHOME
84CONFIG = $DEFAULTCONFIG
85BINARY = gnunet-service-namestore 82BINARY = gnunet-service-namestore
86ACCEPT_FROM = 127.0.0.1; 83ACCEPT_FROM = 127.0.0.1;
87ACCEPT_FROM6 = ::1; 84ACCEPT_FROM6 = ::1;
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index 81ec9a713..b098edb60 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/gnunet-test-gns-proxy/ 2SERVICEHOME = /tmp/gnunet-test-gns-proxy/
3DEFAULTCONFIG = test_gns_proxy.conf
4 3
5[transport] 4[transport]
6PLUGINS = tcp 5PLUGINS = tcp
@@ -16,7 +15,7 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
16 15
17[gns] 16[gns]
18AUTOSTART = YES 17AUTOSTART = YES
19ZONEKEY = $SERVICEHOME/hostkey 18ZONEKEY = $SERVICEHOME/.hostkey
20HIJACK_DNS = YES 19HIJACK_DNS = YES
21 20
22[gns-proxy] 21[gns-proxy]
@@ -29,4 +28,4 @@ AUTOSTART = YES
29[dns] 28[dns]
30PROVIDE_EXIT = NO 29PROVIDE_EXIT = NO
31#DNS_EXIT = 8.8.8.8 30#DNS_EXIT = 8.8.8.8
32#PREFIX = valgrind --leak-check=full \ No newline at end of file 31#PREFIX = valgrind --leak-check=full
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index dcd47da96..8143eddca 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -54,7 +54,6 @@ WEAKRANDOM = YES
54HOSTKEY = zonefiles/test_zonekey 54HOSTKEY = zonefiles/test_zonekey
55 55
56[PATHS] 56[PATHS]
57DEFAULTCONFIG = test_gns_simple_lookup.conf
58SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/ 57SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
59 58
60 59
@@ -84,7 +83,6 @@ SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0
84HIJACK_DNS = NO 83HIJACK_DNS = NO
85UNIXPATH = /tmp/gnunet-service-gns.sock 84UNIXPATH = /tmp/gnunet-service-gns.sock
86HOME = $SERVICEHOME 85HOME = $SERVICEHOME
87CONFIG = $DEFAULTCONFIG
88AUTO_IMPORT_PKEY = YES 86AUTO_IMPORT_PKEY = YES
89MAX_PARALLEL_BACKGROUND_QUERIES = 10 87MAX_PARALLEL_BACKGROUND_QUERIES = 10
90DEFAULT_LOOKUP_TIMEOUT = 15 88DEFAULT_LOOKUP_TIMEOUT = 15
@@ -104,7 +102,6 @@ UNIX_MATCH_UID = YES
104UNIX_MATCH_GID = YES 102UNIX_MATCH_GID = YES
105HOSTNAME = localhost 103HOSTNAME = localhost
106HOME = $SERVICEHOME 104HOME = $SERVICEHOME
107CONFIG = $DEFAULTCONFIG
108BINARY = gnunet-service-namestore 105BINARY = gnunet-service-namestore
109ACCEPT_FROM = 127.0.0.1; 106ACCEPT_FROM = 127.0.0.1;
110ACCEPT_FROM6 = ::1; 107ACCEPT_FROM6 = ::1;
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
index f7c1be39d..8c3675fd8 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/hostlist/hostlist.conf
@@ -3,7 +3,6 @@
3HTTPPORT = 8080 3HTTPPORT = 8080
4HOME = $SERVICEHOME 4HOME = $SERVICEHOME
5HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 5HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-daemon-hostlist 6BINARY = gnunet-daemon-hostlist
8# consider having "-e" as default as well once implemented 7# consider having "-e" as default as well once implemented
9OPTIONS = -b 8OPTIONS = -b
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 78dde578e..c880190a1 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_hostlist_defaults.conf 1@INLINE@ test_hostlist_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
4DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12968 6PORT = 12968
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index 41862daf3..c3833381a 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_hostlist_defaults.conf 1@INLINE@ test_hostlist_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
4DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 22968 6PORT = 22968
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index c2d0a70d2..c7ef8ea0f 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunet-hostlist/ 2SERVICEHOME = /tmp/test-gnunet-hostlist/
3DEFAULTCONFIG = test_hostlist_default.conf
4 3
5[resolver] 4[resolver]
6PORT = 12464 5PORT = 12464
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index fe50bd519..b08660a33 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_hostlist_defaults.conf 1@INLINE@ test_hostlist_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
4DEFAULTCONFIG = test_learning_adv_peer.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 22968 6PORT = 22968
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 0136d7706..95de70530 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_hostlist_defaults.conf 1@INLINE@ test_hostlist_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
4DEFAULTCONFIG = test_learning_learn_peer.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12968 6PORT = 12968
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index 4fd54bbc9..f70fbda5f 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_hostlist_defaults.conf 1@INLINE@ test_hostlist_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
4DEFAULTCONFIG = test_learning_learn_peer2.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 32968 6PORT = 32968
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index e96c31cf4..70c50ec53 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_bootstrap_server/ 2SERVICEHOME = /tmp/c_bootstrap_server/
3DEFAULTCONFIG = confs/c_bootstrap_server.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
11PORT = 0 10PORT = 0
12HOSTNAME = localhost 11HOSTNAME = localhost
13HOME = $SERVICEHOME 12HOME = $SERVICEHOME
14CONFIG = $DEFAULTCONFIG
15BINARY = gnunet-service-dns 13BINARY = gnunet-service-dns
16ACCEPT_FROM = 127.0.0.1; 14ACCEPT_FROM = 127.0.0.1;
17ACCEPT_FROM6 = ::1; 15ACCEPT_FROM6 = ::1;
@@ -22,7 +20,6 @@ AUTOSTART = YES
22PORT = 20017 20PORT = 20017
23HOSTNAME = localhost 21HOSTNAME = localhost
24HOME = $SERVICEHOME 22HOME = $SERVICEHOME
25CONFIG = $DEFAULTCONFIG
26BINARY = gnunet-service-resolver 23BINARY = gnunet-service-resolver
27ACCEPT_FROM = 127.0.0.1; 24ACCEPT_FROM = 127.0.0.1;
28ACCEPT_FROM6 = ::1; 25ACCEPT_FROM6 = ::1;
@@ -35,7 +32,6 @@ AUTOSTART = YES
35PORT = 20016 32PORT = 20016
36HOSTNAME = localhost 33HOSTNAME = localhost
37HOME = $SERVICEHOME 34HOME = $SERVICEHOME
38CONFIG = $DEFAULTCONFIG
39BINARY = gnunet-service-mesh 35BINARY = gnunet-service-mesh
40ACCEPT_FROM = 127.0.0.1; 36ACCEPT_FROM = 127.0.0.1;
41ACCEPT_FROM6 = ::1; 37ACCEPT_FROM6 = ::1;
@@ -48,7 +44,6 @@ AUTOSTART = YES
48PORT = 20015 44PORT = 20015
49HOSTNAME = localhost 45HOSTNAME = localhost
50HOME = $SERVICEHOME 46HOME = $SERVICEHOME
51CONFIG = $DEFAULTCONFIG
52BINARY = gnunet-service-nse 47BINARY = gnunet-service-nse
53ACCEPT_FROM = 127.0.0.1; 48ACCEPT_FROM = 127.0.0.1;
54ACCEPT_FROM6 = ::1; 49ACCEPT_FROM6 = ::1;
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO
67AUTOCONNECT = YES 62AUTOCONNECT = YES
68TARGET-CONNECTION-COUNT = 16 63TARGET-CONNECTION-COUNT = 16
69FRIENDS = $SERVICEHOME/friends 64FRIENDS = $SERVICEHOME/friends
70CONFIG = $DEFAULTCONFIG
71BINARY = gnunet-daemon-topology 65BINARY = gnunet-daemon-topology
72 66
73[datastore] 67[datastore]
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES
78PORT = 20014 72PORT = 20014
79HOSTNAME = localhost 73HOSTNAME = localhost
80HOME = $SERVICEHOME 74HOME = $SERVICEHOME
81CONFIG = $DEFAULTCONFIG
82BINARY = gnunet-service-datastore 75BINARY = gnunet-service-datastore
83ACCEPT_FROM = 127.0.0.1; 76ACCEPT_FROM = 127.0.0.1;
84ACCEPT_FROM6 = ::1; 77ACCEPT_FROM6 = ::1;
@@ -101,7 +94,6 @@ AUTOSTART = YES
101PORT = 20013 94PORT = 20013
102HOSTNAME = localhost 95HOSTNAME = localhost
103HOME = $SERVICEHOME 96HOME = $SERVICEHOME
104CONFIG = $DEFAULTCONFIG
105BINARY = gnunet-service-peerinfo 97BINARY = gnunet-service-peerinfo
106ACCEPT_FROM = 127.0.0.1; 98ACCEPT_FROM = 127.0.0.1;
107ACCEPT_FROM6 = ::1; 99ACCEPT_FROM6 = ::1;
@@ -125,7 +117,6 @@ AUTOSTART = YES
125PORT = 20012 117PORT = 20012
126HOSTNAME = localhost 118HOSTNAME = localhost
127HOME = $SERVICEHOME 119HOME = $SERVICEHOME
128CONFIG = $DEFAULTCONFIG
129BINARY = gnunet-service-ats 120BINARY = gnunet-service-ats
130ACCEPT_FROM = 127.0.0.1; 121ACCEPT_FROM = 127.0.0.1;
131ACCEPT_FROM6 = ::1; 122ACCEPT_FROM6 = ::1;
@@ -147,7 +138,6 @@ AUTOSTART = YES
147PORT = 20011 138PORT = 20011
148HOSTNAME = localhost 139HOSTNAME = localhost
149HOME = $SERVICEHOME 140HOME = $SERVICEHOME
150CONFIG = $DEFAULTCONFIG
151BINARY = gnunet-service-transport 141BINARY = gnunet-service-transport
152NEIGHBOUR_LIMIT = 50 142NEIGHBOUR_LIMIT = 50
153ACCEPT_FROM = 127.0.0.1; 143ACCEPT_FROM = 127.0.0.1;
@@ -199,7 +189,6 @@ AUTOSTART = NO
199PORT = 20006 189PORT = 20006
200HOSTNAME = localhost 190HOSTNAME = localhost
201HOME = $SERVICEHOME 191HOME = $SERVICEHOME
202CONFIG = $DEFAULTCONFIG
203BINARY = gnunet-service-template 192BINARY = gnunet-service-template
204ACCEPT_FROM = 127.0.0.1; 193ACCEPT_FROM = 127.0.0.1;
205ACCEPT_FROM6 = ::1; 194ACCEPT_FROM6 = ::1;
@@ -217,7 +206,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
217PORT = 20005 206PORT = 20005
218HOSTNAME = localhost 207HOSTNAME = localhost
219HOME = $SERVICEHOME 208HOME = $SERVICEHOME
220CONFIG = $DEFAULTCONFIG
221BINARY = gnunet-service-fs 209BINARY = gnunet-service-fs
222ACCEPT_FROM = 127.0.0.1; 210ACCEPT_FROM = 127.0.0.1;
223ACCEPT_FROM6 = ::1; 211ACCEPT_FROM6 = ::1;
@@ -232,7 +220,6 @@ MIN_MIGRATION_DELAY = 100 ms
232EXPECTED_NEIGHBOUR_COUNT = 128 220EXPECTED_NEIGHBOUR_COUNT = 128
233 221
234[vpn] 222[vpn]
235CONFIG = $DEFAULTCONFIG
236BINARY = gnunet-daemon-vpn 223BINARY = gnunet-daemon-vpn
237IPV6ADDR = 1234::1 224IPV6ADDR = 1234::1
238IPV6PREFIX = 32 225IPV6PREFIX = 32
@@ -243,7 +230,6 @@ VIRTDNS6 = 1234::17
243IFNAME = vpn-gnunet 230IFNAME = vpn-gnunet
244 231
245[exit] 232[exit]
246CONFIG = $DEFAULTCONFIG
247BINARY = gnunet-daemon-exit 233BINARY = gnunet-daemon-exit
248IPV6ADDR = 1234:1::1 234IPV6ADDR = 1234:1::1
249IPV6PREFIX = 32 235IPV6PREFIX = 32
@@ -258,7 +244,6 @@ AUTOSTART = YES
258PORT = 0 244PORT = 0
259HOSTNAME = localhost 245HOSTNAME = localhost
260HOME = $SERVICEHOME 246HOME = $SERVICEHOME
261CONFIG = $DEFAULTCONFIG
262BINARY = gnunet-service-dns 247BINARY = gnunet-service-dns
263ACCEPT_FROM = 127.0.0.1; 248ACCEPT_FROM = 127.0.0.1;
264ACCEPT_FROM6 = ::1; 249ACCEPT_FROM6 = ::1;
@@ -269,7 +254,6 @@ PROVIDE_EXIT = NO
269PORT = 20004 254PORT = 20004
270HOSTNAME = localhost 255HOSTNAME = localhost
271HOME = $SERVICEHOME 256HOME = $SERVICEHOME
272CONFIG = $DEFAULTCONFIG
273BINARY = gnunet-service-arm 257BINARY = gnunet-service-arm
274ACCEPT_FROM = 127.0.0.1; 258ACCEPT_FROM = 127.0.0.1;
275ACCEPT_FROM6 = ::1; 259ACCEPT_FROM6 = ::1;
@@ -282,7 +266,6 @@ UNIX_MATCH_GID = YES
282HTTPPORT = 8080 266HTTPPORT = 8080
283HOME = $SERVICEHOME 267HOME = $SERVICEHOME
284HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 268HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
285CONFIG = $DEFAULTCONFIG
286BINARY = gnunet-daemon-hostlist 269BINARY = gnunet-daemon-hostlist
287OPTIONS = -p 270OPTIONS = -p
288#SERVERS = http://v9.gnunet.org:58080/ 271#SERVERS = http://v9.gnunet.org:58080/
@@ -293,7 +276,6 @@ AUTOSTART = YES
293PORT = 20003 276PORT = 20003
294HOSTNAME = localhost 277HOSTNAME = localhost
295HOME = $SERVICEHOME 278HOME = $SERVICEHOME
296CONFIG = $DEFAULTCONFIG
297BINARY = gnunet-service-core 279BINARY = gnunet-service-core
298ACCEPT_FROM = 127.0.0.1; 280ACCEPT_FROM = 127.0.0.1;
299ACCEPT_FROM6 = ::1; 281ACCEPT_FROM6 = ::1;
@@ -327,7 +309,6 @@ AUTOSTART = YES
327PORT = 20001 309PORT = 20001
328HOSTNAME = localhost 310HOSTNAME = localhost
329HOME = $SERVICEHOME 311HOME = $SERVICEHOME
330CONFIG = $DEFAULTCONFIG
331BINARY = gnunet-service-statistics 312BINARY = gnunet-service-statistics
332ACCEPT_FROM = 127.0.0.1; 313ACCEPT_FROM = 127.0.0.1;
333ACCEPT_FROM6 = ::1; 314ACCEPT_FROM6 = ::1;
@@ -340,7 +321,6 @@ AUTOSTART = YES
340PORT = 20000 321PORT = 20000
341HOSTNAME = localhost 322HOSTNAME = localhost
342HOME = $SERVICEHOME 323HOME = $SERVICEHOME
343CONFIG = $DEFAULTCONFIG
344BINARY = gnunet-service-dht 324BINARY = gnunet-service-dht
345ACCEPT_FROM = 127.0.0.1; 325ACCEPT_FROM = 127.0.0.1;
346ACCEPT_FROM6 = ::1; 326ACCEPT_FROM6 = ::1;
@@ -370,4 +350,4 @@ AUTOSTART = NO
370AUTOSTART = NO 350AUTOSTART = NO
371 351
372[lockmanager] 352[lockmanager]
373AUTOSTART = NO \ No newline at end of file 353AUTOSTART = NO
diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
index 5081553c9..77dcd7427 100644
--- a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
+++ b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_bootstrap_server/ 2SERVICEHOME = /tmp/c_bootstrap_server/
3DEFAULTCONFIG = confs/c_bootstrap_server_w_massif.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
11PORT = 0 10PORT = 0
12HOSTNAME = localhost 11HOSTNAME = localhost
13HOME = $SERVICEHOME 12HOME = $SERVICEHOME
14CONFIG = $DEFAULTCONFIG
15BINARY = gnunet-service-dns 13BINARY = gnunet-service-dns
16ACCEPT_FROM = 127.0.0.1; 14ACCEPT_FROM = 127.0.0.1;
17ACCEPT_FROM6 = ::1; 15ACCEPT_FROM6 = ::1;
@@ -22,7 +20,6 @@ AUTOSTART = YES
22PORT = 20017 20PORT = 20017
23HOSTNAME = localhost 21HOSTNAME = localhost
24HOME = $SERVICEHOME 22HOME = $SERVICEHOME
25CONFIG = $DEFAULTCONFIG
26BINARY = gnunet-service-resolver 23BINARY = gnunet-service-resolver
27ACCEPT_FROM = 127.0.0.1; 24ACCEPT_FROM = 127.0.0.1;
28ACCEPT_FROM6 = ::1; 25ACCEPT_FROM6 = ::1;
@@ -35,7 +32,6 @@ AUTOSTART = YES
35PORT = 20016 32PORT = 20016
36HOSTNAME = localhost 33HOSTNAME = localhost
37HOME = $SERVICEHOME 34HOME = $SERVICEHOME
38CONFIG = $DEFAULTCONFIG
39BINARY = gnunet-service-mesh 35BINARY = gnunet-service-mesh
40ACCEPT_FROM = 127.0.0.1; 36ACCEPT_FROM = 127.0.0.1;
41ACCEPT_FROM6 = ::1; 37ACCEPT_FROM6 = ::1;
@@ -48,7 +44,6 @@ AUTOSTART = YES
48PORT = 20015 44PORT = 20015
49HOSTNAME = localhost 45HOSTNAME = localhost
50HOME = $SERVICEHOME 46HOME = $SERVICEHOME
51CONFIG = $DEFAULTCONFIG
52BINARY = gnunet-service-nse 47BINARY = gnunet-service-nse
53ACCEPT_FROM = 127.0.0.1; 48ACCEPT_FROM = 127.0.0.1;
54ACCEPT_FROM6 = ::1; 49ACCEPT_FROM6 = ::1;
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO
67AUTOCONNECT = YES 62AUTOCONNECT = YES
68TARGET-CONNECTION-COUNT = 16 63TARGET-CONNECTION-COUNT = 16
69FRIENDS = $SERVICEHOME/friends 64FRIENDS = $SERVICEHOME/friends
70CONFIG = $DEFAULTCONFIG
71BINARY = gnunet-daemon-topology 65BINARY = gnunet-daemon-topology
72 66
73[datastore] 67[datastore]
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES
78PORT = 20014 72PORT = 20014
79HOSTNAME = localhost 73HOSTNAME = localhost
80HOME = $SERVICEHOME 74HOME = $SERVICEHOME
81CONFIG = $DEFAULTCONFIG
82BINARY = gnunet-service-datastore 75BINARY = gnunet-service-datastore
83ACCEPT_FROM = 127.0.0.1; 76ACCEPT_FROM = 127.0.0.1;
84ACCEPT_FROM6 = ::1; 77ACCEPT_FROM6 = ::1;
@@ -101,7 +94,6 @@ AUTOSTART = YES
101PORT = 20013 94PORT = 20013
102HOSTNAME = localhost 95HOSTNAME = localhost
103HOME = $SERVICEHOME 96HOME = $SERVICEHOME
104CONFIG = $DEFAULTCONFIG
105BINARY = gnunet-service-peerinfo 97BINARY = gnunet-service-peerinfo
106ACCEPT_FROM = 127.0.0.1; 98ACCEPT_FROM = 127.0.0.1;
107ACCEPT_FROM6 = ::1; 99ACCEPT_FROM6 = ::1;
@@ -125,7 +117,6 @@ AUTOSTART = YES
125PORT = 20012 117PORT = 20012
126HOSTNAME = localhost 118HOSTNAME = localhost
127HOME = $SERVICEHOME 119HOME = $SERVICEHOME
128CONFIG = $DEFAULTCONFIG
129BINARY = gnunet-service-ats 120BINARY = gnunet-service-ats
130ACCEPT_FROM = 127.0.0.1; 121ACCEPT_FROM = 127.0.0.1;
131ACCEPT_FROM6 = ::1; 122ACCEPT_FROM6 = ::1;
@@ -148,7 +139,6 @@ AUTOSTART = YES
148PORT = 20011 139PORT = 20011
149HOSTNAME = localhost 140HOSTNAME = localhost
150HOME = $SERVICEHOME 141HOME = $SERVICEHOME
151CONFIG = $DEFAULTCONFIG
152BINARY = gnunet-service-transport 142BINARY = gnunet-service-transport
153NEIGHBOUR_LIMIT = 50 143NEIGHBOUR_LIMIT = 50
154ACCEPT_FROM = 127.0.0.1; 144ACCEPT_FROM = 127.0.0.1;
@@ -200,7 +190,6 @@ AUTOSTART = NO
200PORT = 20006 190PORT = 20006
201HOSTNAME = localhost 191HOSTNAME = localhost
202HOME = $SERVICEHOME 192HOME = $SERVICEHOME
203CONFIG = $DEFAULTCONFIG
204BINARY = gnunet-service-template 193BINARY = gnunet-service-template
205ACCEPT_FROM = 127.0.0.1; 194ACCEPT_FROM = 127.0.0.1;
206ACCEPT_FROM6 = ::1; 195ACCEPT_FROM6 = ::1;
@@ -218,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
218PORT = 20005 207PORT = 20005
219HOSTNAME = localhost 208HOSTNAME = localhost
220HOME = $SERVICEHOME 209HOME = $SERVICEHOME
221CONFIG = $DEFAULTCONFIG
222BINARY = gnunet-service-fs 210BINARY = gnunet-service-fs
223ACCEPT_FROM = 127.0.0.1; 211ACCEPT_FROM = 127.0.0.1;
224ACCEPT_FROM6 = ::1; 212ACCEPT_FROM6 = ::1;
@@ -233,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms
233EXPECTED_NEIGHBOUR_COUNT = 128 221EXPECTED_NEIGHBOUR_COUNT = 128
234 222
235[vpn] 223[vpn]
236CONFIG = $DEFAULTCONFIG
237BINARY = gnunet-daemon-vpn 224BINARY = gnunet-daemon-vpn
238IPV6ADDR = 1234::1 225IPV6ADDR = 1234::1
239IPV6PREFIX = 32 226IPV6PREFIX = 32
@@ -244,7 +231,6 @@ VIRTDNS6 = 1234::17
244IFNAME = vpn-gnunet 231IFNAME = vpn-gnunet
245 232
246[exit] 233[exit]
247CONFIG = $DEFAULTCONFIG
248BINARY = gnunet-daemon-exit 234BINARY = gnunet-daemon-exit
249IPV6ADDR = 1234:1::1 235IPV6ADDR = 1234:1::1
250IPV6PREFIX = 32 236IPV6PREFIX = 32
@@ -259,7 +245,6 @@ AUTOSTART = YES
259PORT = 0 245PORT = 0
260HOSTNAME = localhost 246HOSTNAME = localhost
261HOME = $SERVICEHOME 247HOME = $SERVICEHOME
262CONFIG = $DEFAULTCONFIG
263BINARY = gnunet-service-dns 248BINARY = gnunet-service-dns
264ACCEPT_FROM = 127.0.0.1; 249ACCEPT_FROM = 127.0.0.1;
265ACCEPT_FROM6 = ::1; 250ACCEPT_FROM6 = ::1;
@@ -270,7 +255,6 @@ PROVIDE_EXIT = NO
270PORT = 20004 255PORT = 20004
271HOSTNAME = localhost 256HOSTNAME = localhost
272HOME = $SERVICEHOME 257HOME = $SERVICEHOME
273CONFIG = $DEFAULTCONFIG
274BINARY = gnunet-service-arm 258BINARY = gnunet-service-arm
275ACCEPT_FROM = 127.0.0.1; 259ACCEPT_FROM = 127.0.0.1;
276ACCEPT_FROM6 = ::1; 260ACCEPT_FROM6 = ::1;
@@ -283,7 +267,6 @@ UNIX_MATCH_GID = YES
283HTTPPORT = 8080 267HTTPPORT = 8080
284HOME = $SERVICEHOME 268HOME = $SERVICEHOME
285HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 269HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
286CONFIG = $DEFAULTCONFIG
287BINARY = gnunet-daemon-hostlist 270BINARY = gnunet-daemon-hostlist
288OPTIONS = -p 271OPTIONS = -p
289#SERVERS = http://v9.gnunet.org:58080/ 272#SERVERS = http://v9.gnunet.org:58080/
@@ -294,7 +277,6 @@ AUTOSTART = YES
294PORT = 20003 277PORT = 20003
295HOSTNAME = localhost 278HOSTNAME = localhost
296HOME = $SERVICEHOME 279HOME = $SERVICEHOME
297CONFIG = $DEFAULTCONFIG
298BINARY = gnunet-service-core 280BINARY = gnunet-service-core
299ACCEPT_FROM = 127.0.0.1; 281ACCEPT_FROM = 127.0.0.1;
300ACCEPT_FROM6 = ::1; 282ACCEPT_FROM6 = ::1;
@@ -328,7 +310,6 @@ AUTOSTART = YES
328PORT = 20001 310PORT = 20001
329HOSTNAME = localhost 311HOSTNAME = localhost
330HOME = $SERVICEHOME 312HOME = $SERVICEHOME
331CONFIG = $DEFAULTCONFIG
332BINARY = gnunet-service-statistics 313BINARY = gnunet-service-statistics
333ACCEPT_FROM = 127.0.0.1; 314ACCEPT_FROM = 127.0.0.1;
334ACCEPT_FROM6 = ::1; 315ACCEPT_FROM6 = ::1;
@@ -341,7 +322,6 @@ AUTOSTART = YES
341PORT = 20000 322PORT = 20000
342HOSTNAME = localhost 323HOSTNAME = localhost
343HOME = $SERVICEHOME 324HOME = $SERVICEHOME
344CONFIG = $DEFAULTCONFIG
345BINARY = gnunet-service-dht 325BINARY = gnunet-service-dht
346ACCEPT_FROM = 127.0.0.1; 326ACCEPT_FROM = 127.0.0.1;
347ACCEPT_FROM6 = ::1; 327ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 9e12bb9fa..ffba6d560 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_nat_client 2SERVICEHOME = /tmp/c_nat_client
3DEFAULTCONFIG = confs/c_nat_client.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = hostkeys/0002-hostkey 5HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
19PORT = 0 18PORT = 0
20HOSTNAME = localhost 19HOSTNAME = localhost
21HOME = $SERVICEHOME 20HOME = $SERVICEHOME
22CONFIG = $DEFAULTCONFIG
23BINARY = gnunet-service-dns 21BINARY = gnunet-service-dns
24ACCEPT_FROM = 127.0.0.1; 22ACCEPT_FROM = 127.0.0.1;
25ACCEPT_FROM6 = ::1; 23ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
31PORT = 20071 29PORT = 20071
32HOSTNAME = localhost 30HOSTNAME = localhost
33HOME = $SERVICEHOME 31HOME = $SERVICEHOME
34CONFIG = $DEFAULTCONFIG
35BINARY = gnunet-service-resolver 32BINARY = gnunet-service-resolver
36ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1; 34ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
44PORT = 20070 41PORT = 20070
45HOSTNAME = localhost 42HOSTNAME = localhost
46HOME = $SERVICEHOME 43HOME = $SERVICEHOME
47CONFIG = $DEFAULTCONFIG
48BINARY = gnunet-service-mesh 44BINARY = gnunet-service-mesh
49ACCEPT_FROM = 127.0.0.1; 45ACCEPT_FROM = 127.0.0.1;
50ACCEPT_FROM6 = ::1; 46ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
57PORT = 20069 53PORT = 20069
58HOSTNAME = localhost 54HOSTNAME = localhost
59HOME = $SERVICEHOME 55HOME = $SERVICEHOME
60CONFIG = $DEFAULTCONFIG
61BINARY = gnunet-service-nse 56BINARY = gnunet-service-nse
62ACCEPT_FROM = 127.0.0.1; 57ACCEPT_FROM = 127.0.0.1;
63ACCEPT_FROM6 = ::1; 58ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
76AUTOCONNECT = YES 71AUTOCONNECT = YES
77TARGET-CONNECTION-COUNT = 16 72TARGET-CONNECTION-COUNT = 16
78FRIENDS = $SERVICEHOME/friends 73FRIENDS = $SERVICEHOME/friends
79CONFIG = $DEFAULTCONFIG
80BINARY = gnunet-daemon-topology 74BINARY = gnunet-daemon-topology
81 75
82[datastore] 76[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
87PORT = 20068 81PORT = 20068
88HOSTNAME = localhost 82HOSTNAME = localhost
89HOME = $SERVICEHOME 83HOME = $SERVICEHOME
90CONFIG = $DEFAULTCONFIG
91BINARY = gnunet-service-datastore 84BINARY = gnunet-service-datastore
92ACCEPT_FROM = 127.0.0.1; 85ACCEPT_FROM = 127.0.0.1;
93ACCEPT_FROM6 = ::1; 86ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
110PORT = 20067 103PORT = 20067
111HOSTNAME = localhost 104HOSTNAME = localhost
112HOME = $SERVICEHOME 105HOME = $SERVICEHOME
113CONFIG = $DEFAULTCONFIG
114BINARY = gnunet-service-peerinfo 106BINARY = gnunet-service-peerinfo
115ACCEPT_FROM = 127.0.0.1; 107ACCEPT_FROM = 127.0.0.1;
116ACCEPT_FROM6 = ::1; 108ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20066 123PORT = 20066
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
153PORT = 20065 144PORT = 20065
154HOSTNAME = localhost 145HOSTNAME = localhost
155HOME = $SERVICEHOME 146HOME = $SERVICEHOME
156CONFIG = $DEFAULTCONFIG
157BINARY = gnunet-service-transport 147BINARY = gnunet-service-transport
158NEIGHBOUR_LIMIT = 50 148NEIGHBOUR_LIMIT = 50
159ACCEPT_FROM = 127.0.0.1; 149ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
205PORT = 20060 195PORT = 20060
206HOSTNAME = localhost 196HOSTNAME = localhost
207HOME = $SERVICEHOME 197HOME = $SERVICEHOME
208CONFIG = $DEFAULTCONFIG
209BINARY = gnunet-service-template 198BINARY = gnunet-service-template
210ACCEPT_FROM = 127.0.0.1; 199ACCEPT_FROM = 127.0.0.1;
211ACCEPT_FROM6 = ::1; 200ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
223PORT = 20059 212PORT = 20059
224HOSTNAME = localhost 213HOSTNAME = localhost
225HOME = $SERVICEHOME 214HOME = $SERVICEHOME
226CONFIG = $DEFAULTCONFIG
227BINARY = gnunet-service-fs 215BINARY = gnunet-service-fs
228ACCEPT_FROM = 127.0.0.1; 216ACCEPT_FROM = 127.0.0.1;
229ACCEPT_FROM6 = ::1; 217ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
238EXPECTED_NEIGHBOUR_COUNT = 128 226EXPECTED_NEIGHBOUR_COUNT = 128
239 227
240[vpn] 228[vpn]
241CONFIG = $DEFAULTCONFIG
242BINARY = gnunet-daemon-vpn 229BINARY = gnunet-daemon-vpn
243IPV6ADDR = 1234::1 230IPV6ADDR = 1234::1
244IPV6PREFIX = 32 231IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
249IFNAME = vpn-gnunet 236IFNAME = vpn-gnunet
250 237
251[exit] 238[exit]
252CONFIG = $DEFAULTCONFIG
253BINARY = gnunet-daemon-exit 239BINARY = gnunet-daemon-exit
254IPV6ADDR = 1234:1::1 240IPV6ADDR = 1234:1::1
255IPV6PREFIX = 32 241IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
264PORT = 0 250PORT = 0
265HOSTNAME = localhost 251HOSTNAME = localhost
266HOME = $SERVICEHOME 252HOME = $SERVICEHOME
267CONFIG = $DEFAULTCONFIG
268BINARY = gnunet-service-dns 253BINARY = gnunet-service-dns
269ACCEPT_FROM = 127.0.0.1; 254ACCEPT_FROM = 127.0.0.1;
270ACCEPT_FROM6 = ::1; 255ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
275PORT = 20058 260PORT = 20058
276HOSTNAME = localhost 261HOSTNAME = localhost
277HOME = $SERVICEHOME 262HOME = $SERVICEHOME
278CONFIG = $DEFAULTCONFIG
279BINARY = gnunet-service-arm 263BINARY = gnunet-service-arm
280ACCEPT_FROM = 127.0.0.1; 264ACCEPT_FROM = 127.0.0.1;
281ACCEPT_FROM6 = ::1; 265ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
288HTTPPORT = 8080 272HTTPPORT = 8080
289HOME = $SERVICEHOME 273HOME = $SERVICEHOME
290HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
291CONFIG = $DEFAULTCONFIG
292BINARY = gnunet-daemon-hostlist 275BINARY = gnunet-daemon-hostlist
293OPTIONS = -b 276OPTIONS = -b
294SERVERS = http://localhost:8080/ 277SERVERS = http://localhost:8080/
@@ -299,7 +282,6 @@ AUTOSTART = YES
299PORT = 20057 282PORT = 20057
300HOSTNAME = localhost 283HOSTNAME = localhost
301HOME = $SERVICEHOME 284HOME = $SERVICEHOME
302CONFIG = $DEFAULTCONFIG
303BINARY = gnunet-service-core 285BINARY = gnunet-service-core
304ACCEPT_FROM = 127.0.0.1; 286ACCEPT_FROM = 127.0.0.1;
305ACCEPT_FROM6 = ::1; 287ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
333PORT = 20055 315PORT = 20055
334HOSTNAME = localhost 316HOSTNAME = localhost
335HOME = $SERVICEHOME 317HOME = $SERVICEHOME
336CONFIG = $DEFAULTCONFIG
337BINARY = gnunet-service-statistics 318BINARY = gnunet-service-statistics
338ACCEPT_FROM = 127.0.0.1; 319ACCEPT_FROM = 127.0.0.1;
339ACCEPT_FROM6 = ::1; 320ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
346PORT = 20054 327PORT = 20054
347HOSTNAME = localhost 328HOSTNAME = localhost
348HOME = $SERVICEHOME 329HOME = $SERVICEHOME
349CONFIG = $DEFAULTCONFIG
350BINARY = gnunet-service-dht 330BINARY = gnunet-service-dht
351ACCEPT_FROM = 127.0.0.1; 331ACCEPT_FROM = 127.0.0.1;
352ACCEPT_FROM6 = ::1; 332ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index e3c30f783..8d4c7e3e8 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client/ 2SERVICEHOME = /tmp/c_no_nat_client/
3DEFAULTCONFIG = confs/c_no_nat_client.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 0 16PORT = 0
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-dns 19BINARY = gnunet-service-dns
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
28PORT = 20035 26PORT = 20035
29HOSTNAME = localhost 27HOSTNAME = localhost
30HOME = $SERVICEHOME 28HOME = $SERVICEHOME
31CONFIG = $DEFAULTCONFIG
32BINARY = gnunet-service-resolver 29BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1; 30ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1; 31ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
41PORT = 20034 38PORT = 20034
42HOSTNAME = localhost 39HOSTNAME = localhost
43HOME = $SERVICEHOME 40HOME = $SERVICEHOME
44CONFIG = $DEFAULTCONFIG
45BINARY = gnunet-service-mesh 41BINARY = gnunet-service-mesh
46ACCEPT_FROM = 127.0.0.1; 42ACCEPT_FROM = 127.0.0.1;
47ACCEPT_FROM6 = ::1; 43ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
54PORT = 20033 50PORT = 20033
55HOSTNAME = localhost 51HOSTNAME = localhost
56HOME = $SERVICEHOME 52HOME = $SERVICEHOME
57CONFIG = $DEFAULTCONFIG
58BINARY = gnunet-service-nse 53BINARY = gnunet-service-nse
59ACCEPT_FROM = 127.0.0.1; 54ACCEPT_FROM = 127.0.0.1;
60ACCEPT_FROM6 = ::1; 55ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
73AUTOCONNECT = YES 68AUTOCONNECT = YES
74TARGET-CONNECTION-COUNT = 16 69TARGET-CONNECTION-COUNT = 16
75FRIENDS = $SERVICEHOME/friends 70FRIENDS = $SERVICEHOME/friends
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-daemon-topology 71BINARY = gnunet-daemon-topology
78 72
79[datastore] 73[datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
84PORT = 20032 78PORT = 20032
85HOSTNAME = localhost 79HOSTNAME = localhost
86HOME = $SERVICEHOME 80HOME = $SERVICEHOME
87CONFIG = $DEFAULTCONFIG
88BINARY = gnunet-service-datastore 81BINARY = gnunet-service-datastore
89ACCEPT_FROM = 127.0.0.1; 82ACCEPT_FROM = 127.0.0.1;
90ACCEPT_FROM6 = ::1; 83ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
107PORT = 20031 100PORT = 20031
108HOSTNAME = localhost 101HOSTNAME = localhost
109HOME = $SERVICEHOME 102HOME = $SERVICEHOME
110CONFIG = $DEFAULTCONFIG
111BINARY = gnunet-service-peerinfo 103BINARY = gnunet-service-peerinfo
112ACCEPT_FROM = 127.0.0.1; 104ACCEPT_FROM = 127.0.0.1;
113ACCEPT_FROM6 = ::1; 105ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20030 123PORT = 20030
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@ AUTOSTART = YES
155PORT = 20029 146PORT = 20029
156HOSTNAME = localhost 147HOSTNAME = localhost
157HOME = $SERVICEHOME 148HOME = $SERVICEHOME
158CONFIG = $DEFAULTCONFIG
159BINARY = gnunet-service-transport 149BINARY = gnunet-service-transport
160NEIGHBOUR_LIMIT = 50 150NEIGHBOUR_LIMIT = 50
161ACCEPT_FROM = 127.0.0.1; 151ACCEPT_FROM = 127.0.0.1;
@@ -207,7 +197,6 @@ AUTOSTART = NO
207PORT = 20024 197PORT = 20024
208HOSTNAME = localhost 198HOSTNAME = localhost
209HOME = $SERVICEHOME 199HOME = $SERVICEHOME
210CONFIG = $DEFAULTCONFIG
211BINARY = gnunet-service-template 200BINARY = gnunet-service-template
212ACCEPT_FROM = 127.0.0.1; 201ACCEPT_FROM = 127.0.0.1;
213ACCEPT_FROM6 = ::1; 202ACCEPT_FROM6 = ::1;
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
225PORT = 20023 214PORT = 20023
226HOSTNAME = localhost 215HOSTNAME = localhost
227HOME = $SERVICEHOME 216HOME = $SERVICEHOME
228CONFIG = $DEFAULTCONFIG
229BINARY = gnunet-service-fs 217BINARY = gnunet-service-fs
230ACCEPT_FROM = 127.0.0.1; 218ACCEPT_FROM = 127.0.0.1;
231ACCEPT_FROM6 = ::1; 219ACCEPT_FROM6 = ::1;
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms
240EXPECTED_NEIGHBOUR_COUNT = 128 228EXPECTED_NEIGHBOUR_COUNT = 128
241 229
242[vpn] 230[vpn]
243CONFIG = $DEFAULTCONFIG
244BINARY = gnunet-daemon-vpn 231BINARY = gnunet-daemon-vpn
245IPV6ADDR = 1234::1 232IPV6ADDR = 1234::1
246IPV6PREFIX = 32 233IPV6PREFIX = 32
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17
251IFNAME = vpn-gnunet 238IFNAME = vpn-gnunet
252 239
253[exit] 240[exit]
254CONFIG = $DEFAULTCONFIG
255BINARY = gnunet-daemon-exit 241BINARY = gnunet-daemon-exit
256IPV6ADDR = 1234:1::1 242IPV6ADDR = 1234:1::1
257IPV6PREFIX = 32 243IPV6PREFIX = 32
@@ -266,7 +252,6 @@ AUTOSTART = YES
266PORT = 0 252PORT = 0
267HOSTNAME = localhost 253HOSTNAME = localhost
268HOME = $SERVICEHOME 254HOME = $SERVICEHOME
269CONFIG = $DEFAULTCONFIG
270BINARY = gnunet-service-dns 255BINARY = gnunet-service-dns
271ACCEPT_FROM = 127.0.0.1; 256ACCEPT_FROM = 127.0.0.1;
272ACCEPT_FROM6 = ::1; 257ACCEPT_FROM6 = ::1;
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO
277PORT = 20022 262PORT = 20022
278HOSTNAME = localhost 263HOSTNAME = localhost
279HOME = $SERVICEHOME 264HOME = $SERVICEHOME
280CONFIG = $DEFAULTCONFIG
281BINARY = gnunet-service-arm 265BINARY = gnunet-service-arm
282ACCEPT_FROM = 127.0.0.1; 266ACCEPT_FROM = 127.0.0.1;
283ACCEPT_FROM6 = ::1; 267ACCEPT_FROM6 = ::1;
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES
290HTTPPORT = 8080 274HTTPPORT = 8080
291HOME = $SERVICEHOME 275HOME = $SERVICEHOME
292HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 276HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
293CONFIG = $DEFAULTCONFIG
294BINARY = gnunet-daemon-hostlist 277BINARY = gnunet-daemon-hostlist
295OPTIONS = -b 278OPTIONS = -b
296SERVERS = http://localhost:8080/ 279SERVERS = http://localhost:8080/
@@ -301,7 +284,6 @@ AUTOSTART = YES
301PORT = 20021 284PORT = 20021
302HOSTNAME = localhost 285HOSTNAME = localhost
303HOME = $SERVICEHOME 286HOME = $SERVICEHOME
304CONFIG = $DEFAULTCONFIG
305BINARY = gnunet-service-core 287BINARY = gnunet-service-core
306ACCEPT_FROM = 127.0.0.1; 288ACCEPT_FROM = 127.0.0.1;
307ACCEPT_FROM6 = ::1; 289ACCEPT_FROM6 = ::1;
@@ -335,7 +317,6 @@ AUTOSTART = YES
335PORT = 20019 317PORT = 20019
336HOSTNAME = localhost 318HOSTNAME = localhost
337HOME = $SERVICEHOME 319HOME = $SERVICEHOME
338CONFIG = $DEFAULTCONFIG
339BINARY = gnunet-service-statistics 320BINARY = gnunet-service-statistics
340ACCEPT_FROM = 127.0.0.1; 321ACCEPT_FROM = 127.0.0.1;
341ACCEPT_FROM6 = ::1; 322ACCEPT_FROM6 = ::1;
@@ -348,7 +329,6 @@ AUTOSTART = YES
348PORT = 20018 329PORT = 20018
349HOSTNAME = localhost 330HOSTNAME = localhost
350HOME = $SERVICEHOME 331HOME = $SERVICEHOME
351CONFIG = $DEFAULTCONFIG
352BINARY = gnunet-service-dht 332BINARY = gnunet-service-dht
353ACCEPT_FROM = 127.0.0.1; 333ACCEPT_FROM = 127.0.0.1;
354ACCEPT_FROM6 = ::1; 334ACCEPT_FROM6 = ::1;
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 2ea3a9f6d..96d391b3d 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client_2/ 2SERVICEHOME = /tmp/c_no_nat_client_2/
3DEFAULTCONFIG = confs/c_no_nat_client_2.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
11PORT = 20053 10PORT = 20053
12HOSTNAME = localhost 11HOSTNAME = localhost
13HOME = $SERVICEHOME 12HOME = $SERVICEHOME
14CONFIG = $DEFAULTCONFIG
15BINARY = gnunet-service-resolver 13BINARY = gnunet-service-resolver
16ACCEPT_FROM = 127.0.0.1; 14ACCEPT_FROM = 127.0.0.1;
17ACCEPT_FROM6 = ::1; 15ACCEPT_FROM6 = ::1;
@@ -24,7 +22,6 @@ AUTOSTART = YES
24PORT = 20052 22PORT = 20052
25HOSTNAME = localhost 23HOSTNAME = localhost
26HOME = $SERVICEHOME 24HOME = $SERVICEHOME
27CONFIG = $DEFAULTCONFIG
28BINARY = gnunet-service-mesh 25BINARY = gnunet-service-mesh
29ACCEPT_FROM = 127.0.0.1; 26ACCEPT_FROM = 127.0.0.1;
30ACCEPT_FROM6 = ::1; 27ACCEPT_FROM6 = ::1;
@@ -37,7 +34,6 @@ AUTOSTART = YES
37PORT = 20051 34PORT = 20051
38HOSTNAME = localhost 35HOSTNAME = localhost
39HOME = $SERVICEHOME 36HOME = $SERVICEHOME
40CONFIG = $DEFAULTCONFIG
41BINARY = gnunet-service-nse 37BINARY = gnunet-service-nse
42ACCEPT_FROM = 127.0.0.1; 38ACCEPT_FROM = 127.0.0.1;
43ACCEPT_FROM6 = ::1; 39ACCEPT_FROM6 = ::1;
@@ -56,7 +52,6 @@ FRIENDS-ONLY = NO
56AUTOCONNECT = YES 52AUTOCONNECT = YES
57TARGET-CONNECTION-COUNT = 16 53TARGET-CONNECTION-COUNT = 16
58FRIENDS = $SERVICEHOME/friends 54FRIENDS = $SERVICEHOME/friends
59CONFIG = $DEFAULTCONFIG
60BINARY = gnunet-daemon-topology 55BINARY = gnunet-daemon-topology
61 56
62[datastore] 57[datastore]
@@ -67,7 +62,6 @@ UNIX_MATCH_GID = YES
67PORT = 20050 62PORT = 20050
68HOSTNAME = localhost 63HOSTNAME = localhost
69HOME = $SERVICEHOME 64HOME = $SERVICEHOME
70CONFIG = $DEFAULTCONFIG
71BINARY = gnunet-service-datastore 65BINARY = gnunet-service-datastore
72ACCEPT_FROM = 127.0.0.1; 66ACCEPT_FROM = 127.0.0.1;
73ACCEPT_FROM6 = ::1; 67ACCEPT_FROM6 = ::1;
@@ -90,7 +84,6 @@ AUTOSTART = YES
90PORT = 20049 84PORT = 20049
91HOSTNAME = localhost 85HOSTNAME = localhost
92HOME = $SERVICEHOME 86HOME = $SERVICEHOME
93CONFIG = $DEFAULTCONFIG
94BINARY = gnunet-service-peerinfo 87BINARY = gnunet-service-peerinfo
95ACCEPT_FROM = 127.0.0.1; 88ACCEPT_FROM = 127.0.0.1;
96ACCEPT_FROM6 = ::1; 89ACCEPT_FROM6 = ::1;
@@ -114,7 +107,6 @@ AUTOSTART = YES
114PORT = 20048 107PORT = 20048
115HOSTNAME = localhost 108HOSTNAME = localhost
116HOME = $SERVICEHOME 109HOME = $SERVICEHOME
117CONFIG = $DEFAULTCONFIG
118BINARY = gnunet-service-ats 110BINARY = gnunet-service-ats
119ACCEPT_FROM = 127.0.0.1; 111ACCEPT_FROM = 127.0.0.1;
120ACCEPT_FROM6 = ::1; 112ACCEPT_FROM6 = ::1;
@@ -136,7 +128,6 @@ AUTOSTART = YES
136PORT = 20047 128PORT = 20047
137HOSTNAME = localhost 129HOSTNAME = localhost
138HOME = $SERVICEHOME 130HOME = $SERVICEHOME
139CONFIG = $DEFAULTCONFIG
140BINARY = gnunet-service-transport 131BINARY = gnunet-service-transport
141NEIGHBOUR_LIMIT = 50 132NEIGHBOUR_LIMIT = 50
142ACCEPT_FROM = 127.0.0.1; 133ACCEPT_FROM = 127.0.0.1;
@@ -188,7 +179,6 @@ AUTOSTART = NO
188PORT = 20042 179PORT = 20042
189HOSTNAME = localhost 180HOSTNAME = localhost
190HOME = $SERVICEHOME 181HOME = $SERVICEHOME
191CONFIG = $DEFAULTCONFIG
192BINARY = gnunet-service-template 182BINARY = gnunet-service-template
193ACCEPT_FROM = 127.0.0.1; 183ACCEPT_FROM = 127.0.0.1;
194ACCEPT_FROM6 = ::1; 184ACCEPT_FROM6 = ::1;
@@ -206,7 +196,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
206PORT = 20041 196PORT = 20041
207HOSTNAME = localhost 197HOSTNAME = localhost
208HOME = $SERVICEHOME 198HOME = $SERVICEHOME
209CONFIG = $DEFAULTCONFIG
210BINARY = gnunet-service-fs 199BINARY = gnunet-service-fs
211ACCEPT_FROM = 127.0.0.1; 200ACCEPT_FROM = 127.0.0.1;
212ACCEPT_FROM6 = ::1; 201ACCEPT_FROM6 = ::1;
@@ -221,7 +210,6 @@ MIN_MIGRATION_DELAY = 100 ms
221EXPECTED_NEIGHBOUR_COUNT = 128 210EXPECTED_NEIGHBOUR_COUNT = 128
222 211
223[vpn] 212[vpn]
224CONFIG = $DEFAULTCONFIG
225BINARY = gnunet-daemon-vpn 213BINARY = gnunet-daemon-vpn
226IPV6ADDR = 1234::1 214IPV6ADDR = 1234::1
227IPV6PREFIX = 32 215IPV6PREFIX = 32
@@ -232,7 +220,6 @@ VIRTDNS6 = 1234::17
232IFNAME = vpn-gnunet 220IFNAME = vpn-gnunet
233 221
234[exit] 222[exit]
235CONFIG = $DEFAULTCONFIG
236BINARY = gnunet-daemon-exit 223BINARY = gnunet-daemon-exit
237IPV6ADDR = 1234:1::1 224IPV6ADDR = 1234:1::1
238IPV6PREFIX = 32 225IPV6PREFIX = 32
@@ -247,7 +234,6 @@ AUTOSTART = YES
247PORT = 0 234PORT = 0
248HOSTNAME = localhost 235HOSTNAME = localhost
249HOME = $SERVICEHOME 236HOME = $SERVICEHOME
250CONFIG = $DEFAULTCONFIG
251BINARY = gnunet-service-dns 237BINARY = gnunet-service-dns
252ACCEPT_FROM = 127.0.0.1; 238ACCEPT_FROM = 127.0.0.1;
253ACCEPT_FROM6 = ::1; 239ACCEPT_FROM6 = ::1;
@@ -258,7 +244,6 @@ PROVIDE_EXIT = NO
258PORT = 20040 244PORT = 20040
259HOSTNAME = localhost 245HOSTNAME = localhost
260HOME = $SERVICEHOME 246HOME = $SERVICEHOME
261CONFIG = $DEFAULTCONFIG
262BINARY = gnunet-service-arm 247BINARY = gnunet-service-arm
263ACCEPT_FROM = 127.0.0.1; 248ACCEPT_FROM = 127.0.0.1;
264ACCEPT_FROM6 = ::1; 249ACCEPT_FROM6 = ::1;
@@ -271,7 +256,6 @@ UNIX_MATCH_GID = YES
271HTTPPORT = 8080 256HTTPPORT = 8080
272HOME = $SERVICEHOME 257HOME = $SERVICEHOME
273HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 258HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
274CONFIG = $DEFAULTCONFIG
275BINARY = gnunet-daemon-hostlist 259BINARY = gnunet-daemon-hostlist
276OPTIONS = -b 260OPTIONS = -b
277SERVERS = http://localhost:8080/ 261SERVERS = http://localhost:8080/
@@ -282,7 +266,6 @@ AUTOSTART = YES
282PORT = 20039 266PORT = 20039
283HOSTNAME = localhost 267HOSTNAME = localhost
284HOME = $SERVICEHOME 268HOME = $SERVICEHOME
285CONFIG = $DEFAULTCONFIG
286BINARY = gnunet-service-core 269BINARY = gnunet-service-core
287ACCEPT_FROM = 127.0.0.1; 270ACCEPT_FROM = 127.0.0.1;
288ACCEPT_FROM6 = ::1; 271ACCEPT_FROM6 = ::1;
@@ -316,7 +299,6 @@ AUTOSTART = YES
316PORT = 20037 299PORT = 20037
317HOSTNAME = localhost 300HOSTNAME = localhost
318HOME = $SERVICEHOME 301HOME = $SERVICEHOME
319CONFIG = $DEFAULTCONFIG
320BINARY = gnunet-service-statistics 302BINARY = gnunet-service-statistics
321ACCEPT_FROM = 127.0.0.1; 303ACCEPT_FROM = 127.0.0.1;
322ACCEPT_FROM6 = ::1; 304ACCEPT_FROM6 = ::1;
@@ -329,7 +311,6 @@ AUTOSTART = YES
329PORT = 20036 311PORT = 20036
330HOSTNAME = localhost 312HOSTNAME = localhost
331HOME = $SERVICEHOME 313HOME = $SERVICEHOME
332CONFIG = $DEFAULTCONFIG
333BINARY = gnunet-service-dht 314BINARY = gnunet-service-dht
334ACCEPT_FROM = 127.0.0.1; 315ACCEPT_FROM = 127.0.0.1;
335ACCEPT_FROM6 = ::1; 316ACCEPT_FROM6 = ::1;
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 0ed1aee8f..523a4fdcf 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client/ 2SERVICEHOME = /tmp/c_no_nat_client/
3DEFAULTCONFIG = confs/c_no_nat_client_http.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 0 16PORT = 0
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-dns 19BINARY = gnunet-service-dns
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
28PORT = 20035 26PORT = 20035
29HOSTNAME = localhost 27HOSTNAME = localhost
30HOME = $SERVICEHOME 28HOME = $SERVICEHOME
31CONFIG = $DEFAULTCONFIG
32BINARY = gnunet-service-resolver 29BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1; 30ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1; 31ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
41PORT = 20034 38PORT = 20034
42HOSTNAME = localhost 39HOSTNAME = localhost
43HOME = $SERVICEHOME 40HOME = $SERVICEHOME
44CONFIG = $DEFAULTCONFIG
45BINARY = gnunet-service-mesh 41BINARY = gnunet-service-mesh
46ACCEPT_FROM = 127.0.0.1; 42ACCEPT_FROM = 127.0.0.1;
47ACCEPT_FROM6 = ::1; 43ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
54PORT = 20033 50PORT = 20033
55HOSTNAME = localhost 51HOSTNAME = localhost
56HOME = $SERVICEHOME 52HOME = $SERVICEHOME
57CONFIG = $DEFAULTCONFIG
58BINARY = gnunet-service-nse 53BINARY = gnunet-service-nse
59ACCEPT_FROM = 127.0.0.1; 54ACCEPT_FROM = 127.0.0.1;
60ACCEPT_FROM6 = ::1; 55ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
73AUTOCONNECT = YES 68AUTOCONNECT = YES
74TARGET-CONNECTION-COUNT = 16 69TARGET-CONNECTION-COUNT = 16
75FRIENDS = $SERVICEHOME/friends 70FRIENDS = $SERVICEHOME/friends
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-daemon-topology 71BINARY = gnunet-daemon-topology
78 72
79[datastore] 73[datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
84PORT = 20032 78PORT = 20032
85HOSTNAME = localhost 79HOSTNAME = localhost
86HOME = $SERVICEHOME 80HOME = $SERVICEHOME
87CONFIG = $DEFAULTCONFIG
88BINARY = gnunet-service-datastore 81BINARY = gnunet-service-datastore
89ACCEPT_FROM = 127.0.0.1; 82ACCEPT_FROM = 127.0.0.1;
90ACCEPT_FROM6 = ::1; 83ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
107PORT = 20031 100PORT = 20031
108HOSTNAME = localhost 101HOSTNAME = localhost
109HOME = $SERVICEHOME 102HOME = $SERVICEHOME
110CONFIG = $DEFAULTCONFIG
111BINARY = gnunet-service-peerinfo 103BINARY = gnunet-service-peerinfo
112ACCEPT_FROM = 127.0.0.1; 104ACCEPT_FROM = 127.0.0.1;
113ACCEPT_FROM6 = ::1; 105ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20030 123PORT = 20030
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@ AUTOSTART = YES
155PORT = 20029 146PORT = 20029
156HOSTNAME = localhost 147HOSTNAME = localhost
157HOME = $SERVICEHOME 148HOME = $SERVICEHOME
158CONFIG = $DEFAULTCONFIG
159BINARY = gnunet-service-transport 149BINARY = gnunet-service-transport
160NEIGHBOUR_LIMIT = 50 150NEIGHBOUR_LIMIT = 50
161ACCEPT_FROM = 127.0.0.1; 151ACCEPT_FROM = 127.0.0.1;
@@ -207,7 +197,6 @@ AUTOSTART = NO
207PORT = 20024 197PORT = 20024
208HOSTNAME = localhost 198HOSTNAME = localhost
209HOME = $SERVICEHOME 199HOME = $SERVICEHOME
210CONFIG = $DEFAULTCONFIG
211BINARY = gnunet-service-template 200BINARY = gnunet-service-template
212ACCEPT_FROM = 127.0.0.1; 201ACCEPT_FROM = 127.0.0.1;
213ACCEPT_FROM6 = ::1; 202ACCEPT_FROM6 = ::1;
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
225PORT = 20023 214PORT = 20023
226HOSTNAME = localhost 215HOSTNAME = localhost
227HOME = $SERVICEHOME 216HOME = $SERVICEHOME
228CONFIG = $DEFAULTCONFIG
229BINARY = gnunet-service-fs 217BINARY = gnunet-service-fs
230ACCEPT_FROM = 127.0.0.1; 218ACCEPT_FROM = 127.0.0.1;
231ACCEPT_FROM6 = ::1; 219ACCEPT_FROM6 = ::1;
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms
240EXPECTED_NEIGHBOUR_COUNT = 128 228EXPECTED_NEIGHBOUR_COUNT = 128
241 229
242[vpn] 230[vpn]
243CONFIG = $DEFAULTCONFIG
244BINARY = gnunet-daemon-vpn 231BINARY = gnunet-daemon-vpn
245IPV6ADDR = 1234::1 232IPV6ADDR = 1234::1
246IPV6PREFIX = 32 233IPV6PREFIX = 32
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17
251IFNAME = vpn-gnunet 238IFNAME = vpn-gnunet
252 239
253[exit] 240[exit]
254CONFIG = $DEFAULTCONFIG
255BINARY = gnunet-daemon-exit 241BINARY = gnunet-daemon-exit
256IPV6ADDR = 1234:1::1 242IPV6ADDR = 1234:1::1
257IPV6PREFIX = 32 243IPV6PREFIX = 32
@@ -266,7 +252,6 @@ AUTOSTART = YES
266PORT = 0 252PORT = 0
267HOSTNAME = localhost 253HOSTNAME = localhost
268HOME = $SERVICEHOME 254HOME = $SERVICEHOME
269CONFIG = $DEFAULTCONFIG
270BINARY = gnunet-service-dns 255BINARY = gnunet-service-dns
271ACCEPT_FROM = 127.0.0.1; 256ACCEPT_FROM = 127.0.0.1;
272ACCEPT_FROM6 = ::1; 257ACCEPT_FROM6 = ::1;
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO
277PORT = 20022 262PORT = 20022
278HOSTNAME = localhost 263HOSTNAME = localhost
279HOME = $SERVICEHOME 264HOME = $SERVICEHOME
280CONFIG = $DEFAULTCONFIG
281BINARY = gnunet-service-arm 265BINARY = gnunet-service-arm
282ACCEPT_FROM = 127.0.0.1; 266ACCEPT_FROM = 127.0.0.1;
283ACCEPT_FROM6 = ::1; 267ACCEPT_FROM6 = ::1;
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES
290HTTPPORT = 8080 274HTTPPORT = 8080
291HOME = $SERVICEHOME 275HOME = $SERVICEHOME
292HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 276HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
293CONFIG = $DEFAULTCONFIG
294BINARY = gnunet-daemon-hostlist 277BINARY = gnunet-daemon-hostlist
295OPTIONS = -b 278OPTIONS = -b
296SERVERS = http://localhost:8080/ 279SERVERS = http://localhost:8080/
@@ -301,7 +284,6 @@ AUTOSTART = YES
301PORT = 20021 284PORT = 20021
302HOSTNAME = localhost 285HOSTNAME = localhost
303HOME = $SERVICEHOME 286HOME = $SERVICEHOME
304CONFIG = $DEFAULTCONFIG
305BINARY = gnunet-service-core 287BINARY = gnunet-service-core
306ACCEPT_FROM = 127.0.0.1; 288ACCEPT_FROM = 127.0.0.1;
307ACCEPT_FROM6 = ::1; 289ACCEPT_FROM6 = ::1;
@@ -335,7 +317,6 @@ AUTOSTART = YES
335PORT = 20019 317PORT = 20019
336HOSTNAME = localhost 318HOSTNAME = localhost
337HOME = $SERVICEHOME 319HOME = $SERVICEHOME
338CONFIG = $DEFAULTCONFIG
339BINARY = gnunet-service-statistics 320BINARY = gnunet-service-statistics
340ACCEPT_FROM = 127.0.0.1; 321ACCEPT_FROM = 127.0.0.1;
341ACCEPT_FROM6 = ::1; 322ACCEPT_FROM6 = ::1;
@@ -348,7 +329,6 @@ AUTOSTART = YES
348PORT = 20018 329PORT = 20018
349HOSTNAME = localhost 330HOSTNAME = localhost
350HOME = $SERVICEHOME 331HOME = $SERVICEHOME
351CONFIG = $DEFAULTCONFIG
352BINARY = gnunet-service-dht 332BINARY = gnunet-service-dht
353ACCEPT_FROM = 127.0.0.1; 333ACCEPT_FROM = 127.0.0.1;
354ACCEPT_FROM6 = ::1; 334ACCEPT_FROM6 = ::1;
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 47c861a72..1f7f08523 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
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client_2/ 2SERVICEHOME = /tmp/c_no_nat_client_2/
3DEFAULTCONFIG = confs/c_no_nat_client_http_2.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 20053 16PORT = 20053
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-resolver 19BINARY = gnunet-service-resolver
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -30,7 +28,6 @@ AUTOSTART = YES
30PORT = 20052 28PORT = 20052
31HOSTNAME = localhost 29HOSTNAME = localhost
32HOME = $SERVICEHOME 30HOME = $SERVICEHOME
33CONFIG = $DEFAULTCONFIG
34BINARY = gnunet-service-mesh 31BINARY = gnunet-service-mesh
35ACCEPT_FROM = 127.0.0.1; 32ACCEPT_FROM = 127.0.0.1;
36ACCEPT_FROM6 = ::1; 33ACCEPT_FROM6 = ::1;
@@ -43,7 +40,6 @@ AUTOSTART = YES
43PORT = 20051 40PORT = 20051
44HOSTNAME = localhost 41HOSTNAME = localhost
45HOME = $SERVICEHOME 42HOME = $SERVICEHOME
46CONFIG = $DEFAULTCONFIG
47BINARY = gnunet-service-nse 43BINARY = gnunet-service-nse
48ACCEPT_FROM = 127.0.0.1; 44ACCEPT_FROM = 127.0.0.1;
49ACCEPT_FROM6 = ::1; 45ACCEPT_FROM6 = ::1;
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO
62AUTOCONNECT = YES 58AUTOCONNECT = YES
63TARGET-CONNECTION-COUNT = 16 59TARGET-CONNECTION-COUNT = 16
64FRIENDS = $SERVICEHOME/friends 60FRIENDS = $SERVICEHOME/friends
65CONFIG = $DEFAULTCONFIG
66BINARY = gnunet-daemon-topology 61BINARY = gnunet-daemon-topology
67 62
68[datastore] 63[datastore]
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES
73PORT = 20050 68PORT = 20050
74HOSTNAME = localhost 69HOSTNAME = localhost
75HOME = $SERVICEHOME 70HOME = $SERVICEHOME
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-service-datastore 71BINARY = gnunet-service-datastore
78ACCEPT_FROM = 127.0.0.1; 72ACCEPT_FROM = 127.0.0.1;
79ACCEPT_FROM6 = ::1; 73ACCEPT_FROM6 = ::1;
@@ -96,7 +90,6 @@ AUTOSTART = YES
96PORT = 20049 90PORT = 20049
97HOSTNAME = localhost 91HOSTNAME = localhost
98HOME = $SERVICEHOME 92HOME = $SERVICEHOME
99CONFIG = $DEFAULTCONFIG
100BINARY = gnunet-service-peerinfo 93BINARY = gnunet-service-peerinfo
101ACCEPT_FROM = 127.0.0.1; 94ACCEPT_FROM = 127.0.0.1;
102ACCEPT_FROM6 = ::1; 95ACCEPT_FROM6 = ::1;
@@ -120,7 +113,6 @@ AUTOSTART = YES
120PORT = 20048 113PORT = 20048
121HOSTNAME = localhost 114HOSTNAME = localhost
122HOME = $SERVICEHOME 115HOME = $SERVICEHOME
123CONFIG = $DEFAULTCONFIG
124BINARY = gnunet-service-ats 116BINARY = gnunet-service-ats
125ACCEPT_FROM = 127.0.0.1; 117ACCEPT_FROM = 127.0.0.1;
126ACCEPT_FROM6 = ::1; 118ACCEPT_FROM6 = ::1;
@@ -144,7 +136,6 @@ AUTOSTART = YES
144PORT = 20047 136PORT = 20047
145HOSTNAME = localhost 137HOSTNAME = localhost
146HOME = $SERVICEHOME 138HOME = $SERVICEHOME
147CONFIG = $DEFAULTCONFIG
148BINARY = gnunet-service-transport 139BINARY = gnunet-service-transport
149NEIGHBOUR_LIMIT = 50 140NEIGHBOUR_LIMIT = 50
150ACCEPT_FROM = 127.0.0.1; 141ACCEPT_FROM = 127.0.0.1;
@@ -196,7 +187,6 @@ AUTOSTART = NO
196PORT = 20042 187PORT = 20042
197HOSTNAME = localhost 188HOSTNAME = localhost
198HOME = $SERVICEHOME 189HOME = $SERVICEHOME
199CONFIG = $DEFAULTCONFIG
200BINARY = gnunet-service-template 190BINARY = gnunet-service-template
201ACCEPT_FROM = 127.0.0.1; 191ACCEPT_FROM = 127.0.0.1;
202ACCEPT_FROM6 = ::1; 192ACCEPT_FROM6 = ::1;
@@ -214,7 +204,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
214PORT = 20041 204PORT = 20041
215HOSTNAME = localhost 205HOSTNAME = localhost
216HOME = $SERVICEHOME 206HOME = $SERVICEHOME
217CONFIG = $DEFAULTCONFIG
218BINARY = gnunet-service-fs 207BINARY = gnunet-service-fs
219ACCEPT_FROM = 127.0.0.1; 208ACCEPT_FROM = 127.0.0.1;
220ACCEPT_FROM6 = ::1; 209ACCEPT_FROM6 = ::1;
@@ -229,7 +218,6 @@ MIN_MIGRATION_DELAY = 100 ms
229EXPECTED_NEIGHBOUR_COUNT = 128 218EXPECTED_NEIGHBOUR_COUNT = 128
230 219
231[vpn] 220[vpn]
232CONFIG = $DEFAULTCONFIG
233BINARY = gnunet-daemon-vpn 221BINARY = gnunet-daemon-vpn
234IPV6ADDR = 1234::1 222IPV6ADDR = 1234::1
235IPV6PREFIX = 32 223IPV6PREFIX = 32
@@ -240,7 +228,6 @@ VIRTDNS6 = 1234::17
240IFNAME = vpn-gnunet 228IFNAME = vpn-gnunet
241 229
242[exit] 230[exit]
243CONFIG = $DEFAULTCONFIG
244BINARY = gnunet-daemon-exit 231BINARY = gnunet-daemon-exit
245IPV6ADDR = 1234:1::1 232IPV6ADDR = 1234:1::1
246IPV6PREFIX = 32 233IPV6PREFIX = 32
@@ -255,7 +242,6 @@ AUTOSTART = YES
255PORT = 0 242PORT = 0
256HOSTNAME = localhost 243HOSTNAME = localhost
257HOME = $SERVICEHOME 244HOME = $SERVICEHOME
258CONFIG = $DEFAULTCONFIG
259BINARY = gnunet-service-dns 245BINARY = gnunet-service-dns
260ACCEPT_FROM = 127.0.0.1; 246ACCEPT_FROM = 127.0.0.1;
261ACCEPT_FROM6 = ::1; 247ACCEPT_FROM6 = ::1;
@@ -266,7 +252,6 @@ PROVIDE_EXIT = NO
266PORT = 20040 252PORT = 20040
267HOSTNAME = localhost 253HOSTNAME = localhost
268HOME = $SERVICEHOME 254HOME = $SERVICEHOME
269CONFIG = $DEFAULTCONFIG
270BINARY = gnunet-service-arm 255BINARY = gnunet-service-arm
271ACCEPT_FROM = 127.0.0.1; 256ACCEPT_FROM = 127.0.0.1;
272ACCEPT_FROM6 = ::1; 257ACCEPT_FROM6 = ::1;
@@ -279,7 +264,6 @@ UNIX_MATCH_GID = YES
279HTTPPORT = 8080 264HTTPPORT = 8080
280HOME = $SERVICEHOME 265HOME = $SERVICEHOME
281HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 266HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
282CONFIG = $DEFAULTCONFIG
283BINARY = gnunet-daemon-hostlist 267BINARY = gnunet-daemon-hostlist
284OPTIONS = -b 268OPTIONS = -b
285SERVERS = http://localhost:8080/ 269SERVERS = http://localhost:8080/
@@ -290,7 +274,6 @@ AUTOSTART = YES
290PORT = 20039 274PORT = 20039
291HOSTNAME = localhost 275HOSTNAME = localhost
292HOME = $SERVICEHOME 276HOME = $SERVICEHOME
293CONFIG = $DEFAULTCONFIG
294BINARY = gnunet-service-core 277BINARY = gnunet-service-core
295ACCEPT_FROM = 127.0.0.1; 278ACCEPT_FROM = 127.0.0.1;
296ACCEPT_FROM6 = ::1; 279ACCEPT_FROM6 = ::1;
@@ -324,7 +307,6 @@ AUTOSTART = YES
324PORT = 20037 307PORT = 20037
325HOSTNAME = localhost 308HOSTNAME = localhost
326HOME = $SERVICEHOME 309HOME = $SERVICEHOME
327CONFIG = $DEFAULTCONFIG
328BINARY = gnunet-service-statistics 310BINARY = gnunet-service-statistics
329ACCEPT_FROM = 127.0.0.1; 311ACCEPT_FROM = 127.0.0.1;
330ACCEPT_FROM6 = ::1; 312ACCEPT_FROM6 = ::1;
@@ -337,7 +319,6 @@ AUTOSTART = YES
337PORT = 20036 319PORT = 20036
338HOSTNAME = localhost 320HOSTNAME = localhost
339HOME = $SERVICEHOME 321HOME = $SERVICEHOME
340CONFIG = $DEFAULTCONFIG
341BINARY = gnunet-service-dht 322BINARY = gnunet-service-dht
342ACCEPT_FROM = 127.0.0.1; 323ACCEPT_FROM = 127.0.0.1;
343ACCEPT_FROM6 = ::1; 324ACCEPT_FROM6 = ::1;
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 b48042908..62d679fd2 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client/ 2SERVICEHOME = /tmp/c_no_nat_client/
3DEFAULTCONFIG = confs/c_no_nat_client_unix.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 0 16PORT = 0
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-dns 19BINARY = gnunet-service-dns
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
28PORT = 20035 26PORT = 20035
29HOSTNAME = localhost 27HOSTNAME = localhost
30HOME = $SERVICEHOME 28HOME = $SERVICEHOME
31CONFIG = $DEFAULTCONFIG
32BINARY = gnunet-service-resolver 29BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1; 30ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1; 31ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
41PORT = 20034 38PORT = 20034
42HOSTNAME = localhost 39HOSTNAME = localhost
43HOME = $SERVICEHOME 40HOME = $SERVICEHOME
44CONFIG = $DEFAULTCONFIG
45BINARY = gnunet-service-mesh 41BINARY = gnunet-service-mesh
46ACCEPT_FROM = 127.0.0.1; 42ACCEPT_FROM = 127.0.0.1;
47ACCEPT_FROM6 = ::1; 43ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
54PORT = 20033 50PORT = 20033
55HOSTNAME = localhost 51HOSTNAME = localhost
56HOME = $SERVICEHOME 52HOME = $SERVICEHOME
57CONFIG = $DEFAULTCONFIG
58BINARY = gnunet-service-nse 53BINARY = gnunet-service-nse
59ACCEPT_FROM = 127.0.0.1; 54ACCEPT_FROM = 127.0.0.1;
60ACCEPT_FROM6 = ::1; 55ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
73AUTOCONNECT = YES 68AUTOCONNECT = YES
74TARGET-CONNECTION-COUNT = 16 69TARGET-CONNECTION-COUNT = 16
75FRIENDS = $SERVICEHOME/friends 70FRIENDS = $SERVICEHOME/friends
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-daemon-topology 71BINARY = gnunet-daemon-topology
78 72
79[datastore] 73[datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
84PORT = 20032 78PORT = 20032
85HOSTNAME = localhost 79HOSTNAME = localhost
86HOME = $SERVICEHOME 80HOME = $SERVICEHOME
87CONFIG = $DEFAULTCONFIG
88BINARY = gnunet-service-datastore 81BINARY = gnunet-service-datastore
89ACCEPT_FROM = 127.0.0.1; 82ACCEPT_FROM = 127.0.0.1;
90ACCEPT_FROM6 = ::1; 83ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
107PORT = 20031 100PORT = 20031
108HOSTNAME = localhost 101HOSTNAME = localhost
109HOME = $SERVICEHOME 102HOME = $SERVICEHOME
110CONFIG = $DEFAULTCONFIG
111BINARY = gnunet-service-peerinfo 103BINARY = gnunet-service-peerinfo
112ACCEPT_FROM = 127.0.0.1; 104ACCEPT_FROM = 127.0.0.1;
113ACCEPT_FROM6 = ::1; 105ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20030 123PORT = 20030
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@ AUTOSTART = YES
155PORT = 20029 146PORT = 20029
156HOSTNAME = localhost 147HOSTNAME = localhost
157HOME = $SERVICEHOME 148HOME = $SERVICEHOME
158CONFIG = $DEFAULTCONFIG
159BINARY = gnunet-service-transport 149BINARY = gnunet-service-transport
160NEIGHBOUR_LIMIT = 50 150NEIGHBOUR_LIMIT = 50
161ACCEPT_FROM = 127.0.0.1; 151ACCEPT_FROM = 127.0.0.1;
@@ -210,7 +200,6 @@ AUTOSTART = NO
210PORT = 20024 200PORT = 20024
211HOSTNAME = localhost 201HOSTNAME = localhost
212HOME = $SERVICEHOME 202HOME = $SERVICEHOME
213CONFIG = $DEFAULTCONFIG
214BINARY = gnunet-service-template 203BINARY = gnunet-service-template
215ACCEPT_FROM = 127.0.0.1; 204ACCEPT_FROM = 127.0.0.1;
216ACCEPT_FROM6 = ::1; 205ACCEPT_FROM6 = ::1;
@@ -228,7 +217,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
228PORT = 20023 217PORT = 20023
229HOSTNAME = localhost 218HOSTNAME = localhost
230HOME = $SERVICEHOME 219HOME = $SERVICEHOME
231CONFIG = $DEFAULTCONFIG
232BINARY = gnunet-service-fs 220BINARY = gnunet-service-fs
233ACCEPT_FROM = 127.0.0.1; 221ACCEPT_FROM = 127.0.0.1;
234ACCEPT_FROM6 = ::1; 222ACCEPT_FROM6 = ::1;
@@ -243,7 +231,6 @@ MIN_MIGRATION_DELAY = 100 ms
243EXPECTED_NEIGHBOUR_COUNT = 128 231EXPECTED_NEIGHBOUR_COUNT = 128
244 232
245[vpn] 233[vpn]
246CONFIG = $DEFAULTCONFIG
247BINARY = gnunet-daemon-vpn 234BINARY = gnunet-daemon-vpn
248IPV6ADDR = 1234::1 235IPV6ADDR = 1234::1
249IPV6PREFIX = 32 236IPV6PREFIX = 32
@@ -254,7 +241,6 @@ VIRTDNS6 = 1234::17
254IFNAME = vpn-gnunet 241IFNAME = vpn-gnunet
255 242
256[exit] 243[exit]
257CONFIG = $DEFAULTCONFIG
258BINARY = gnunet-daemon-exit 244BINARY = gnunet-daemon-exit
259IPV6ADDR = 1234:1::1 245IPV6ADDR = 1234:1::1
260IPV6PREFIX = 32 246IPV6PREFIX = 32
@@ -269,7 +255,6 @@ AUTOSTART = YES
269PORT = 0 255PORT = 0
270HOSTNAME = localhost 256HOSTNAME = localhost
271HOME = $SERVICEHOME 257HOME = $SERVICEHOME
272CONFIG = $DEFAULTCONFIG
273BINARY = gnunet-service-dns 258BINARY = gnunet-service-dns
274ACCEPT_FROM = 127.0.0.1; 259ACCEPT_FROM = 127.0.0.1;
275ACCEPT_FROM6 = ::1; 260ACCEPT_FROM6 = ::1;
@@ -280,7 +265,6 @@ PROVIDE_EXIT = NO
280PORT = 20022 265PORT = 20022
281HOSTNAME = localhost 266HOSTNAME = localhost
282HOME = $SERVICEHOME 267HOME = $SERVICEHOME
283CONFIG = $DEFAULTCONFIG
284BINARY = gnunet-service-arm 268BINARY = gnunet-service-arm
285ACCEPT_FROM = 127.0.0.1; 269ACCEPT_FROM = 127.0.0.1;
286ACCEPT_FROM6 = ::1; 270ACCEPT_FROM6 = ::1;
@@ -293,7 +277,6 @@ UNIX_MATCH_GID = YES
293HTTPPORT = 8080 277HTTPPORT = 8080
294HOME = $SERVICEHOME 278HOME = $SERVICEHOME
295HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 279HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
296CONFIG = $DEFAULTCONFIG
297BINARY = gnunet-daemon-hostlist 280BINARY = gnunet-daemon-hostlist
298OPTIONS = -b 281OPTIONS = -b
299SERVERS = http://localhost:8080/ 282SERVERS = http://localhost:8080/
@@ -304,7 +287,6 @@ AUTOSTART = YES
304PORT = 20021 287PORT = 20021
305HOSTNAME = localhost 288HOSTNAME = localhost
306HOME = $SERVICEHOME 289HOME = $SERVICEHOME
307CONFIG = $DEFAULTCONFIG
308BINARY = gnunet-service-core 290BINARY = gnunet-service-core
309ACCEPT_FROM = 127.0.0.1; 291ACCEPT_FROM = 127.0.0.1;
310ACCEPT_FROM6 = ::1; 292ACCEPT_FROM6 = ::1;
@@ -338,7 +320,6 @@ AUTOSTART = YES
338PORT = 20019 320PORT = 20019
339HOSTNAME = localhost 321HOSTNAME = localhost
340HOME = $SERVICEHOME 322HOME = $SERVICEHOME
341CONFIG = $DEFAULTCONFIG
342BINARY = gnunet-service-statistics 323BINARY = gnunet-service-statistics
343ACCEPT_FROM = 127.0.0.1; 324ACCEPT_FROM = 127.0.0.1;
344ACCEPT_FROM6 = ::1; 325ACCEPT_FROM6 = ::1;
@@ -351,7 +332,6 @@ AUTOSTART = YES
351PORT = 20018 332PORT = 20018
352HOSTNAME = localhost 333HOSTNAME = localhost
353HOME = $SERVICEHOME 334HOME = $SERVICEHOME
354CONFIG = $DEFAULTCONFIG
355BINARY = gnunet-service-dht 335BINARY = gnunet-service-dht
356ACCEPT_FROM = 127.0.0.1; 336ACCEPT_FROM = 127.0.0.1;
357ACCEPT_FROM6 = ::1; 337ACCEPT_FROM6 = ::1;
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 ca4da89cb..a4080ab20 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
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client_2/ 2SERVICEHOME = /tmp/c_no_nat_client_2/
3DEFAULTCONFIG = confs/c_no_nat_client_unix_2.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 20053 16PORT = 20053
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-resolver 19BINARY = gnunet-service-resolver
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -30,7 +28,6 @@ AUTOSTART = YES
30PORT = 20052 28PORT = 20052
31HOSTNAME = localhost 29HOSTNAME = localhost
32HOME = $SERVICEHOME 30HOME = $SERVICEHOME
33CONFIG = $DEFAULTCONFIG
34BINARY = gnunet-service-mesh 31BINARY = gnunet-service-mesh
35ACCEPT_FROM = 127.0.0.1; 32ACCEPT_FROM = 127.0.0.1;
36ACCEPT_FROM6 = ::1; 33ACCEPT_FROM6 = ::1;
@@ -43,7 +40,6 @@ AUTOSTART = YES
43PORT = 20051 40PORT = 20051
44HOSTNAME = localhost 41HOSTNAME = localhost
45HOME = $SERVICEHOME 42HOME = $SERVICEHOME
46CONFIG = $DEFAULTCONFIG
47BINARY = gnunet-service-nse 43BINARY = gnunet-service-nse
48ACCEPT_FROM = 127.0.0.1; 44ACCEPT_FROM = 127.0.0.1;
49ACCEPT_FROM6 = ::1; 45ACCEPT_FROM6 = ::1;
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO
62AUTOCONNECT = YES 58AUTOCONNECT = YES
63TARGET-CONNECTION-COUNT = 16 59TARGET-CONNECTION-COUNT = 16
64FRIENDS = $SERVICEHOME/friends 60FRIENDS = $SERVICEHOME/friends
65CONFIG = $DEFAULTCONFIG
66BINARY = gnunet-daemon-topology 61BINARY = gnunet-daemon-topology
67 62
68[datastore] 63[datastore]
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES
73PORT = 20050 68PORT = 20050
74HOSTNAME = localhost 69HOSTNAME = localhost
75HOME = $SERVICEHOME 70HOME = $SERVICEHOME
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-service-datastore 71BINARY = gnunet-service-datastore
78ACCEPT_FROM = 127.0.0.1; 72ACCEPT_FROM = 127.0.0.1;
79ACCEPT_FROM6 = ::1; 73ACCEPT_FROM6 = ::1;
@@ -96,7 +90,6 @@ AUTOSTART = YES
96PORT = 20049 90PORT = 20049
97HOSTNAME = localhost 91HOSTNAME = localhost
98HOME = $SERVICEHOME 92HOME = $SERVICEHOME
99CONFIG = $DEFAULTCONFIG
100BINARY = gnunet-service-peerinfo 93BINARY = gnunet-service-peerinfo
101ACCEPT_FROM = 127.0.0.1; 94ACCEPT_FROM = 127.0.0.1;
102ACCEPT_FROM6 = ::1; 95ACCEPT_FROM6 = ::1;
@@ -120,7 +113,6 @@ AUTOSTART = YES
120PORT = 20048 113PORT = 20048
121HOSTNAME = localhost 114HOSTNAME = localhost
122HOME = $SERVICEHOME 115HOME = $SERVICEHOME
123CONFIG = $DEFAULTCONFIG
124BINARY = gnunet-service-ats 116BINARY = gnunet-service-ats
125ACCEPT_FROM = 127.0.0.1; 117ACCEPT_FROM = 127.0.0.1;
126ACCEPT_FROM6 = ::1; 118ACCEPT_FROM6 = ::1;
@@ -144,7 +136,6 @@ AUTOSTART = YES
144PORT = 20047 136PORT = 20047
145HOSTNAME = localhost 137HOSTNAME = localhost
146HOME = $SERVICEHOME 138HOME = $SERVICEHOME
147CONFIG = $DEFAULTCONFIG
148BINARY = gnunet-service-transport 139BINARY = gnunet-service-transport
149NEIGHBOUR_LIMIT = 50 140NEIGHBOUR_LIMIT = 50
150ACCEPT_FROM = 127.0.0.1; 141ACCEPT_FROM = 127.0.0.1;
@@ -199,7 +190,6 @@ AUTOSTART = NO
199PORT = 20042 190PORT = 20042
200HOSTNAME = localhost 191HOSTNAME = localhost
201HOME = $SERVICEHOME 192HOME = $SERVICEHOME
202CONFIG = $DEFAULTCONFIG
203BINARY = gnunet-service-template 193BINARY = gnunet-service-template
204ACCEPT_FROM = 127.0.0.1; 194ACCEPT_FROM = 127.0.0.1;
205ACCEPT_FROM6 = ::1; 195ACCEPT_FROM6 = ::1;
@@ -217,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
217PORT = 20041 207PORT = 20041
218HOSTNAME = localhost 208HOSTNAME = localhost
219HOME = $SERVICEHOME 209HOME = $SERVICEHOME
220CONFIG = $DEFAULTCONFIG
221BINARY = gnunet-service-fs 210BINARY = gnunet-service-fs
222ACCEPT_FROM = 127.0.0.1; 211ACCEPT_FROM = 127.0.0.1;
223ACCEPT_FROM6 = ::1; 212ACCEPT_FROM6 = ::1;
@@ -232,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms
232EXPECTED_NEIGHBOUR_COUNT = 128 221EXPECTED_NEIGHBOUR_COUNT = 128
233 222
234[vpn] 223[vpn]
235CONFIG = $DEFAULTCONFIG
236BINARY = gnunet-daemon-vpn 224BINARY = gnunet-daemon-vpn
237IPV6ADDR = 1234::1 225IPV6ADDR = 1234::1
238IPV6PREFIX = 32 226IPV6PREFIX = 32
@@ -243,7 +231,6 @@ VIRTDNS6 = 1234::17
243IFNAME = vpn-gnunet 231IFNAME = vpn-gnunet
244 232
245[exit] 233[exit]
246CONFIG = $DEFAULTCONFIG
247BINARY = gnunet-daemon-exit 234BINARY = gnunet-daemon-exit
248IPV6ADDR = 1234:1::1 235IPV6ADDR = 1234:1::1
249IPV6PREFIX = 32 236IPV6PREFIX = 32
@@ -258,7 +245,6 @@ AUTOSTART = YES
258PORT = 0 245PORT = 0
259HOSTNAME = localhost 246HOSTNAME = localhost
260HOME = $SERVICEHOME 247HOME = $SERVICEHOME
261CONFIG = $DEFAULTCONFIG
262BINARY = gnunet-service-dns 248BINARY = gnunet-service-dns
263ACCEPT_FROM = 127.0.0.1; 249ACCEPT_FROM = 127.0.0.1;
264ACCEPT_FROM6 = ::1; 250ACCEPT_FROM6 = ::1;
@@ -269,7 +255,6 @@ PROVIDE_EXIT = NO
269PORT = 20040 255PORT = 20040
270HOSTNAME = localhost 256HOSTNAME = localhost
271HOME = $SERVICEHOME 257HOME = $SERVICEHOME
272CONFIG = $DEFAULTCONFIG
273BINARY = gnunet-service-arm 258BINARY = gnunet-service-arm
274ACCEPT_FROM = 127.0.0.1; 259ACCEPT_FROM = 127.0.0.1;
275ACCEPT_FROM6 = ::1; 260ACCEPT_FROM6 = ::1;
@@ -282,7 +267,6 @@ UNIX_MATCH_GID = YES
282HTTPPORT = 8080 267HTTPPORT = 8080
283HOME = $SERVICEHOME 268HOME = $SERVICEHOME
284HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 269HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
285CONFIG = $DEFAULTCONFIG
286BINARY = gnunet-daemon-hostlist 270BINARY = gnunet-daemon-hostlist
287OPTIONS = -b 271OPTIONS = -b
288SERVERS = http://localhost:8080/ 272SERVERS = http://localhost:8080/
@@ -293,7 +277,6 @@ AUTOSTART = YES
293PORT = 20039 277PORT = 20039
294HOSTNAME = localhost 278HOSTNAME = localhost
295HOME = $SERVICEHOME 279HOME = $SERVICEHOME
296CONFIG = $DEFAULTCONFIG
297BINARY = gnunet-service-core 280BINARY = gnunet-service-core
298ACCEPT_FROM = 127.0.0.1; 281ACCEPT_FROM = 127.0.0.1;
299ACCEPT_FROM6 = ::1; 282ACCEPT_FROM6 = ::1;
@@ -327,7 +310,6 @@ AUTOSTART = YES
327PORT = 20037 310PORT = 20037
328HOSTNAME = localhost 311HOSTNAME = localhost
329HOME = $SERVICEHOME 312HOME = $SERVICEHOME
330CONFIG = $DEFAULTCONFIG
331BINARY = gnunet-service-statistics 313BINARY = gnunet-service-statistics
332ACCEPT_FROM = 127.0.0.1; 314ACCEPT_FROM = 127.0.0.1;
333ACCEPT_FROM6 = ::1; 315ACCEPT_FROM6 = ::1;
@@ -340,7 +322,6 @@ AUTOSTART = YES
340PORT = 20036 322PORT = 20036
341HOSTNAME = localhost 323HOSTNAME = localhost
342HOME = $SERVICEHOME 324HOME = $SERVICEHOME
343CONFIG = $DEFAULTCONFIG
344BINARY = gnunet-service-dht 325BINARY = gnunet-service-dht
345ACCEPT_FROM = 127.0.0.1; 326ACCEPT_FROM = 127.0.0.1;
346ACCEPT_FROM6 = ::1; 327ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index f01cac9d1..d224670fe 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_normal_client 2SERVICEHOME = /tmp/c_normal_client
3DEFAULTCONFIG = confs/c_normal_client_tcp.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = hostkeys/0002-hostkey 5HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
19PORT = 0 18PORT = 0
20HOSTNAME = localhost 19HOSTNAME = localhost
21HOME = $SERVICEHOME 20HOME = $SERVICEHOME
22CONFIG = $DEFAULTCONFIG
23BINARY = gnunet-service-dns 21BINARY = gnunet-service-dns
24ACCEPT_FROM = 127.0.0.1; 22ACCEPT_FROM = 127.0.0.1;
25ACCEPT_FROM6 = ::1; 23ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
31PORT = 20071 29PORT = 20071
32HOSTNAME = localhost 30HOSTNAME = localhost
33HOME = $SERVICEHOME 31HOME = $SERVICEHOME
34CONFIG = $DEFAULTCONFIG
35BINARY = gnunet-service-resolver 32BINARY = gnunet-service-resolver
36ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1; 34ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
44PORT = 20070 41PORT = 20070
45HOSTNAME = localhost 42HOSTNAME = localhost
46HOME = $SERVICEHOME 43HOME = $SERVICEHOME
47CONFIG = $DEFAULTCONFIG
48BINARY = gnunet-service-mesh 44BINARY = gnunet-service-mesh
49ACCEPT_FROM = 127.0.0.1; 45ACCEPT_FROM = 127.0.0.1;
50ACCEPT_FROM6 = ::1; 46ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
57PORT = 20069 53PORT = 20069
58HOSTNAME = localhost 54HOSTNAME = localhost
59HOME = $SERVICEHOME 55HOME = $SERVICEHOME
60CONFIG = $DEFAULTCONFIG
61BINARY = gnunet-service-nse 56BINARY = gnunet-service-nse
62ACCEPT_FROM = 127.0.0.1; 57ACCEPT_FROM = 127.0.0.1;
63ACCEPT_FROM6 = ::1; 58ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
76AUTOCONNECT = YES 71AUTOCONNECT = YES
77TARGET-CONNECTION-COUNT = 16 72TARGET-CONNECTION-COUNT = 16
78FRIENDS = $SERVICEHOME/friends 73FRIENDS = $SERVICEHOME/friends
79CONFIG = $DEFAULTCONFIG
80BINARY = gnunet-daemon-topology 74BINARY = gnunet-daemon-topology
81 75
82[datastore] 76[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
87PORT = 20068 81PORT = 20068
88HOSTNAME = localhost 82HOSTNAME = localhost
89HOME = $SERVICEHOME 83HOME = $SERVICEHOME
90CONFIG = $DEFAULTCONFIG
91BINARY = gnunet-service-datastore 84BINARY = gnunet-service-datastore
92ACCEPT_FROM = 127.0.0.1; 85ACCEPT_FROM = 127.0.0.1;
93ACCEPT_FROM6 = ::1; 86ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
110PORT = 20067 103PORT = 20067
111HOSTNAME = localhost 104HOSTNAME = localhost
112HOME = $SERVICEHOME 105HOME = $SERVICEHOME
113CONFIG = $DEFAULTCONFIG
114BINARY = gnunet-service-peerinfo 106BINARY = gnunet-service-peerinfo
115ACCEPT_FROM = 127.0.0.1; 107ACCEPT_FROM = 127.0.0.1;
116ACCEPT_FROM6 = ::1; 108ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20066 123PORT = 20066
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
153PORT = 20065 144PORT = 20065
154HOSTNAME = localhost 145HOSTNAME = localhost
155HOME = $SERVICEHOME 146HOME = $SERVICEHOME
156CONFIG = $DEFAULTCONFIG
157BINARY = gnunet-service-transport 147BINARY = gnunet-service-transport
158NEIGHBOUR_LIMIT = 50 148NEIGHBOUR_LIMIT = 50
159ACCEPT_FROM = 127.0.0.1; 149ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
205PORT = 20060 195PORT = 20060
206HOSTNAME = localhost 196HOSTNAME = localhost
207HOME = $SERVICEHOME 197HOME = $SERVICEHOME
208CONFIG = $DEFAULTCONFIG
209BINARY = gnunet-service-template 198BINARY = gnunet-service-template
210ACCEPT_FROM = 127.0.0.1; 199ACCEPT_FROM = 127.0.0.1;
211ACCEPT_FROM6 = ::1; 200ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
223PORT = 20059 212PORT = 20059
224HOSTNAME = localhost 213HOSTNAME = localhost
225HOME = $SERVICEHOME 214HOME = $SERVICEHOME
226CONFIG = $DEFAULTCONFIG
227BINARY = gnunet-service-fs 215BINARY = gnunet-service-fs
228ACCEPT_FROM = 127.0.0.1; 216ACCEPT_FROM = 127.0.0.1;
229ACCEPT_FROM6 = ::1; 217ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
238EXPECTED_NEIGHBOUR_COUNT = 128 226EXPECTED_NEIGHBOUR_COUNT = 128
239 227
240[vpn] 228[vpn]
241CONFIG = $DEFAULTCONFIG
242BINARY = gnunet-daemon-vpn 229BINARY = gnunet-daemon-vpn
243IPV6ADDR = 1234::1 230IPV6ADDR = 1234::1
244IPV6PREFIX = 32 231IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
249IFNAME = vpn-gnunet 236IFNAME = vpn-gnunet
250 237
251[exit] 238[exit]
252CONFIG = $DEFAULTCONFIG
253BINARY = gnunet-daemon-exit 239BINARY = gnunet-daemon-exit
254IPV6ADDR = 1234:1::1 240IPV6ADDR = 1234:1::1
255IPV6PREFIX = 32 241IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
264PORT = 0 250PORT = 0
265HOSTNAME = localhost 251HOSTNAME = localhost
266HOME = $SERVICEHOME 252HOME = $SERVICEHOME
267CONFIG = $DEFAULTCONFIG
268BINARY = gnunet-service-dns 253BINARY = gnunet-service-dns
269ACCEPT_FROM = 127.0.0.1; 254ACCEPT_FROM = 127.0.0.1;
270ACCEPT_FROM6 = ::1; 255ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
275PORT = 20058 260PORT = 20058
276HOSTNAME = localhost 261HOSTNAME = localhost
277HOME = $SERVICEHOME 262HOME = $SERVICEHOME
278CONFIG = $DEFAULTCONFIG
279BINARY = gnunet-service-arm 263BINARY = gnunet-service-arm
280ACCEPT_FROM = 127.0.0.1; 264ACCEPT_FROM = 127.0.0.1;
281ACCEPT_FROM6 = ::1; 265ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
288HTTPPORT = 8080 272HTTPPORT = 8080
289HOME = $SERVICEHOME 273HOME = $SERVICEHOME
290HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
291CONFIG = $DEFAULTCONFIG
292BINARY = gnunet-daemon-hostlist 275BINARY = gnunet-daemon-hostlist
293OPTIONS = -b 276OPTIONS = -b
294SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ 277SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@ AUTOSTART = YES
299PORT = 20057 282PORT = 20057
300HOSTNAME = localhost 283HOSTNAME = localhost
301HOME = $SERVICEHOME 284HOME = $SERVICEHOME
302CONFIG = $DEFAULTCONFIG
303BINARY = gnunet-service-core 285BINARY = gnunet-service-core
304ACCEPT_FROM = 127.0.0.1; 286ACCEPT_FROM = 127.0.0.1;
305ACCEPT_FROM6 = ::1; 287ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
333PORT = 20055 315PORT = 20055
334HOSTNAME = localhost 316HOSTNAME = localhost
335HOME = $SERVICEHOME 317HOME = $SERVICEHOME
336CONFIG = $DEFAULTCONFIG
337BINARY = gnunet-service-statistics 318BINARY = gnunet-service-statistics
338ACCEPT_FROM = 127.0.0.1; 319ACCEPT_FROM = 127.0.0.1;
339ACCEPT_FROM6 = ::1; 320ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
346PORT = 20054 327PORT = 20054
347HOSTNAME = localhost 328HOSTNAME = localhost
348HOME = $SERVICEHOME 329HOME = $SERVICEHOME
349CONFIG = $DEFAULTCONFIG
350BINARY = gnunet-service-dht 330BINARY = gnunet-service-dht
351ACCEPT_FROM = 127.0.0.1; 331ACCEPT_FROM = 127.0.0.1;
352ACCEPT_FROM6 = ::1; 332ACCEPT_FROM6 = ::1;
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 f515609bd..b94eecd8b 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_normal_client 2SERVICEHOME = /tmp/c_normal_client
3DEFAULTCONFIG = confs/c_normal_client_tcp_udp.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = hostkeys/0002-hostkey 5HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
19PORT = 0 18PORT = 0
20HOSTNAME = localhost 19HOSTNAME = localhost
21HOME = $SERVICEHOME 20HOME = $SERVICEHOME
22CONFIG = $DEFAULTCONFIG
23BINARY = gnunet-service-dns 21BINARY = gnunet-service-dns
24ACCEPT_FROM = 127.0.0.1; 22ACCEPT_FROM = 127.0.0.1;
25ACCEPT_FROM6 = ::1; 23ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
31PORT = 20071 29PORT = 20071
32HOSTNAME = localhost 30HOSTNAME = localhost
33HOME = $SERVICEHOME 31HOME = $SERVICEHOME
34CONFIG = $DEFAULTCONFIG
35BINARY = gnunet-service-resolver 32BINARY = gnunet-service-resolver
36ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1; 34ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
44PORT = 20070 41PORT = 20070
45HOSTNAME = localhost 42HOSTNAME = localhost
46HOME = $SERVICEHOME 43HOME = $SERVICEHOME
47CONFIG = $DEFAULTCONFIG
48BINARY = gnunet-service-mesh 44BINARY = gnunet-service-mesh
49ACCEPT_FROM = 127.0.0.1; 45ACCEPT_FROM = 127.0.0.1;
50ACCEPT_FROM6 = ::1; 46ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
57PORT = 20069 53PORT = 20069
58HOSTNAME = localhost 54HOSTNAME = localhost
59HOME = $SERVICEHOME 55HOME = $SERVICEHOME
60CONFIG = $DEFAULTCONFIG
61BINARY = gnunet-service-nse 56BINARY = gnunet-service-nse
62ACCEPT_FROM = 127.0.0.1; 57ACCEPT_FROM = 127.0.0.1;
63ACCEPT_FROM6 = ::1; 58ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
76AUTOCONNECT = YES 71AUTOCONNECT = YES
77TARGET-CONNECTION-COUNT = 16 72TARGET-CONNECTION-COUNT = 16
78FRIENDS = $SERVICEHOME/friends 73FRIENDS = $SERVICEHOME/friends
79CONFIG = $DEFAULTCONFIG
80BINARY = gnunet-daemon-topology 74BINARY = gnunet-daemon-topology
81 75
82[datastore] 76[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
87PORT = 20068 81PORT = 20068
88HOSTNAME = localhost 82HOSTNAME = localhost
89HOME = $SERVICEHOME 83HOME = $SERVICEHOME
90CONFIG = $DEFAULTCONFIG
91BINARY = gnunet-service-datastore 84BINARY = gnunet-service-datastore
92ACCEPT_FROM = 127.0.0.1; 85ACCEPT_FROM = 127.0.0.1;
93ACCEPT_FROM6 = ::1; 86ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
110PORT = 20067 103PORT = 20067
111HOSTNAME = localhost 104HOSTNAME = localhost
112HOME = $SERVICEHOME 105HOME = $SERVICEHOME
113CONFIG = $DEFAULTCONFIG
114BINARY = gnunet-service-peerinfo 106BINARY = gnunet-service-peerinfo
115ACCEPT_FROM = 127.0.0.1; 107ACCEPT_FROM = 127.0.0.1;
116ACCEPT_FROM6 = ::1; 108ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20066 123PORT = 20066
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
153PORT = 20065 144PORT = 20065
154HOSTNAME = localhost 145HOSTNAME = localhost
155HOME = $SERVICEHOME 146HOME = $SERVICEHOME
156CONFIG = $DEFAULTCONFIG
157BINARY = gnunet-service-transport 147BINARY = gnunet-service-transport
158NEIGHBOUR_LIMIT = 50 148NEIGHBOUR_LIMIT = 50
159ACCEPT_FROM = 127.0.0.1; 149ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
205PORT = 20060 195PORT = 20060
206HOSTNAME = localhost 196HOSTNAME = localhost
207HOME = $SERVICEHOME 197HOME = $SERVICEHOME
208CONFIG = $DEFAULTCONFIG
209BINARY = gnunet-service-template 198BINARY = gnunet-service-template
210ACCEPT_FROM = 127.0.0.1; 199ACCEPT_FROM = 127.0.0.1;
211ACCEPT_FROM6 = ::1; 200ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
223PORT = 20059 212PORT = 20059
224HOSTNAME = localhost 213HOSTNAME = localhost
225HOME = $SERVICEHOME 214HOME = $SERVICEHOME
226CONFIG = $DEFAULTCONFIG
227BINARY = gnunet-service-fs 215BINARY = gnunet-service-fs
228ACCEPT_FROM = 127.0.0.1; 216ACCEPT_FROM = 127.0.0.1;
229ACCEPT_FROM6 = ::1; 217ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
238EXPECTED_NEIGHBOUR_COUNT = 128 226EXPECTED_NEIGHBOUR_COUNT = 128
239 227
240[vpn] 228[vpn]
241CONFIG = $DEFAULTCONFIG
242BINARY = gnunet-daemon-vpn 229BINARY = gnunet-daemon-vpn
243IPV6ADDR = 1234::1 230IPV6ADDR = 1234::1
244IPV6PREFIX = 32 231IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
249IFNAME = vpn-gnunet 236IFNAME = vpn-gnunet
250 237
251[exit] 238[exit]
252CONFIG = $DEFAULTCONFIG
253BINARY = gnunet-daemon-exit 239BINARY = gnunet-daemon-exit
254IPV6ADDR = 1234:1::1 240IPV6ADDR = 1234:1::1
255IPV6PREFIX = 32 241IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
264PORT = 0 250PORT = 0
265HOSTNAME = localhost 251HOSTNAME = localhost
266HOME = $SERVICEHOME 252HOME = $SERVICEHOME
267CONFIG = $DEFAULTCONFIG
268BINARY = gnunet-service-dns 253BINARY = gnunet-service-dns
269ACCEPT_FROM = 127.0.0.1; 254ACCEPT_FROM = 127.0.0.1;
270ACCEPT_FROM6 = ::1; 255ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
275PORT = 20058 260PORT = 20058
276HOSTNAME = localhost 261HOSTNAME = localhost
277HOME = $SERVICEHOME 262HOME = $SERVICEHOME
278CONFIG = $DEFAULTCONFIG
279BINARY = gnunet-service-arm 263BINARY = gnunet-service-arm
280ACCEPT_FROM = 127.0.0.1; 264ACCEPT_FROM = 127.0.0.1;
281ACCEPT_FROM6 = ::1; 265ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
288HTTPPORT = 8080 272HTTPPORT = 8080
289HOME = $SERVICEHOME 273HOME = $SERVICEHOME
290HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
291CONFIG = $DEFAULTCONFIG
292BINARY = gnunet-daemon-hostlist 275BINARY = gnunet-daemon-hostlist
293OPTIONS = -b 276OPTIONS = -b
294SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ 277SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@ AUTOSTART = YES
299PORT = 20057 282PORT = 20057
300HOSTNAME = localhost 283HOSTNAME = localhost
301HOME = $SERVICEHOME 284HOME = $SERVICEHOME
302CONFIG = $DEFAULTCONFIG
303BINARY = gnunet-service-core 285BINARY = gnunet-service-core
304ACCEPT_FROM = 127.0.0.1; 286ACCEPT_FROM = 127.0.0.1;
305ACCEPT_FROM6 = ::1; 287ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
333PORT = 20055 315PORT = 20055
334HOSTNAME = localhost 316HOSTNAME = localhost
335HOME = $SERVICEHOME 317HOME = $SERVICEHOME
336CONFIG = $DEFAULTCONFIG
337BINARY = gnunet-service-statistics 318BINARY = gnunet-service-statistics
338ACCEPT_FROM = 127.0.0.1; 319ACCEPT_FROM = 127.0.0.1;
339ACCEPT_FROM6 = ::1; 320ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
346PORT = 20054 327PORT = 20054
347HOSTNAME = localhost 328HOSTNAME = localhost
348HOME = $SERVICEHOME 329HOME = $SERVICEHOME
349CONFIG = $DEFAULTCONFIG
350BINARY = gnunet-service-dht 330BINARY = gnunet-service-dht
351ACCEPT_FROM = 127.0.0.1; 331ACCEPT_FROM = 127.0.0.1;
352ACCEPT_FROM6 = ::1; 332ACCEPT_FROM6 = ::1;
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES
367 347
368[dhtcache] 348[dhtcache]
369DATABASE = sqlite 349DATABASE = sqlite
370QUOTA = 1 MB \ No newline at end of file 350QUOTA = 1 MB
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 a4a30c18c..c887bdae0 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
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_normal_client 2SERVICEHOME = /tmp/c_normal_client
3DEFAULTCONFIG = confs/c_normal_client_tcp_udp_http.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = hostkeys/0002-hostkey 5HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
19PORT = 0 18PORT = 0
20HOSTNAME = localhost 19HOSTNAME = localhost
21HOME = $SERVICEHOME 20HOME = $SERVICEHOME
22CONFIG = $DEFAULTCONFIG
23BINARY = gnunet-service-dns 21BINARY = gnunet-service-dns
24ACCEPT_FROM = 127.0.0.1; 22ACCEPT_FROM = 127.0.0.1;
25ACCEPT_FROM6 = ::1; 23ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
31PORT = 20071 29PORT = 20071
32HOSTNAME = localhost 30HOSTNAME = localhost
33HOME = $SERVICEHOME 31HOME = $SERVICEHOME
34CONFIG = $DEFAULTCONFIG
35BINARY = gnunet-service-resolver 32BINARY = gnunet-service-resolver
36ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1; 34ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
44PORT = 20070 41PORT = 20070
45HOSTNAME = localhost 42HOSTNAME = localhost
46HOME = $SERVICEHOME 43HOME = $SERVICEHOME
47CONFIG = $DEFAULTCONFIG
48BINARY = gnunet-service-mesh 44BINARY = gnunet-service-mesh
49ACCEPT_FROM = 127.0.0.1; 45ACCEPT_FROM = 127.0.0.1;
50ACCEPT_FROM6 = ::1; 46ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
57PORT = 20069 53PORT = 20069
58HOSTNAME = localhost 54HOSTNAME = localhost
59HOME = $SERVICEHOME 55HOME = $SERVICEHOME
60CONFIG = $DEFAULTCONFIG
61BINARY = gnunet-service-nse 56BINARY = gnunet-service-nse
62ACCEPT_FROM = 127.0.0.1; 57ACCEPT_FROM = 127.0.0.1;
63ACCEPT_FROM6 = ::1; 58ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
76AUTOCONNECT = YES 71AUTOCONNECT = YES
77TARGET-CONNECTION-COUNT = 16 72TARGET-CONNECTION-COUNT = 16
78FRIENDS = $SERVICEHOME/friends 73FRIENDS = $SERVICEHOME/friends
79CONFIG = $DEFAULTCONFIG
80BINARY = gnunet-daemon-topology 74BINARY = gnunet-daemon-topology
81 75
82[datastore] 76[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
87PORT = 20068 81PORT = 20068
88HOSTNAME = localhost 82HOSTNAME = localhost
89HOME = $SERVICEHOME 83HOME = $SERVICEHOME
90CONFIG = $DEFAULTCONFIG
91BINARY = gnunet-service-datastore 84BINARY = gnunet-service-datastore
92ACCEPT_FROM = 127.0.0.1; 85ACCEPT_FROM = 127.0.0.1;
93ACCEPT_FROM6 = ::1; 86ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
110PORT = 20067 103PORT = 20067
111HOSTNAME = localhost 104HOSTNAME = localhost
112HOME = $SERVICEHOME 105HOME = $SERVICEHOME
113CONFIG = $DEFAULTCONFIG
114BINARY = gnunet-service-peerinfo 106BINARY = gnunet-service-peerinfo
115ACCEPT_FROM = 127.0.0.1; 107ACCEPT_FROM = 127.0.0.1;
116ACCEPT_FROM6 = ::1; 108ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20066 123PORT = 20066
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
153PORT = 20065 144PORT = 20065
154HOSTNAME = localhost 145HOSTNAME = localhost
155HOME = $SERVICEHOME 146HOME = $SERVICEHOME
156CONFIG = $DEFAULTCONFIG
157BINARY = gnunet-service-transport 147BINARY = gnunet-service-transport
158NEIGHBOUR_LIMIT = 50 148NEIGHBOUR_LIMIT = 50
159ACCEPT_FROM = 127.0.0.1; 149ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
205PORT = 20060 195PORT = 20060
206HOSTNAME = localhost 196HOSTNAME = localhost
207HOME = $SERVICEHOME 197HOME = $SERVICEHOME
208CONFIG = $DEFAULTCONFIG
209BINARY = gnunet-service-template 198BINARY = gnunet-service-template
210ACCEPT_FROM = 127.0.0.1; 199ACCEPT_FROM = 127.0.0.1;
211ACCEPT_FROM6 = ::1; 200ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
223PORT = 20059 212PORT = 20059
224HOSTNAME = localhost 213HOSTNAME = localhost
225HOME = $SERVICEHOME 214HOME = $SERVICEHOME
226CONFIG = $DEFAULTCONFIG
227BINARY = gnunet-service-fs 215BINARY = gnunet-service-fs
228ACCEPT_FROM = 127.0.0.1; 216ACCEPT_FROM = 127.0.0.1;
229ACCEPT_FROM6 = ::1; 217ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
238EXPECTED_NEIGHBOUR_COUNT = 128 226EXPECTED_NEIGHBOUR_COUNT = 128
239 227
240[vpn] 228[vpn]
241CONFIG = $DEFAULTCONFIG
242BINARY = gnunet-daemon-vpn 229BINARY = gnunet-daemon-vpn
243IPV6ADDR = 1234::1 230IPV6ADDR = 1234::1
244IPV6PREFIX = 32 231IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
249IFNAME = vpn-gnunet 236IFNAME = vpn-gnunet
250 237
251[exit] 238[exit]
252CONFIG = $DEFAULTCONFIG
253BINARY = gnunet-daemon-exit 239BINARY = gnunet-daemon-exit
254IPV6ADDR = 1234:1::1 240IPV6ADDR = 1234:1::1
255IPV6PREFIX = 32 241IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
264PORT = 0 250PORT = 0
265HOSTNAME = localhost 251HOSTNAME = localhost
266HOME = $SERVICEHOME 252HOME = $SERVICEHOME
267CONFIG = $DEFAULTCONFIG
268BINARY = gnunet-service-dns 253BINARY = gnunet-service-dns
269ACCEPT_FROM = 127.0.0.1; 254ACCEPT_FROM = 127.0.0.1;
270ACCEPT_FROM6 = ::1; 255ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
275PORT = 20058 260PORT = 20058
276HOSTNAME = localhost 261HOSTNAME = localhost
277HOME = $SERVICEHOME 262HOME = $SERVICEHOME
278CONFIG = $DEFAULTCONFIG
279BINARY = gnunet-service-arm 263BINARY = gnunet-service-arm
280ACCEPT_FROM = 127.0.0.1; 264ACCEPT_FROM = 127.0.0.1;
281ACCEPT_FROM6 = ::1; 265ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
288HTTPPORT = 8080 272HTTPPORT = 8080
289HOME = $SERVICEHOME 273HOME = $SERVICEHOME
290HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
291CONFIG = $DEFAULTCONFIG
292BINARY = gnunet-daemon-hostlist 275BINARY = gnunet-daemon-hostlist
293OPTIONS = -b 276OPTIONS = -b
294SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ 277SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@ AUTOSTART = YES
299PORT = 20057 282PORT = 20057
300HOSTNAME = localhost 283HOSTNAME = localhost
301HOME = $SERVICEHOME 284HOME = $SERVICEHOME
302CONFIG = $DEFAULTCONFIG
303BINARY = gnunet-service-core 285BINARY = gnunet-service-core
304ACCEPT_FROM = 127.0.0.1; 286ACCEPT_FROM = 127.0.0.1;
305ACCEPT_FROM6 = ::1; 287ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
333PORT = 20055 315PORT = 20055
334HOSTNAME = localhost 316HOSTNAME = localhost
335HOME = $SERVICEHOME 317HOME = $SERVICEHOME
336CONFIG = $DEFAULTCONFIG
337BINARY = gnunet-service-statistics 318BINARY = gnunet-service-statistics
338ACCEPT_FROM = 127.0.0.1; 319ACCEPT_FROM = 127.0.0.1;
339ACCEPT_FROM6 = ::1; 320ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
346PORT = 20054 327PORT = 20054
347HOSTNAME = localhost 328HOSTNAME = localhost
348HOME = $SERVICEHOME 329HOME = $SERVICEHOME
349CONFIG = $DEFAULTCONFIG
350BINARY = gnunet-service-dht 330BINARY = gnunet-service-dht
351ACCEPT_FROM = 127.0.0.1; 331ACCEPT_FROM = 127.0.0.1;
352ACCEPT_FROM6 = ::1; 332ACCEPT_FROM6 = ::1;
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES
367 347
368[dhtcache] 348[dhtcache]
369DATABASE = sqlite 349DATABASE = sqlite
370QUOTA = 1 MB \ No newline at end of file 350QUOTA = 1 MB
diff --git a/src/lockmanager/lockmanager.conf.in b/src/lockmanager/lockmanager.conf.in
index 75b9244dc..42d574324 100644
--- a/src/lockmanager/lockmanager.conf.in
+++ b/src/lockmanager/lockmanager.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@UNIXONLY@ PORT = 2100 3@UNIXONLY@ PORT = 2100
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-lockmanager 6BINARY = gnunet-service-lockmanager
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/lockmanager/test_lockmanager_api.conf b/src/lockmanager/test_lockmanager_api.conf
index 894f40908..af0d99319 100644
--- a/src/lockmanager/test_lockmanager_api.conf
+++ b/src/lockmanager/test_lockmanager_api.conf
@@ -63,7 +63,6 @@ PEERGROUP_TIMEOUT = 2400 s
63HOSTKEY = $SERVICEHOME/.hostkey 63HOSTKEY = $SERVICEHOME/.hostkey
64 64
65[PATHS] 65[PATHS]
66DEFAULTCONFIG = test_lockmanager_api.conf
67SERVICEHOME = /tmp/test-lockmanager/ 66SERVICEHOME = /tmp/test-lockmanager/
68 67
69[dns] 68[dns]
diff --git a/src/mesh/mesh.conf.in b/src/mesh/mesh.conf.in
index 83b45c786..fd3fced12 100644
--- a/src/mesh/mesh.conf.in
+++ b/src/mesh/mesh.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@UNIXONLY@ PORT = 2096 3@UNIXONLY@ PORT = 2096
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-mesh 6BINARY = gnunet-service-mesh
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index e3fd00037..d8bdd7a13 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -72,7 +72,6 @@ WEAKRANDOM = YES
72HOSTKEY = $SERVICEHOME/.hostkey 72HOSTKEY = $SERVICEHOME/.hostkey
73 73
74[PATHS] 74[PATHS]
75DEFAULTCONFIG = test_mesh.conf
76SERVICEHOME = /tmp/test-mesh/ 75SERVICEHOME = /tmp/test-mesh/
77 76
78[dns] 77[dns]
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf
index 0d15ea509..b6291fff5 100644
--- a/src/mesh/test_mesh_2dtorus.conf
+++ b/src/mesh/test_mesh_2dtorus.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test_mesh_small/ 2SERVICEHOME = /tmp/test_mesh_small/
3DEFAULTCONFIG = test_mesh_small.conf
4 3
5[arm] 4[arm]
6PORT = 10010 5PORT = 10010
diff --git a/src/mesh/test_mesh_path.conf b/src/mesh/test_mesh_path.conf
index 82bb3e02a..5ac9710d4 100644
--- a/src/mesh/test_mesh_path.conf
+++ b/src/mesh/test_mesh_path.conf
@@ -69,7 +69,6 @@ WEAKRANDOM = YES
69HOSTKEY = $SERVICEHOME/.hostkey 69HOSTKEY = $SERVICEHOME/.hostkey
70 70
71[PATHS] 71[PATHS]
72DEFAULTCONFIG = test_mesh.conf
73SERVICEHOME = /tmp/test-mesh/ 72SERVICEHOME = /tmp/test-mesh/
74 73
75[dns] 74[dns]
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 8c0a5f88e..2277a9a76 100644
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test_mesh_small/ 2SERVICEHOME = /tmp/test_mesh_small/
3DEFAULTCONFIG = test_mesh_small.conf
4 3
5[mesh] 4[mesh]
6PORT = 10005 5PORT = 10005
diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in
index 6f7129734..d7c372d80 100644
--- a/src/namestore/namestore.conf.in
+++ b/src/namestore/namestore.conf.in
@@ -6,7 +6,6 @@ UNIX_MATCH_GID = YES
6@UNIXONLY@ PORT = 2099 6@UNIXONLY@ PORT = 2099
7HOSTNAME = localhost 7HOSTNAME = localhost
8HOME = $SERVICEHOME 8HOME = $SERVICEHOME
9CONFIG = $DEFAULTCONFIG
10BINARY = gnunet-service-namestore 9BINARY = gnunet-service-namestore
11ACCEPT_FROM = 127.0.0.1; 10ACCEPT_FROM = 127.0.0.1;
12ACCEPT_FROM6 = ::1; 11ACCEPT_FROM6 = ::1;
diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index bcbbca91a..565805921 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -12,7 +12,6 @@ UNIX_MATCH_GID = YES
12PORT = 2099 12PORT = 2099
13HOSTNAME = localhost 13HOSTNAME = localhost
14HOME = $SERVICEHOME 14HOME = $SERVICEHOME
15CONFIG = $DEFAULTCONFIG
16BINARY = gnunet-service-namestore 15BINARY = gnunet-service-namestore
17ACCEPT_FROM = 127.0.0.1; 16ACCEPT_FROM = 127.0.0.1;
18ACCEPT_FROM6 = ::1; 17ACCEPT_FROM6 = ::1;
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf
index 7ad00a03c..b3bab0451 100644
--- a/src/nat/test_nat_data.conf
+++ b/src/nat/test_nat_data.conf
@@ -1,8 +1,6 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/nat-test 2SERVICEHOME = /tmp/nat-test
3# SERVICEHOME = /var/lib/gnunet/ 3# SERVICEHOME = /var/lib/gnunet/
4# DEFAULTCONFIG = /etc/gnunet.conf
5# If 'DEFAULTCONFIG' is not defined, the current
6# configuration file is assumed to be the default, 4# configuration file is assumed to be the default,
7# which is what we want by default... 5# which is what we want by default...
8 6
@@ -51,7 +49,6 @@ DISABLEV6 = NO
51PORT = 2087 49PORT = 2087
52HOSTNAME = localhost 50HOSTNAME = localhost
53HOME = $SERVICEHOME 51HOME = $SERVICEHOME
54CONFIG = $DEFAULTCONFIG
55BINARY = gnunet-service-arm 52BINARY = gnunet-service-arm
56ACCEPT_FROM = 127.0.0.1; 53ACCEPT_FROM = 127.0.0.1;
57ACCEPT_FROM6 = ::1; 54ACCEPT_FROM6 = ::1;
@@ -75,7 +72,6 @@ AUTOSTART = YES
75PORT = 2088 72PORT = 2088
76HOSTNAME = localhost 73HOSTNAME = localhost
77HOME = $SERVICEHOME 74HOME = $SERVICEHOME
78CONFIG = $DEFAULTCONFIG
79BINARY = gnunet-service-statistics 75BINARY = gnunet-service-statistics
80ACCEPT_FROM = 127.0.0.1; 76ACCEPT_FROM = 127.0.0.1;
81ACCEPT_FROM6 = ::1; 77ACCEPT_FROM6 = ::1;
@@ -97,7 +93,6 @@ AUTOSTART = YES
97PORT = 2089 93PORT = 2089
98HOSTNAME = localhost 94HOSTNAME = localhost
99HOME = $SERVICEHOME 95HOME = $SERVICEHOME
100CONFIG = $DEFAULTCONFIG
101BINARY = gnunet-service-resolver 96BINARY = gnunet-service-resolver
102ACCEPT_FROM = 127.0.0.1; 97ACCEPT_FROM = 127.0.0.1;
103ACCEPT_FROM6 = ::1; 98ACCEPT_FROM6 = ::1;
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index 1128b37ea..b30240c57 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -1,8 +1,6 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/nat-test 2SERVICEHOME = /tmp/nat-test
3# SERVICEHOME = /var/lib/gnunet/ 3# SERVICEHOME = /var/lib/gnunet/
4# DEFAULTCONFIG = /etc/gnunet.conf
5# If 'DEFAULTCONFIG' is not defined, the current
6# configuration file is assumed to be the default, 4# configuration file is assumed to be the default,
7# which is what we want by default... 5# which is what we want by default...
8 6
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index bc49e051d..84f1f6c22 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@JAVAPORT@PORT = 2097 3@JAVAPORT@PORT = 2097
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-nse 6BINARY = gnunet-service-nse
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 49f749fda..b4709dd38 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/nse-profiler/ 2SERVICEHOME = /tmp/nse-profiler/
3DEFAULTCONFIG = nse_profiler_test.conf
4 3
5[nse] 4[nse]
6PORT = 0 5PORT = 0
@@ -10,7 +9,6 @@ BINARY = gnunet-service-nse
10#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p 9#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
11AUTOSTART = NO 10AUTOSTART = NO
12DEBUG = YES 11DEBUG = YES
13CONFIG = $DEFAULTCONFIG
14# Overriding network settings for faster testing (do NOT use 12# Overriding network settings for faster testing (do NOT use
15# these values in production just because they are here) 13# these values in production just because they are here)
16WORKDELAY = 60 s 14WORKDELAY = 60 s
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 66075d792..625d059ee 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-nse-multipeer/ 2SERVICEHOME = /tmp/test-nse-multipeer/
3DEFAULTCONFIG = test_nse.conf
4 3
5[nse] 4[nse]
6PORT = 22353 5PORT = 22353
@@ -10,7 +9,6 @@ BINARY = gnunet-service-nse
10#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p 9#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
11AUTOSTART = YES 10AUTOSTART = YES
12DEBUG = NO 11DEBUG = NO
13CONFIG = $DEFAULTCONFIG
14PROOFFILE = $SERVICEHOME/proof.nse 12PROOFFILE = $SERVICEHOME/proof.nse
15# Overriding network settings for faster testing (do NOT use 13# Overriding network settings for faster testing (do NOT use
16# these values in production just because they are here) 14# these values in production just because they are here)
diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in
index c45a05262..6bf766d28 100644
--- a/src/peerinfo/peerinfo.conf.in
+++ b/src/peerinfo/peerinfo.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@JAVAPORT@PORT = 2090 3@JAVAPORT@PORT = 2090
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-peerinfo 6BINARY = gnunet-service-peerinfo
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/pt/pt.conf b/src/pt/pt.conf
index 39c1fb60c..a1eea3305 100644
--- a/src/pt/pt.conf
+++ b/src/pt/pt.conf
@@ -1,5 +1,4 @@
1[pt] 1[pt]
2CONFIG = $DEFAULTCONFIG
3BINARY = gnunet-daemon-pt 2BINARY = gnunet-daemon-pt
4 3
5# Set this to YES to tunnel IPv4 traffic over GNUnet 4# Set this to YES to tunnel IPv4 traffic over GNUnet
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index fa12b98ba..474b55f79 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -47,7 +47,7 @@ TTL = 3600000
47 47
48[gns] 48[gns]
49AUTOSTART = YES 49AUTOSTART = YES
50ZONEKEY = $SERVICEHOME/hostkey 50ZONEKEY = $SERVICEHOME/.hostkey
51HIJACK_DNS = YES 51HIJACK_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 bdac1a5b6..ae9488e8e 100644
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/gnunet-test-vpn/ 2SERVICEHOME = /tmp/gnunet-test-vpn/
3DEFAULTCONFIG = test_gnunet_vpn.conf
4 3
5[transport] 4[transport]
6PLUGINS = tcp 5PLUGINS = tcp
diff --git a/src/regex/test_regex_big.conf b/src/regex/test_regex_big.conf
index f24bc8b5d..f21a2ba57 100644
--- a/src/regex/test_regex_big.conf
+++ b/src/regex/test_regex_big.conf
@@ -72,7 +72,6 @@ PEERGROUP_TIMEOUT = 2400 s
72HOSTKEY = $SERVICEHOME/.hostkey 72HOSTKEY = $SERVICEHOME/.hostkey
73 73
74[PATHS] 74[PATHS]
75DEFAULTCONFIG = test_stream_local.conf
76SERVICEHOME = /tmp/test-stream/ 75SERVICEHOME = /tmp/test-stream/
77 76
78[dns] 77[dns]
diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in
index 5de9dedea..669e89bd7 100644
--- a/src/statistics/statistics.conf.in
+++ b/src/statistics/statistics.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@JAVAPORT@PORT = 2088 3@JAVAPORT@PORT = 2088
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-statistics 6BINARY = gnunet-service-statistics
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf
index 4e229e930..c52ff35b3 100644
--- a/src/statistics/test_statistics_api_data.conf
+++ b/src/statistics/test_statistics_api_data.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-statistics/ 2SERVICEHOME = /tmp/test-gnunetd-statistics/
3DEFAULTCONFIG = test_statistics_api_data.conf
4 3
5[statistics] 4[statistics]
6PORT = 22353 5PORT = 22353
diff --git a/src/stream/test_stream_local.conf b/src/stream/test_stream_local.conf
index df4e49398..b718c01ee 100644
--- a/src/stream/test_stream_local.conf
+++ b/src/stream/test_stream_local.conf
@@ -73,7 +73,6 @@ PEERGROUP_TIMEOUT = 2400 s
73HOSTKEY = $SERVICEHOME/.hostkey 73HOSTKEY = $SERVICEHOME/.hostkey
74 74
75[PATHS] 75[PATHS]
76DEFAULTCONFIG = test_stream_local.conf
77SERVICEHOME = /tmp/test-stream/ 76SERVICEHOME = /tmp/test-stream/
78 77
79[dns] 78[dns]
diff --git a/src/template/template.conf b/src/template/template.conf
index 522721fb6..439bbd2e6 100644
--- a/src/template/template.conf
+++ b/src/template/template.conf
@@ -3,7 +3,6 @@ AUTOSTART = NO
3PORT = 9999 3PORT = 9999
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-template 6BINARY = gnunet-service-template
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf
index 9fdb9bcda..2fdefcc1f 100644
--- a/src/testbed/test_testbed_api.conf
+++ b/src/testbed/test_testbed_api.conf
@@ -62,7 +62,6 @@ PEERGROUP_TIMEOUT = 2400 s
62HOSTKEY = $SERVICEHOME/.hostkey 62HOSTKEY = $SERVICEHOME/.hostkey
63 63
64[PATHS] 64[PATHS]
65DEFAULTCONFIG = test_testbed_api.conf
66SERVICEHOME = /tmp/test-testbed/ 65SERVICEHOME = /tmp/test-testbed/
67 66
68[dns] 67[dns]
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 5f5585c04..ccd9c4f79 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = NO
3@UNIXONLY@ PORT = 2101 3@UNIXONLY@ PORT = 2101
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-testbed 6BINARY = gnunet-service-testbed
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
@@ -12,4 +11,4 @@ UNIX_MATCH_UID = YES
12UNIX_MATCH_GID = YES 11UNIX_MATCH_GID = YES
13MAX_PARALLEL_OPERATIONS = 1000 12MAX_PARALLEL_OPERATIONS = 1000
14MAX_PARALLEL_SERVICE_CONNECTIONS = 1000 13MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
15MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 \ No newline at end of file 14MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 80049ba4c..411c3ecb5 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/ 2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_defaults.conf
4 3
5[resolver] 4[resolver]
6PORT = 2564 5PORT = 2564
diff --git a/src/testing_old/test_testing_2dtorus.conf b/src/testing_old/test_testing_2dtorus.conf
index 69c59567d..4ec3db83e 100644
--- a/src/testing_old/test_testing_2dtorus.conf
+++ b/src/testing_old/test_testing_2dtorus.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_testing_2dtorus/ 3SERVICEHOME = /tmp/test_testing_2dtorus/
4DEFAULTCONFIG = test_testing_2dtorus.conf
5 4
6[arm] 5[arm]
7PORT = 10010 6PORT = 10010
diff --git a/src/testing_old/test_testing_connect_peer1.conf b/src/testing_old/test_testing_connect_peer1.conf
index cccda5e2a..3349990c5 100644
--- a/src/testing_old/test_testing_connect_peer1.conf
+++ b/src/testing_old/test_testing_connect_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/ 3SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/
4DEFAULTCONFIG = test_testing_connect_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12568 6PORT = 12568
diff --git a/src/testing_old/test_testing_connect_peer2.conf b/src/testing_old/test_testing_connect_peer2.conf
index 08ec55113..fb1f19c8e 100644
--- a/src/testing_old/test_testing_connect_peer2.conf
+++ b/src/testing_old/test_testing_connect_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/ 3SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/
4DEFAULTCONFIG = test_testing_connect_peer2.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 22568 6PORT = 22568
diff --git a/src/testing_old/test_testing_data.conf b/src/testing_old/test_testing_data.conf
index c46cb0d42..8bccc3e8d 100644
--- a/src/testing_old/test_testing_data.conf
+++ b/src/testing_old/test_testing_data.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data.conf
4 3
5[arm] 4[arm]
6DEFAULTSERVICES = core 5DEFAULTSERVICES = core
diff --git a/src/testing_old/test_testing_data_remote.conf b/src/testing_old/test_testing_data_remote.conf
index 477baad7e..3c7389afc 100644
--- a/src/testing_old/test_testing_data_remote.conf
+++ b/src/testing_old/test_testing_data_remote.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_remote.conf
4 3
5[TESTING_old] 4[TESTING_old]
6CONTROL_HOST = 127.0.0.1 5CONTROL_HOST = 127.0.0.1
diff --git a/src/testing_old/test_testing_data_topology_2d_torus.conf b/src/testing_old/test_testing_data_topology_2d_torus.conf
index 62fff6925..6a890e95b 100644
--- a/src/testing_old/test_testing_data_topology_2d_torus.conf
+++ b/src/testing_old/test_testing_data_topology_2d_torus.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_2d_torus.conf
4 3
5[TESTING_old] 4[TESTING_old]
6NUM_PEERS = 13 5NUM_PEERS = 13
diff --git a/src/testing_old/test_testing_data_topology_blacklist.conf b/src/testing_old/test_testing_data_topology_blacklist.conf
index 28e61301a..d60d9d77a 100644
--- a/src/testing_old/test_testing_data_topology_blacklist.conf
+++ b/src/testing_old/test_testing_data_topology_blacklist.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_blacklist.conf
4 3
5[TESTING_old] 4[TESTING_old]
6NUM_PEERS = 4 5NUM_PEERS = 4
diff --git a/src/testing_old/test_testing_data_topology_churn.conf b/src/testing_old/test_testing_data_topology_churn.conf
index ae46bf0e6..53a261f2b 100644
--- a/src/testing_old/test_testing_data_topology_churn.conf
+++ b/src/testing_old/test_testing_data_topology_churn.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_churn.conf
4 3
5[TESTING_old] 4[TESTING_old]
6NUM_PEERS = 12 5NUM_PEERS = 12
diff --git a/src/testing_old/test_testing_data_topology_clique.conf b/src/testing_old/test_testing_data_topology_clique.conf
index c71a4b6c2..8ef25c78e 100644
--- a/src/testing_old/test_testing_data_topology_clique.conf
+++ b/src/testing_old/test_testing_data_topology_clique.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6CONNECT_TIMEOUT = 180 s 5CONNECT_TIMEOUT = 180 s
diff --git a/src/testing_old/test_testing_data_topology_clique_dfs.conf b/src/testing_old/test_testing_data_topology_clique_dfs.conf
index 349c398ed..8fc926320 100644
--- a/src/testing_old/test_testing_data_topology_clique_dfs.conf
+++ b/src/testing_old/test_testing_data_topology_clique_dfs.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6NUM_PEERS = 7 5NUM_PEERS = 7
diff --git a/src/testing_old/test_testing_data_topology_clique_minimum.conf b/src/testing_old/test_testing_data_topology_clique_minimum.conf
index 8d8206d33..88de2aef1 100644
--- a/src/testing_old/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing_old/test_testing_data_topology_clique_minimum.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6NUM_PEERS = 20 5NUM_PEERS = 20
diff --git a/src/testing_old/test_testing_data_topology_clique_random.conf b/src/testing_old/test_testing_data_topology_clique_random.conf
index d76175291..a88ddccbc 100644
--- a/src/testing_old/test_testing_data_topology_clique_random.conf
+++ b/src/testing_old/test_testing_data_topology_clique_random.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6NUM_PEERS = 20 5NUM_PEERS = 20
diff --git a/src/testing_old/test_testing_data_topology_erdos_renyi.conf b/src/testing_old/test_testing_data_topology_erdos_renyi.conf
index ece17e505..e8a5883b2 100644
--- a/src/testing_old/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing_old/test_testing_data_topology_erdos_renyi.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6TOPOLOGY = ERDOS_RENYI 5TOPOLOGY = ERDOS_RENYI
diff --git a/src/testing_old/test_testing_data_topology_internat.conf b/src/testing_old/test_testing_data_topology_internat.conf
index 14475ce55..2a0da4ac2 100644
--- a/src/testing_old/test_testing_data_topology_internat.conf
+++ b/src/testing_old/test_testing_data_topology_internat.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6TOPOLOGY = INTERNAT 5TOPOLOGY = INTERNAT
diff --git a/src/testing_old/test_testing_data_topology_none.conf b/src/testing_old/test_testing_data_topology_none.conf
index 38e658680..e0ffe5244 100644
--- a/src/testing_old/test_testing_data_topology_none.conf
+++ b/src/testing_old/test_testing_data_topology_none.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6NUM_PEERS = 1000 5NUM_PEERS = 1000
diff --git a/src/testing_old/test_testing_data_topology_ring.conf b/src/testing_old/test_testing_data_topology_ring.conf
index 5320ae068..4720d6ddd 100644
--- a/src/testing_old/test_testing_data_topology_ring.conf
+++ b/src/testing_old/test_testing_data_topology_ring.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6TOPOLOGY = RING 5TOPOLOGY = RING
diff --git a/src/testing_old/test_testing_data_topology_scale_free.conf b/src/testing_old/test_testing_data_topology_scale_free.conf
index ae7233588..06a8095f0 100644
--- a/src/testing_old/test_testing_data_topology_scale_free.conf
+++ b/src/testing_old/test_testing_data_topology_scale_free.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_scale_free.conf
4 3
5[TESTING_old] 4[TESTING_old]
6NUM_PEERS = 50 5NUM_PEERS = 50
diff --git a/src/testing_old/test_testing_data_topology_small_world_ring.conf b/src/testing_old/test_testing_data_topology_small_world_ring.conf
index 10e398fa0..dc4f0991a 100644
--- a/src/testing_old/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing_old/test_testing_data_topology_small_world_ring.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6NUM_PEERS = 25 5NUM_PEERS = 25
diff --git a/src/testing_old/test_testing_data_topology_small_world_torus.conf b/src/testing_old/test_testing_data_topology_small_world_torus.conf
index d5a58b760..cfc2f76d2 100644
--- a/src/testing_old/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing_old/test_testing_data_topology_small_world_torus.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6TOPOLOGY = SMALL_WORLD 5TOPOLOGY = SMALL_WORLD
diff --git a/src/testing_old/test_testing_data_topology_stability.conf b/src/testing_old/test_testing_data_topology_stability.conf
index 389c0aa25..aa2cf2cfa 100644
--- a/src/testing_old/test_testing_data_topology_stability.conf
+++ b/src/testing_old/test_testing_data_topology_stability.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 3
5[TESTING_old] 4[TESTING_old]
6SETTLE_TIME = 600 s 5SETTLE_TIME = 600 s
diff --git a/src/testing_old/test_testing_defaults.conf b/src/testing_old/test_testing_defaults.conf
index a28baa7be..dac98aac3 100644
--- a/src/testing_old/test_testing_defaults.conf
+++ b/src/testing_old/test_testing_defaults.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/ 2SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_defaults.conf
4 3
5[resolver] 4[resolver]
6PORT = 2564 5PORT = 2564
diff --git a/src/testing_old/test_testing_peergroup_data.conf b/src/testing_old/test_testing_peergroup_data.conf
index 880cebf86..f642627a1 100644
--- a/src/testing_old/test_testing_peergroup_data.conf
+++ b/src/testing_old/test_testing_peergroup_data.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_testing_defaults.conf 1@INLINE@ test_testing_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_testing_peergroup_data.conf
4 3
5[TESTING_old] 4[TESTING_old]
6CONNECT_ATTEMPTS = 2 5CONNECT_ATTEMPTS = 2
diff --git a/src/topology/topology.conf b/src/topology/topology.conf
index 39f29219d..15723ee0d 100644
--- a/src/topology/topology.conf
+++ b/src/topology/topology.conf
@@ -4,7 +4,6 @@ FRIENDS-ONLY = NO
4AUTOCONNECT = YES 4AUTOCONNECT = YES
5TARGET-CONNECTION-COUNT = 16 5TARGET-CONNECTION-COUNT = 16
6FRIENDS = $SERVICEHOME/friends 6FRIENDS = $SERVICEHOME/friends
7CONFIG = $DEFAULTCONFIG
8BINARY = gnunet-daemon-topology 7BINARY = gnunet-daemon-topology
9 8
10 9
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index ab0c5b391..05309d53c 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_transport_defaults.conf 1@INLINE@ test_transport_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = template_cfg_peer1.conf
5 4
6[gnunetd] 5[gnunetd]
7HOSTKEY = $SERVICEHOME/.hostkey 6HOSTKEY = $SERVICEHOME/.hostkey
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index a10dfc488..210ee51c5 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_transport_defaults.conf 1@INLINE@ test_transport_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = template_cfg_peer2.conf
5 4
6[gnunetd] 5[gnunetd]
7HOSTKEY = $SERVICEHOME/.hostkey 6HOSTKEY = $SERVICEHOME/.hostkey
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index fdf9fb3b4..189238c08 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_transport_defaults.conf 1@INLINE@ test_transport_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ 3SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
4DEFAULTCONFIG = test_plugin_transport_data.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 2400 6PORT = 2400
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
index 93f75dd0b..b0fb0e059 100644
--- a/src/transport/test_quota_compliance_data.conf
+++ b/src/transport/test_quota_compliance_data.conf
@@ -1,7 +1,6 @@
1@INLINE@ test_transport_defaults.conf 1@INLINE@ test_transport_defaults.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ 3SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
4DEFAULTCONFIG = test_quota_compliance_data.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 2368 6PORT = 2368
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
index 472e3f74b..885bcba3d 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer1 3SERVICEHOME = /tmp/test_quota_compliance_peer1
4DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer1.conf
5 4
6[transport-http_client] 5[transport-http_client]
7 6
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
index 48c1a6e83..33f8be543 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
4DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer2.conf
5 4
6[transport-http_server] 5[transport-http_server]
7PORT = 3010 6PORT = 3010
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 9f3fa97ad..885bcba3d 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer1 3SERVICEHOME = /tmp/test_quota_compliance_peer1
4DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
5 4
6[transport-http_client] 5[transport-http_client]
7 6
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index 5dd356d96..33f8be543 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
4DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
5 4
6[transport-http_server] 5[transport-http_server]
7PORT = 3010 6PORT = 3010
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
index 092762781..271bbe056 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
4DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer1.conf
5 4
6[transport-https_client] 5[transport-https_client]
7 6
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
index 6646a582c..8e07ff337 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
4DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer2.conf
5 4
6[transport-https_server] 5[transport-https_server]
7PORT = 3001 6PORT = 3001
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index a23b2ad01..271bbe056 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
4DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
5 4
6[transport-https_client] 5[transport-https_client]
7 6
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index 490b97983..8e07ff337 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
4DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
5 4
6[transport-https_server] 5[transport-https_server]
7PORT = 3001 6PORT = 3001
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
index 8a1dad5ac..b7eb28757 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
4DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 4094 6PORT = 4094
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
index bbfa8ec28..cc949df30 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/quota-tcp-p2/ 3SERVICEHOME = /tmp/test-transport/quota-tcp-p2/
4DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12015 6PORT = 12015
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index 29e56fe9b..b7eb28757 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
4DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 4094 6PORT = 4094
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 5da60d03b..67f171ec9 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12015 6PORT = 12015
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index fceee7bcd..0d49d4ef8 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
4DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 4368 6PORT = 4368
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index 4b58c934f..3c57fe5d6 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
4DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 3368 6PORT = 3368
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
index 649cf1c63..1e4afcebc 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
4DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer1.conf
5 4
6[arm] 5[arm]
7PORT = 4087 6PORT = 4087
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
index a2d1bdd18..f732e98ae 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
4DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer2.conf
5 4
6[arm] 5[arm]
7PORT = 3087 6PORT = 3087
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index 60e656bad..bde78468c 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
4DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf
5 4
6[transport-unix] 5[transport-unix]
7PORT = 12120 6PORT = 12120
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index b4f0b648a..0b803ccbc 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
4DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf
5 4
6[transport-unix] 5[transport-unix]
7PORT = 12136 6PORT = 12136
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
index 9dd9d1bd6..e81a3f9f1 100644
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p1/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p1/
4DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
5 4
6[transport-wlan] 5[transport-wlan]
7TESTMODE = 1 6TESTMODE = 1
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
index bc868d7d7..bd5387667 100644
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p2/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p2/
4DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
5 4
6[transport-wlan] 5[transport-wlan]
7INTERFACE = mon1 6INTERFACE = mon1
diff --git a/src/transport/test_quota_compliance_wlan_peer1.conf b/src/transport/test_quota_compliance_wlan_peer1.conf
index 9dd9d1bd6..e81a3f9f1 100644
--- a/src/transport/test_quota_compliance_wlan_peer1.conf
+++ b/src/transport/test_quota_compliance_wlan_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p1/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p1/
4DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
5 4
6[transport-wlan] 5[transport-wlan]
7TESTMODE = 1 6TESTMODE = 1
diff --git a/src/transport/test_quota_compliance_wlan_peer2.conf b/src/transport/test_quota_compliance_wlan_peer2.conf
index bc868d7d7..bd5387667 100644
--- a/src/transport/test_quota_compliance_wlan_peer2.conf
+++ b/src/transport/test_quota_compliance_wlan_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p2/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p2/
4DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
5 4
6[transport-wlan] 5[transport-wlan]
7INTERFACE = mon1 6INTERFACE = mon1
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
index 49fc66243..614d89d21 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer1.conf
5 4
6[arm] 5[arm]
7PORT = 12000 6PORT = 12000
@@ -43,4 +42,4 @@ TIMEOUT = 5 s
43 42
44[transport-https] 43[transport-https]
45PORT = 12009 44PORT = 12009
46TIMEOUT = 5 s \ No newline at end of file 45TIMEOUT = 5 s
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
index 2d64351d1..4aeee7c7d 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer2.conf
5 4
6[arm] 5[arm]
7PORT = 12010 6PORT = 12010
@@ -42,4 +41,4 @@ TIMEOUT = 5 s
42 41
43[transport-https] 42[transport-https]
44PORT = 12019 43PORT = 12019
45TIMEOUT = 5 s \ No newline at end of file 44TIMEOUT = 5 s
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
index 39552462a..164a38f69 100644
--- a/src/transport/test_transport_api_data.conf
+++ b/src/transport/test_transport_api_data.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_transport_defaults.conf 1@INLINE@ test_transport_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_transport_api_data.conf
4 3
5[transport-tcp] 4[transport-tcp]
6PORT = 2094 5PORT = 2094
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
index ebb4fd469..6879d0534 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12000 6PORT = 12000
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
index fe6d19b5c..67f171ec9 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12015 6PORT = 12015
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 4af712a43..e0b60e37f 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p1/ 3SERVICEHOME = /tmp/test-transport/api-http-p1/
4DEFAULTCONFIG = test_transport_api_http_peer1.conf
5 4
6[transport-http_client] 5[transport-http_client]
7 6
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 62126b07d..4e4c22e30 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p2/ 3SERVICEHOME = /tmp/test-transport/api-http-p2/
4DEFAULTCONFIG = test_transport_api_http_peer2.conf
5 4
6[transport-http_server] 5[transport-http_server]
7PORT = 12090 6PORT = 12090
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf
index bef99cdac..c38c36a18 100644
--- a/src/transport/test_transport_api_http_reverse_peer1.conf
+++ b/src/transport/test_transport_api_http_reverse_peer1.conf
@@ -1,7 +1,6 @@
1INLINE@ template_cfg_peer1.conf 1INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p1/ 3SERVICEHOME = /tmp/test-transport/api-http-p1/
4DEFAULTCONFIG = test_transport_api_http_reverse_peer1.conf
5 4
6 5
7[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 c7e9d4fe1..b73921f94 100644
--- a/src/transport/test_transport_api_http_reverse_peer2.conf
+++ b/src/transport/test_transport_api_http_reverse_peer2.conf
@@ -1,7 +1,6 @@
1INLINE@ template_cfg_peer2.conf 1INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p2/ 3SERVICEHOME = /tmp/test-transport/api-http-p2/
4DEFAULTCONFIG = test_transport_api_http_reverse_peer2.conf
5 4
6 5
7[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 b387e5a10..78d3ca0a4 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p1/ 3SERVICEHOME = /tmp/test-transport/api-https-p1/
4DEFAULTCONFIG = test_transport_api_https_peer1.conf
5 4
6[transport-https_client] 5[transport-https_client]
7PORT = 12100 6PORT = 12100
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index f825c5889..a347887bb 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p2/ 3SERVICEHOME = /tmp/test-transport/api-https-p2/
4DEFAULTCONFIG = test_transport_api_https_peer2.conf
5 4
6[transport-https_server] 5[transport-https_server]
7PORT = 12110 6PORT = 12110
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 d29b9465a..dceeccb9f 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12000 6PORT = 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 3c0e49674..caaddded2 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 0 6PORT = 0
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 9fb57ab37..61b0f5644 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-multi-p1/ 3SERVICEHOME = /tmp/test-transport/api-multi-p1/
4DEFAULTCONFIG = test_transport_api_multi_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12140 6PORT = 12140
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 18e2a5be6..c660c3c41 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-multi-p2/ 3SERVICEHOME = /tmp/test-transport/api-multi-p2/
4DEFAULTCONFIG = test_transport_api_multi_peer2.conf
5 4
6[nat] 5[nat]
7ALLOW_NAT = NO 6ALLOW_NAT = NO
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf
index f178b855a..9e39e3e41 100644
--- a/src/transport/test_transport_api_reliability_http_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p1/ 3SERVICEHOME = /tmp/test-transport/api-http-p1/
4DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf
5 4
6[transport-http_client] 5[transport-http_client]
7 6
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf
index b2d1b338c..3174e3d00 100644
--- a/src/transport/test_transport_api_reliability_http_peer2.conf
+++ b/src/transport/test_transport_api_reliability_http_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p2/ 3SERVICEHOME = /tmp/test-transport/api-http-p2/
4DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf
5 4
6[transport-http_server] 5[transport-http_server]
7PORT = 12090 6PORT = 12090
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf
index 4a2c0b5a6..d5e88261a 100644
--- a/src/transport/test_transport_api_reliability_https_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p1/ 3SERVICEHOME = /tmp/test-transport/api-https-p1/
4DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf
5 4
6[transport-https_client] 5[transport-https_client]
7 6
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf
index 5a21188da..5cc0d245a 100644
--- a/src/transport/test_transport_api_reliability_https_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p2/ 3SERVICEHOME = /tmp/test-transport/api-https-p2/
4DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf
5 4
6[transport-https_server] 5[transport-https_server]
7PORT = 12310 6PORT = 12310
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 ffd3d2f7b..9490d405c 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ 3SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
4DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf
5 4
6[nat] 5[nat]
7BEHIND_NAT = YES 6BEHIND_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 c6020ff09..b59916b7f 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ 3SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
4DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf
5 4
6[nat] 5[nat]
7DISABLEV6 = YES 6DISABLEV6 = YES
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf
index 3be982dd9..5f1d693a8 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12000 6PORT = 12000
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf
index 62575a971..3cb42c0b6 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12015 6PORT = 12015
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf
index 9dd9d1bd6..e81a3f9f1 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p1/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p1/
4DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
5 4
6[transport-wlan] 5[transport-wlan]
7TESTMODE = 1 6TESTMODE = 1
diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf
index bc868d7d7..bd5387667 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p2/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p2/
4DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
5 4
6[transport-wlan] 5[transport-wlan]
7INTERFACE = mon1 6INTERFACE = mon1
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 73f36f3c2..4ebf5b3be 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ 3SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
4DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
5 4
6[nat] 5[nat]
7BEHIND_NAT = YES 6BEHIND_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 0bf50fd4b..1ef51c9c9 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/ 3SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/
4DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf
5 4
6[nat] 5[nat]
7DISABLEV6 = YES 6DISABLEV6 = YES
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 9532b730a..54abfa5ba 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12000 6PORT = 12000
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index fe6d19b5c..67f171ec9 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12015 6PORT = 12015
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf
index cdfbdd9af..2eb23662a 100644
--- a/src/transport/test_transport_api_timeout_http_peer1.conf
+++ b/src/transport/test_transport_api_timeout_http_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p1/ 3SERVICEHOME = /tmp/test-transport/api-http-p1/
4DEFAULTCONFIG = test_transport_api_timeout_http_peer1.conf
5 4
6[nat] 5[nat]
7 6
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf
index 6edc9e24a..0aa77a9b9 100644
--- a/src/transport/test_transport_api_timeout_http_peer2.conf
+++ b/src/transport/test_transport_api_timeout_http_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p2/ 3SERVICEHOME = /tmp/test-transport/api-http-p2/
4DEFAULTCONFIG = test_transport_api_timeout_http_peer2.conf
5 4
6[nat] 5[nat]
7 6
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf
index c8a26d2af..ff1ef47bd 100644
--- a/src/transport/test_transport_api_timeout_https_peer1.conf
+++ b/src/transport/test_transport_api_timeout_https_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p1/ 3SERVICEHOME = /tmp/test-transport/api-https-p1/
4DEFAULTCONFIG = test_transport_api_timeout_https_peer1.conf
5 4
6[transport-https_client] 5[transport-https_client]
7 6
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf
index 3daf94bb1..35fba0a83 100644
--- a/src/transport/test_transport_api_timeout_https_peer2.conf
+++ b/src/transport/test_transport_api_timeout_https_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p2/ 3SERVICEHOME = /tmp/test-transport/api-https-p2/
4DEFAULTCONFIG = test_transport_api_timeout_https_peer2.conf
5 4
6[transport-https_server] 5[transport-https_server]
7PORT = 12110 6PORT = 12110
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf
index ecb599f2a..dceeccb9f 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = test_transport_api_timeout_tcp_peer1.conf
5 4
6[transport-tcp] 5[transport-tcp]
7PORT = 12000 6PORT = 12000
diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf
index ba2e27e57..f89c3a3f7 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/ 3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = test_transport_api_timeout_tcp_peer2.conf
5 4
6[nat] 5[nat]
7ALLOW_NAT = NO 6ALLOW_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 a1216e4aa..7c3e33ad0 100644
--- a/src/transport/test_transport_api_timeout_udp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_udp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p1/ 3SERVICEHOME = /tmp/test-transport/api-udp-p1/
4DEFAULTCONFIG = test_transport_api_udp_peer1.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 12040 6PORT = 12040
diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf
index 3e487a6bf..9b79c3b54 100644
--- a/src/transport/test_transport_api_timeout_udp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_udp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p2/ 3SERVICEHOME = /tmp/test-transport/api-udp-p2/
4DEFAULTCONFIG = test_transport_api_udp_peer2.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 12050 6PORT = 12050
diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf
index b1ace7d4c..5d0235f73 100644
--- a/src/transport/test_transport_api_timeout_unix_peer1.conf
+++ b/src/transport/test_transport_api_timeout_unix_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-unix-p1/ 3SERVICEHOME = /tmp/test-transport/api-unix-p1/
4DEFAULTCONFIG = test_transport_api_unix_peer1.conf
5 4
6[arm] 5[arm]
7PORT = 12125 6PORT = 12125
diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf
index a15358844..255c7e246 100644
--- a/src/transport/test_transport_api_timeout_unix_peer2.conf
+++ b/src/transport/test_transport_api_timeout_unix_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-unix-p2/ 3SERVICEHOME = /tmp/test-transport/api-unix-p2/
4DEFAULTCONFIG = test_transport_api_unix_peer2.conf
5 4
6[arm] 5[arm]
7PORT = 12135 6PORT = 12135
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index 16a4e6279..6e643d5af 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ 3SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
4DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
5 4
6[nat] 5[nat]
7BEHIND_NAT = YES 6BEHIND_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 0852b25d9..1c1258ad1 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ 3SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
4DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf
5 4
6[nat] 5[nat]
7ALLOW_NAT = YES 6ALLOW_NAT = YES
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index a1216e4aa..7c3e33ad0 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p1/ 3SERVICEHOME = /tmp/test-transport/api-udp-p1/
4DEFAULTCONFIG = test_transport_api_udp_peer1.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 12040 6PORT = 12040
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index 3e487a6bf..9b79c3b54 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p2/ 3SERVICEHOME = /tmp/test-transport/api-udp-p2/
4DEFAULTCONFIG = test_transport_api_udp_peer2.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 12050 6PORT = 12050
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index b1ace7d4c..5d0235f73 100644
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-unix-p1/ 3SERVICEHOME = /tmp/test-transport/api-unix-p1/
4DEFAULTCONFIG = test_transport_api_unix_peer1.conf
5 4
6[arm] 5[arm]
7PORT = 12125 6PORT = 12125
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index a15358844..255c7e246 100644
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-unix-p2/ 3SERVICEHOME = /tmp/test-transport/api-unix-p2/
4DEFAULTCONFIG = test_transport_api_unix_peer2.conf
5 4
6[arm] 5[arm]
7PORT = 12135 6PORT = 12135
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 d872f02e7..a4fd104ed 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p1/ 3SERVICEHOME = /tmp/test-transport/api-udp-p1/
4DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 12040 6PORT = 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 50ee65acb..755e65dce 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p2/ 3SERVICEHOME = /tmp/test-transport/api-udp-p2/
4DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 12050 6PORT = 12050
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf
index 8a5a4052e..b9669bf65 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p1/ 3SERVICEHOME = /tmp/test-transport/api-udp-p1/
4DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 12040 6PORT = 12040
diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf
index d240c42ce..46ad0177d 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p2/ 3SERVICEHOME = /tmp/test-transport/api-udp-p2/
4DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf
5 4
6[transport-udp] 5[transport-udp]
7PORT = 12050 6PORT = 12050
diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf
index 8689e415e..5d0235f73 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-unix-p1/ 3SERVICEHOME = /tmp/test-transport/api-unix-p1/
4DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf
5 4
6[arm] 5[arm]
7PORT = 12125 6PORT = 12125
diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf
index 7c3cc1953..c9dab48d7 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-unix-p2/ 3SERVICEHOME = /tmp/test-transport/api-unix-p2/
4DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf
5 4
6[arm] 5[arm]
7PORT = 12135 6PORT = 12135
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
index 9dd9d1bd6..e81a3f9f1 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p1/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p1/
4DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
5 4
6[transport-wlan] 5[transport-wlan]
7TESTMODE = 1 6TESTMODE = 1
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
index bc868d7d7..bd5387667 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p2/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p2/
4DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
5 4
6[transport-wlan] 5[transport-wlan]
7INTERFACE = mon1 6INTERFACE = mon1
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index e379cf08c..ff37415a4 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p1/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p1/
4DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
5 4
6[transport-wlan] 5[transport-wlan]
7INTERFACE = mon0 6INTERFACE = mon0
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 3e0ce27d6..87a6036fb 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -1,7 +1,6 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-wlan-p2/ 3SERVICEHOME = /tmp/test-transport/api-wlan-p2/
4DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
5 4
6[transport-wlan] 5[transport-wlan]
7INTERFACE = mon1 6INTERFACE = mon1
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
index 0939a7976..4551bb138 100644
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-transport-api/ 2SERVICEHOME = /tmp/test-transport-api/
3DEFAULTCONFIG = test_transport_defaults.conf
4 3
5[transport-tcp] 4[transport-tcp]
6TIMEOUT = 300 s 5TIMEOUT = 300 s
diff --git a/src/transport/test_transport_startonly.conf b/src/transport/test_transport_startonly.conf
index 255df4c44..8e161382b 100644
--- a/src/transport/test_transport_startonly.conf
+++ b/src/transport/test_transport_startonly.conf
@@ -1,6 +1,5 @@
1@INLINE@ test_transport_defaults.conf 1@INLINE@ test_transport_defaults.conf
2[PATHS] 2[PATHS]
3DEFAULTCONFIG = test_transport_api_data.conf
4 3
5[arm] 4[arm]
6DEFAULTSERVICES = transport 5DEFAULTSERVICES = transport
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index c6c752d8a..46cb9bf17 100644
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@UNIXONLY@ PORT = 2091 3@UNIXONLY@ PORT = 2091
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-transport 6BINARY = gnunet-service-transport
8#PREFIX = valgrind 7#PREFIX = valgrind
9NEIGHBOUR_LIMIT = 50 8NEIGHBOUR_LIMIT = 50
diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in
index 7abe1c998..cccb60c2f 100644
--- a/src/util/resolver.conf.in
+++ b/src/util/resolver.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@JAVAPORT@PORT = 2089 3@JAVAPORT@PORT = 2089
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-resolver 6BINARY = gnunet-service-resolver
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
diff --git a/src/util/util.conf b/src/util/util.conf
index f3d301e48..1390a866a 100644
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -1,8 +1,6 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = ~/.gnunet/ 2SERVICEHOME = ~/.gnunet/
3# SERVICEHOME = /var/lib/gnunet/ 3# SERVICEHOME = /var/lib/gnunet/
4# DEFAULTCONFIG = /etc/gnunet.conf
5# If 'DEFAULTCONFIG' is not defined, the current
6# configuration file is assumed to be the default, 4# configuration file is assumed to be the default,
7# which is what we want by default... 5# which is what we want by default...
8 6
diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in
index f5eb22447..9080bb439 100644
--- a/src/vpn/vpn.conf.in
+++ b/src/vpn/vpn.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
3@UNIXONLY@ PORT = 0 3@UNIXONLY@ PORT = 0
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-vpn 6BINARY = gnunet-service-vpn
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;