From b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 10 Dec 2014 17:11:06 +0000 Subject: moving away from DEFAULTSERVICES to per-section FORCESTART, thus addressing #3565 indirectly --- src/transport/perf_http_peer1.conf | 3 --- src/transport/perf_http_peer2.conf | 1 - src/transport/perf_https_peer1.conf | 1 - src/transport/perf_https_peer2.conf | 1 - src/transport/perf_tcp_peer1.conf | 1 - src/transport/perf_tcp_peer2.conf | 1 - src/transport/perf_udp_peer1.conf | 1 - src/transport/perf_udp_peer2.conf | 1 - src/transport/perf_unix_peer1.conf | 1 - src/transport/perf_unix_peer2.conf | 1 - src/transport/template_cfg_peer1.conf | 3 +-- src/transport/template_cfg_peer2.conf | 3 +-- src/transport/test_plugin_transport_data.conf | 6 ------ .../test_quota_compliance_tcp_asymmetric_peer2.conf | 1 - src/transport/test_quota_compliance_tcp_peer2.conf | 1 - .../test_transport_address_switch_http_peer1.conf | 1 - .../test_transport_address_switch_http_peer2.conf | 1 - .../test_transport_address_switch_https_peer1.conf | 1 - .../test_transport_address_switch_https_peer2.conf | 1 - .../test_transport_address_switch_tcp_peer1.conf | 1 - .../test_transport_address_switch_tcp_peer2.conf | 1 - .../test_transport_address_switch_udp_peer1.conf | 1 - .../test_transport_address_switch_udp_peer2.conf | 1 - .../test_transport_api_bidirectional_connect_peer1.conf | 1 - .../test_transport_api_bidirectional_connect_peer2.conf | 1 - .../test_transport_api_disconnect_tcp_peer1.conf | 1 - .../test_transport_api_disconnect_tcp_peer2.conf | 1 - src/transport/test_transport_api_http_peer1.conf | 1 - src/transport/test_transport_api_http_peer2.conf | 1 - src/transport/test_transport_api_http_reverse_peer1.conf | 1 - src/transport/test_transport_api_http_reverse_peer2.conf | 1 - .../test_transport_api_limited_sockets_tcp_peer1.conf | 1 - .../test_transport_api_limited_sockets_tcp_peer2.conf | 1 - .../test_transport_api_manipulation_cfg_peer1.conf | 3 +-- .../test_transport_api_manipulation_cfg_peer2.conf | 1 - .../test_transport_api_manipulation_recv_tcp_peer1.conf | 1 - .../test_transport_api_manipulation_recv_tcp_peer2.conf | 1 - .../test_transport_api_manipulation_send_tcp_peer1.conf | 1 - .../test_transport_api_manipulation_send_tcp_peer2.conf | 1 - src/transport/test_transport_api_multi_peer1.conf | 1 - src/transport/test_transport_api_multi_peer2.conf | 1 - .../test_transport_api_reliability_tcp_nat_peer1.conf | 1 - .../test_transport_api_reliability_tcp_nat_peer2.conf | 1 - .../test_transport_api_reliability_tcp_peer1.conf | 1 - .../test_transport_api_reliability_tcp_peer2.conf | 1 - src/transport/test_transport_api_tcp_nat_peer1.conf | 1 - src/transport/test_transport_api_tcp_nat_peer2.conf | 1 - src/transport/test_transport_api_tcp_peer1.conf | 1 - src/transport/test_transport_api_tcp_peer2.conf | 1 - src/transport/test_transport_api_timeout_http_peer1.conf | 5 ----- src/transport/test_transport_api_timeout_http_peer2.conf | 3 --- src/transport/test_transport_api_timeout_https_peer1.conf | 2 -- src/transport/test_transport_api_timeout_tcp_peer1.conf | 1 - src/transport/test_transport_api_timeout_tcp_peer2.conf | 1 - src/transport/test_transport_api_udp_nat_peer1.conf | 1 - src/transport/test_transport_api_udp_nat_peer2.conf | 1 - .../test_transport_blacklisting_cfg_blp_peer1_full.conf | 3 +-- ...sport_blacklisting_cfg_blp_peer1_multiple_plugins.conf | 3 +-- .../test_transport_blacklisting_cfg_blp_peer1_plugin.conf | 3 +-- .../test_transport_blacklisting_cfg_blp_peer2_full.conf | 3 +-- ...sport_blacklisting_cfg_blp_peer2_multiple_plugins.conf | 3 +-- .../test_transport_blacklisting_cfg_blp_peer2_plugin.conf | 3 +-- src/transport/test_transport_blacklisting_cfg_peer1.conf | 1 - src/transport/test_transport_blacklisting_cfg_peer2.conf | 1 - src/transport/test_transport_defaults.conf | 15 ++++++--------- src/transport/test_transport_startonly.conf | 3 --- ...transport_test_transport_address_switch_tcp_peer2.conf | 1 - 67 files changed, 15 insertions(+), 100 deletions(-) (limited to 'src/transport') diff --git a/src/transport/perf_http_peer1.conf b/src/transport/perf_http_peer1.conf index b62be1ba1..fd99469ae 100644 --- a/src/transport/perf_http_peer1.conf +++ b/src/transport/perf_http_peer1.conf @@ -7,8 +7,6 @@ PORT = 12001 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = http_client -[transport-http_client] - [nat] # Disable IPv6 support DISABLEV6 = YES @@ -18,7 +16,6 @@ RETURN_LOCAL_ADDRESSES = NO [arm] PORT = 12005 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/perf_http_peer2.conf b/src/transport/perf_http_peer2.conf index 8ae6970f6..3c6f7fd8e 100644 --- a/src/transport/perf_http_peer2.conf +++ b/src/transport/perf_http_peer2.conf @@ -19,7 +19,6 @@ RETURN_LOCAL_ADDRESSES = NO [arm] PORT = 12014 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/perf_https_peer1.conf b/src/transport/perf_https_peer1.conf index 6a2de711c..1f8c5bc90 100644 --- a/src/transport/perf_https_peer1.conf +++ b/src/transport/perf_https_peer1.conf @@ -18,7 +18,6 @@ RETURN_LOCAL_ADDRESSES = NO [arm] PORT = 12005 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/perf_https_peer2.conf b/src/transport/perf_https_peer2.conf index 8a613b794..96d09a9ba 100644 --- a/src/transport/perf_https_peer2.conf +++ b/src/transport/perf_https_peer2.conf @@ -19,7 +19,6 @@ RETURN_LOCAL_ADDRESSES = NO [arm] PORT = 12014 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/perf_tcp_peer1.conf b/src/transport/perf_tcp_peer1.conf index 9cca25b3c..610a88ab6 100644 --- a/src/transport/perf_tcp_peer1.conf +++ b/src/transport/perf_tcp_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/perf_tcp_peer2.conf b/src/transport/perf_tcp_peer2.conf index 8f6b551e9..a39b985dc 100644 --- a/src/transport/perf_tcp_peer2.conf +++ b/src/transport/perf_tcp_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/perf_udp_peer1.conf b/src/transport/perf_udp_peer1.conf index 89822048f..225303fee 100644 --- a/src/transport/perf_udp_peer1.conf +++ b/src/transport/perf_udp_peer1.conf @@ -24,7 +24,6 @@ RETURN_LOCAL_ADDRESSES = NO [arm] PORT = 12005 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/perf_udp_peer2.conf b/src/transport/perf_udp_peer2.conf index e8b065ead..6562da5aa 100644 --- a/src/transport/perf_udp_peer2.conf +++ b/src/transport/perf_udp_peer2.conf @@ -24,7 +24,6 @@ RETURN_LOCAL_ADDRESSES = NO [arm] PORT = 12014 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/perf_unix_peer1.conf b/src/transport/perf_unix_peer1.conf index 297ae4cbc..96cda0748 100644 --- a/src/transport/perf_unix_peer1.conf +++ b/src/transport/perf_unix_peer1.conf @@ -12,7 +12,6 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-unix.sock [arm] PORT = 12005 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/perf_unix_peer2.conf b/src/transport/perf_unix_peer2.conf index 587b47b68..a9178ed8f 100644 --- a/src/transport/perf_unix_peer2.conf +++ b/src/transport/perf_unix_peer2.conf @@ -13,7 +13,6 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-unix.sock [arm] PORT = 12014 -DEFAULTSERVICES = transport hostlist UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf index 3042ce862..caab17154 100644 --- a/src/transport/template_cfg_peer1.conf +++ b/src/transport/template_cfg_peer1.conf @@ -18,7 +18,6 @@ PORT = 12007 [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] @@ -46,4 +45,4 @@ PORT = 12006 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock [hostlist] -SERVERS = dummy \ No newline at end of file +SERVERS = dummy diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index f81eeae62..fbac192c1 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf @@ -14,7 +14,6 @@ PORT = 12017 [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] @@ -40,4 +39,4 @@ PORT = 12016 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock [hostlist] -SERVERS = dummy \ No newline at end of file +SERVERS = dummy diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf index c24403954..2b9d134dc 100644 --- a/src/transport/test_plugin_transport_data.conf +++ b/src/transport/test_plugin_transport_data.conf @@ -8,8 +8,6 @@ PORT = 2400 [transport-udp] PORT = 2401 -[transport-unix] - [transport-wlan] INTERFACE = mon0 TESTMODE = 1 @@ -18,13 +16,9 @@ TESTMODE = 1 INTERFACE = hci0 TESTMODE = 1 -[transport-http_client] - [transport-http_server] PORT = 2402 -[transport-https_client] - [transport-https_server] PORT = 2403 diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf index d1e91a220..04c5161e9 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index c80e588ce..326943504 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_address_switch_http_peer1.conf b/src/transport/test_transport_address_switch_http_peer1.conf index da35eae27..623d1c114 100644 --- a/src/transport/test_transport_address_switch_http_peer1.conf +++ b/src/transport/test_transport_address_switch_http_peer1.conf @@ -27,7 +27,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_address_switch_http_peer2.conf b/src/transport/test_transport_address_switch_http_peer2.conf index 969485f80..b783b0710 100644 --- a/src/transport/test_transport_address_switch_http_peer2.conf +++ b/src/transport/test_transport_address_switch_http_peer2.conf @@ -27,7 +27,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_address_switch_https_peer1.conf b/src/transport/test_transport_address_switch_https_peer1.conf index a95dc9029..4fe0ea574 100644 --- a/src/transport/test_transport_address_switch_https_peer1.conf +++ b/src/transport/test_transport_address_switch_https_peer1.conf @@ -27,7 +27,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_address_switch_https_peer2.conf b/src/transport/test_transport_address_switch_https_peer2.conf index 61b073a6d..351e2af21 100644 --- a/src/transport/test_transport_address_switch_https_peer2.conf +++ b/src/transport/test_transport_address_switch_https_peer2.conf @@ -27,7 +27,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_address_switch_tcp_peer1.conf b/src/transport/test_transport_address_switch_tcp_peer1.conf index e00c25631..34248b9e3 100644 --- a/src/transport/test_transport_address_switch_tcp_peer1.conf +++ b/src/transport/test_transport_address_switch_tcp_peer1.conf @@ -27,7 +27,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_address_switch_tcp_peer2.conf b/src/transport/test_transport_address_switch_tcp_peer2.conf index b3fdcce09..91a699d76 100644 --- a/src/transport/test_transport_address_switch_tcp_peer2.conf +++ b/src/transport/test_transport_address_switch_tcp_peer2.conf @@ -27,7 +27,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_address_switch_udp_peer1.conf b/src/transport/test_transport_address_switch_udp_peer1.conf index 12fe3d25f..69887cf25 100644 --- a/src/transport/test_transport_address_switch_udp_peer1.conf +++ b/src/transport/test_transport_address_switch_udp_peer1.conf @@ -27,7 +27,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_address_switch_udp_peer2.conf b/src/transport/test_transport_address_switch_udp_peer2.conf index f9f1cfa5e..a0b1d405c 100644 --- a/src/transport/test_transport_address_switch_udp_peer2.conf +++ b/src/transport/test_transport_address_switch_udp_peer2.conf @@ -27,7 +27,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf index 855fa2557..dff464e45 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf @@ -4,7 +4,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ [arm] PORT = 12000 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf index c81777ae3..245175788 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf @@ -4,7 +4,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ [arm] PORT = 12010 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf index 66daf44ec..297382fcf 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf index c80e588ce..326943504 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 238089c42..f7bc22fd2 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf @@ -6,7 +6,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ [arm] PORT = 12085 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index f2b748fd8..4e443d890 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf @@ -9,7 +9,6 @@ USE_IPv6 = YES [arm] PORT = 12095 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf index aebaf88e2..9b203a819 100644 --- a/src/transport/test_transport_api_http_reverse_peer1.conf +++ b/src/transport/test_transport_api_http_reverse_peer1.conf @@ -7,7 +7,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ [arm] PORT = 12095 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf index 210e44a02..e5a2fa73d 100644 --- a/src/transport/test_transport_api_http_reverse_peer2.conf +++ b/src/transport/test_transport_api_http_reverse_peer2.conf @@ -16,7 +16,6 @@ EXTERNAL_HOSTNAME_ONLY = YES [arm] PORT = 12085 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] 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 2e9912593..4cdfdcdee 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] 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 06bd8aeca..da6e70185 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf b/src/transport/test_transport_api_manipulation_cfg_peer1.conf index 952230a49..49ddc3236 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer1.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] @@ -28,4 +27,4 @@ PORT = 12001 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp MANIPULATE_DELAY_IN = 100 ms -MANIPULATE_DELAY_OUT = 100 ms \ No newline at end of file +MANIPULATE_DELAY_OUT = 100 ms diff --git a/src/transport/test_transport_api_manipulation_cfg_peer2.conf b/src/transport/test_transport_api_manipulation_cfg_peer2.conf index 85127bee4..fa3f25e04 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer2.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf index c05439ab2..d75e23e06 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf +++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf index c80e588ce..326943504 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf +++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf index c05439ab2..d75e23e06 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf +++ b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf index c80e588ce..326943504 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf +++ b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index 0313f5b60..4a2bc08da 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf @@ -17,7 +17,6 @@ PORT = 12143 [arm] PORT = 12149 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index 2d548a66d..1cf0d9e2e 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf @@ -20,7 +20,6 @@ PORT = 12153 [arm] PORT = 12159 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] 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 6de950189..e3c14dc0b 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf @@ -13,7 +13,6 @@ TIMEOUT = 5 s [arm] PORT = 1204 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] 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 5e8b54a68..6a648c41c 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf @@ -12,7 +12,6 @@ TIMEOUT = 5 s [arm] PORT = 12034 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf index 66daf44ec..297382fcf 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf index e6baa32f6..879223ad9 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 0b2e7a4d3..946d5e1cb 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf @@ -13,7 +13,6 @@ TIMEOUT = 5 s [arm] PORT = 1204 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf index b2afa4a8d..eae20a8d5 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_tcp_nat_peer2.conf @@ -12,7 +12,6 @@ TIMEOUT = 5 s [arm] PORT = 12034 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index c05439ab2..d75e23e06 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index c80e588ce..326943504 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf index 9c3f90998..5811761d2 100644 --- a/src/transport/test_transport_api_timeout_http_peer1.conf +++ b/src/transport/test_transport_api_timeout_http_peer1.conf @@ -2,13 +2,8 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ -[nat] - -[transport-http_client] - [arm] PORT = 12085 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf index 7d0359fd2..934dc8c6c 100644 --- a/src/transport/test_transport_api_timeout_http_peer2.conf +++ b/src/transport/test_transport_api_timeout_http_peer2.conf @@ -2,8 +2,6 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/ -[nat] - [transport-http_server] PORT = 12090 USE_IPv6 = NO @@ -12,7 +10,6 @@ BINDTO = 127.0.0.1 [arm] PORT = 12095 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf index 00980de99..8fc2edf2e 100644 --- a/src/transport/test_transport_api_timeout_https_peer1.conf +++ b/src/transport/test_transport_api_timeout_https_peer1.conf @@ -2,8 +2,6 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/ -[transport-https_client] - [arm] PORT = 12105 diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf index 2e9912593..4cdfdcdee 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer1.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf index b3c68ac0e..2abd5331c 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer2.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf @@ -10,7 +10,6 @@ PORT = 12100 [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index 526f3e6b1..23f280b5e 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf @@ -12,7 +12,6 @@ PORT = 0 [arm] PORT = 12065 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index 24bb6f691..702791846 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf @@ -10,7 +10,6 @@ PORT = 12070 [arm] PORT = 12075 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf index f9b5a18cc..d9e665e35 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] @@ -33,4 +32,4 @@ PLUGINS = tcp #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] -DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = \ No newline at end of file +DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf index b56cca0f6..3f5dd407f 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] @@ -34,4 +33,4 @@ PLUGINS = tcp udp [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp - \ No newline at end of file + diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf index 05f2d0891..d1650a014 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] @@ -34,4 +33,4 @@ PLUGINS = tcp [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp - \ No newline at end of file + diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf index 1700929f7..85e8d7518 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] @@ -34,4 +33,4 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = - \ No newline at end of file + diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf index 34d4acd05..c16da07a9 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] @@ -33,4 +32,4 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] -6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp \ No newline at end of file +6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf index ad7fd4322..6af51d699 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] @@ -33,4 +32,4 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] -6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp \ No newline at end of file +6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp diff --git a/src/transport/test_transport_blacklisting_cfg_peer1.conf b/src/transport/test_transport_blacklisting_cfg_peer1.conf index c05439ab2..d75e23e06 100644 --- a/src/transport/test_transport_blacklisting_cfg_peer1.conf +++ b/src/transport/test_transport_blacklisting_cfg_peer1.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12005 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] diff --git a/src/transport/test_transport_blacklisting_cfg_peer2.conf b/src/transport/test_transport_blacklisting_cfg_peer2.conf index e6baa32f6..879223ad9 100644 --- a/src/transport/test_transport_blacklisting_cfg_peer2.conf +++ b/src/transport/test_transport_blacklisting_cfg_peer2.conf @@ -8,7 +8,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf index 48cdb0022..40b92433e 100644 --- a/src/transport/test_transport_defaults.conf +++ b/src/transport/test_transport_defaults.conf @@ -4,29 +4,31 @@ GNUNET_TEST_HOME = /tmp/test-transport-api/ [transport-tcp] TIMEOUT = 300 s -[arm] -DEFAULTSERVICES = - [transport] #PREFIX = valgrind -v --gen-suppressions=yes [core] AUTOSTART = NO +FORCESTART = NO [datastore] AUTOSTART = NO [fs] AUTOSTART = NO +FORCESTART = NO [dht] AUTOSTART = NO +FORCESTART = NO [cadet] AUTOSTART = NO +FORCESTART = NO [nse] AUTOSTART = NO +FORCESTART = NO [dns] AUTOSTART = NO @@ -58,9 +60,6 @@ AUTOSTART = NO [sensor] AUTOSTART = NO -[mesh] -AUTOSTART = NO - [set] AUTOSTART = NO @@ -75,6 +74,7 @@ AUTOSTART = NO [revocation] AUTOSTART = NO +FORCESTART = NO [nat] DISABLEV6 = NO @@ -83,8 +83,5 @@ BINDTO = 127.0.0.1 INTERNAL_ADDRESS = 127.0.0.1 EXTERNAL_ADDRESS = 127.0.0.1 -[TESTING] -WEAKRANDOM = YES - [transport-udp] BROADCAST_RECEIVE = no diff --git a/src/transport/test_transport_startonly.conf b/src/transport/test_transport_startonly.conf index 8e161382b..164a38f69 100644 --- a/src/transport/test_transport_startonly.conf +++ b/src/transport/test_transport_startonly.conf @@ -1,9 +1,6 @@ @INLINE@ test_transport_defaults.conf [PATHS] -[arm] -DEFAULTSERVICES = transport - [transport-tcp] PORT = 2094 diff --git a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf b/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf index 6542a826d..377cfe689 100644 --- a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf +++ b/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf @@ -29,7 +29,6 @@ TIMEOUT = 5 s [arm] PORT = 12014 -DEFAULTSERVICES = transport UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] -- cgit v1.2.3