diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-10 17:11:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-10 17:11:06 +0000 |
commit | b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a (patch) | |
tree | be6defbdf18e3af9bdcc979cf27b253fe0b4d5f9 /src/transport | |
parent | 3871fc32bbd05da817d94f4188023a4edebc367a (diff) | |
download | gnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.tar.gz gnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.zip |
moving away from DEFAULTSERVICES to per-section FORCESTART, thus addressing #3565 indirectly
Diffstat (limited to 'src/transport')
67 files changed, 15 insertions, 100 deletions
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 | |||
7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | 7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock |
8 | PLUGINS = http_client | 8 | PLUGINS = http_client |
9 | 9 | ||
10 | [transport-http_client] | ||
11 | |||
12 | [nat] | 10 | [nat] |
13 | # Disable IPv6 support | 11 | # Disable IPv6 support |
14 | DISABLEV6 = YES | 12 | DISABLEV6 = YES |
@@ -18,7 +16,6 @@ RETURN_LOCAL_ADDRESSES = NO | |||
18 | 16 | ||
19 | [arm] | 17 | [arm] |
20 | PORT = 12005 | 18 | PORT = 12005 |
21 | DEFAULTSERVICES = transport hostlist | ||
22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
23 | 20 | ||
24 | [statistics] | 21 | [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 | |||
19 | 19 | ||
20 | [arm] | 20 | [arm] |
21 | PORT = 12014 | 21 | PORT = 12014 |
22 | DEFAULTSERVICES = transport hostlist | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
24 | 23 | ||
25 | [statistics] | 24 | [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 | |||
18 | 18 | ||
19 | [arm] | 19 | [arm] |
20 | PORT = 12005 | 20 | PORT = 12005 |
21 | DEFAULTSERVICES = transport hostlist | ||
22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 21 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
23 | 22 | ||
24 | [statistics] | 23 | [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 | |||
19 | 19 | ||
20 | [arm] | 20 | [arm] |
21 | PORT = 12014 | 21 | PORT = 12014 |
22 | DEFAULTSERVICES = transport hostlist | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
24 | 23 | ||
25 | [statistics] | 24 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport hostlist | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport hostlist | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
24 | 24 | ||
25 | [arm] | 25 | [arm] |
26 | PORT = 12005 | 26 | PORT = 12005 |
27 | DEFAULTSERVICES = transport hostlist | ||
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
29 | 28 | ||
30 | [statistics] | 29 | [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 | |||
24 | 24 | ||
25 | [arm] | 25 | [arm] |
26 | PORT = 12014 | 26 | PORT = 12014 |
27 | DEFAULTSERVICES = transport hostlist | ||
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
29 | 28 | ||
30 | [statistics] | 29 | [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 | |||
12 | 12 | ||
13 | [arm] | 13 | [arm] |
14 | PORT = 12005 | 14 | PORT = 12005 |
15 | DEFAULTSERVICES = transport hostlist | ||
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
17 | 16 | ||
18 | [statistics] | 17 | [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 | |||
13 | 13 | ||
14 | [arm] | 14 | [arm] |
15 | PORT = 12014 | 15 | PORT = 12014 |
16 | DEFAULTSERVICES = transport hostlist | ||
17 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 16 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
18 | 17 | ||
19 | [statistics] | 18 | [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 | |||
18 | 18 | ||
19 | [arm] | 19 | [arm] |
20 | PORT = 12005 | 20 | PORT = 12005 |
21 | DEFAULTSERVICES = transport | ||
22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 21 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
23 | 22 | ||
24 | [statistics] | 23 | [statistics] |
@@ -46,4 +45,4 @@ PORT = 12006 | |||
46 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock | 45 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock |
47 | 46 | ||
48 | [hostlist] | 47 | [hostlist] |
49 | SERVERS = dummy \ No newline at end of file | 48 | 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 | |||
14 | 14 | ||
15 | [arm] | 15 | [arm] |
16 | PORT = 12014 | 16 | PORT = 12014 |
17 | DEFAULTSERVICES = transport | ||
18 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 17 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
19 | 18 | ||
20 | [statistics] | 19 | [statistics] |
@@ -40,4 +39,4 @@ PORT = 12016 | |||
40 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock | 39 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock |
41 | 40 | ||
42 | [hostlist] | 41 | [hostlist] |
43 | SERVERS = dummy \ No newline at end of file | 42 | 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 | |||
8 | [transport-udp] | 8 | [transport-udp] |
9 | PORT = 2401 | 9 | PORT = 2401 |
10 | 10 | ||
11 | [transport-unix] | ||
12 | |||
13 | [transport-wlan] | 11 | [transport-wlan] |
14 | INTERFACE = mon0 | 12 | INTERFACE = mon0 |
15 | TESTMODE = 1 | 13 | TESTMODE = 1 |
@@ -18,13 +16,9 @@ TESTMODE = 1 | |||
18 | INTERFACE = hci0 | 16 | INTERFACE = hci0 |
19 | TESTMODE = 1 | 17 | TESTMODE = 1 |
20 | 18 | ||
21 | [transport-http_client] | ||
22 | |||
23 | [transport-http_server] | 19 | [transport-http_server] |
24 | PORT = 2402 | 20 | PORT = 2402 |
25 | 21 | ||
26 | [transport-https_client] | ||
27 | |||
28 | [transport-https_server] | 22 | [transport-https_server] |
29 | PORT = 2403 | 23 | PORT = 2403 |
30 | 24 | ||
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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | PORT = 12005 | 29 | PORT = 12005 |
30 | DEFAULTSERVICES = transport | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
32 | 31 | ||
33 | [statistics] | 32 | [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 | |||
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | PORT = 12014 | 29 | PORT = 12014 |
30 | DEFAULTSERVICES = transport | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
32 | 31 | ||
33 | [statistics] | 32 | [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 | |||
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | PORT = 12005 | 29 | PORT = 12005 |
30 | DEFAULTSERVICES = transport | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
32 | 31 | ||
33 | [statistics] | 32 | [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 | |||
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | PORT = 12014 | 29 | PORT = 12014 |
30 | DEFAULTSERVICES = transport | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
32 | 31 | ||
33 | [statistics] | 32 | [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 | |||
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | PORT = 12005 | 29 | PORT = 12005 |
30 | DEFAULTSERVICES = transport | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
32 | 31 | ||
33 | [statistics] | 32 | [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 | |||
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | PORT = 12014 | 29 | PORT = 12014 |
30 | DEFAULTSERVICES = transport | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
32 | 31 | ||
33 | [statistics] | 32 | [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 | |||
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | PORT = 12005 | 29 | PORT = 12005 |
30 | DEFAULTSERVICES = transport | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
32 | 31 | ||
33 | [statistics] | 32 | [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 | |||
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | PORT = 12014 | 29 | PORT = 12014 |
30 | DEFAULTSERVICES = transport | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
32 | 31 | ||
33 | [statistics] | 32 | [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/ | |||
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12000 | 6 | PORT = 12000 |
7 | DEFAULTSERVICES = transport | ||
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
9 | 8 | ||
10 | [statistics] | 9 | [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/ | |||
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 12010 | 6 | PORT = 12010 |
7 | DEFAULTSERVICES = transport | ||
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
9 | 8 | ||
10 | [statistics] | 9 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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/ | |||
6 | 6 | ||
7 | [arm] | 7 | [arm] |
8 | PORT = 12085 | 8 | PORT = 12085 |
9 | DEFAULTSERVICES = transport | ||
10 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 9 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
11 | 10 | ||
12 | [statistics] | 11 | [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 | |||
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12095 | 11 | PORT = 12095 |
12 | DEFAULTSERVICES = transport | ||
13 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
14 | 13 | ||
15 | [statistics] | 14 | [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/ | |||
7 | 7 | ||
8 | [arm] | 8 | [arm] |
9 | PORT = 12095 | 9 | PORT = 12095 |
10 | DEFAULTSERVICES = transport | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 10 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
12 | 11 | ||
13 | [statistics] | 12 | [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 | |||
16 | 16 | ||
17 | [arm] | 17 | [arm] |
18 | PORT = 12085 | 18 | PORT = 12085 |
19 | DEFAULTSERVICES = transport | ||
20 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
21 | 20 | ||
22 | [statistics] | 21 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [statistics] |
@@ -28,4 +27,4 @@ PORT = 12001 | |||
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | 27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock |
29 | PLUGINS = tcp | 28 | PLUGINS = tcp |
30 | MANIPULATE_DELAY_IN = 100 ms | 29 | MANIPULATE_DELAY_IN = 100 ms |
31 | MANIPULATE_DELAY_OUT = 100 ms \ No newline at end of file | 30 | 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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
17 | 17 | ||
18 | [arm] | 18 | [arm] |
19 | PORT = 12149 | 19 | PORT = 12149 |
20 | DEFAULTSERVICES = transport | ||
21 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 20 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
22 | 21 | ||
23 | [statistics] | 22 | [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 | |||
20 | 20 | ||
21 | [arm] | 21 | [arm] |
22 | PORT = 12159 | 22 | PORT = 12159 |
23 | DEFAULTSERVICES = transport | ||
24 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
25 | 24 | ||
26 | [statistics] | 25 | [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 | |||
13 | 13 | ||
14 | [arm] | 14 | [arm] |
15 | PORT = 1204 | 15 | PORT = 1204 |
16 | DEFAULTSERVICES = transport | ||
17 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 16 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
18 | 17 | ||
19 | [statistics] | 18 | [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 | |||
12 | 12 | ||
13 | [arm] | 13 | [arm] |
14 | PORT = 12034 | 14 | PORT = 12034 |
15 | DEFAULTSERVICES = transport | ||
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
17 | 16 | ||
18 | [statistics] | 17 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
13 | 13 | ||
14 | [arm] | 14 | [arm] |
15 | PORT = 1204 | 15 | PORT = 1204 |
16 | DEFAULTSERVICES = transport | ||
17 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 16 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
18 | 17 | ||
19 | [statistics] | 18 | [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 | |||
12 | 12 | ||
13 | [arm] | 13 | [arm] |
14 | PORT = 12034 | 14 | PORT = 12034 |
15 | DEFAULTSERVICES = transport | ||
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
17 | 16 | ||
18 | [statistics] | 17 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ |
4 | 4 | ||
5 | [nat] | ||
6 | |||
7 | [transport-http_client] | ||
8 | |||
9 | [arm] | 5 | [arm] |
10 | PORT = 12085 | 6 | PORT = 12085 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 8 | ||
14 | [statistics] | 9 | [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 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/ |
4 | 4 | ||
5 | [nat] | ||
6 | |||
7 | [transport-http_server] | 5 | [transport-http_server] |
8 | PORT = 12090 | 6 | PORT = 12090 |
9 | USE_IPv6 = NO | 7 | USE_IPv6 = NO |
@@ -12,7 +10,6 @@ BINDTO = 127.0.0.1 | |||
12 | 10 | ||
13 | [arm] | 11 | [arm] |
14 | PORT = 12095 | 12 | PORT = 12095 |
15 | DEFAULTSERVICES = transport | ||
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 13 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
17 | 14 | ||
18 | [statistics] | 15 | [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 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/ |
4 | 4 | ||
5 | [transport-https_client] | ||
6 | |||
7 | [arm] | 5 | [arm] |
8 | PORT = 12105 | 6 | PORT = 12105 |
9 | 7 | ||
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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
10 | 10 | ||
11 | [arm] | 11 | [arm] |
12 | PORT = 12014 | 12 | PORT = 12014 |
13 | DEFAULTSERVICES = transport | ||
14 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 13 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
15 | 14 | ||
16 | [statistics] | 15 | [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 | |||
12 | 12 | ||
13 | [arm] | 13 | [arm] |
14 | PORT = 12065 | 14 | PORT = 12065 |
15 | DEFAULTSERVICES = transport | ||
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
17 | 16 | ||
18 | [statistics] | 17 | [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 | |||
10 | 10 | ||
11 | [arm] | 11 | [arm] |
12 | PORT = 12075 | 12 | PORT = 12075 |
13 | DEFAULTSERVICES = transport | ||
14 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 13 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
15 | 14 | ||
16 | [statistics] | 15 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [statistics] |
@@ -33,4 +32,4 @@ PLUGINS = tcp | |||
33 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 | 32 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 |
34 | 33 | ||
35 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] | 34 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] |
36 | DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = \ No newline at end of file | 35 | 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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [statistics] |
@@ -34,4 +33,4 @@ PLUGINS = tcp udp | |||
34 | 33 | ||
35 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] | 34 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] |
36 | DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp | 35 | DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp |
37 | \ No newline at end of file | 36 | |
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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [statistics] |
@@ -34,4 +33,4 @@ PLUGINS = tcp | |||
34 | 33 | ||
35 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] | 34 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] |
36 | DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp | 35 | DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp |
37 | \ No newline at end of file | 36 | |
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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [statistics] |
@@ -34,4 +33,4 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | |||
34 | 33 | ||
35 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] | 34 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] |
36 | 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = | 35 | 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = |
37 | \ No newline at end of file | 36 | |
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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [statistics] |
@@ -33,4 +32,4 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | |||
33 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 | 32 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 |
34 | 33 | ||
35 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] | 34 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] |
36 | 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp \ No newline at end of file | 35 | 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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [statistics] |
@@ -33,4 +32,4 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | |||
33 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 | 32 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 |
34 | 33 | ||
35 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] | 34 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] |
36 | 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp \ No newline at end of file | 35 | 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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12005 | 10 | PORT = 12005 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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 | |||
8 | 8 | ||
9 | [arm] | 9 | [arm] |
10 | PORT = 12014 | 10 | PORT = 12014 |
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
13 | 12 | ||
14 | [statistics] | 13 | [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/ | |||
4 | [transport-tcp] | 4 | [transport-tcp] |
5 | TIMEOUT = 300 s | 5 | TIMEOUT = 300 s |
6 | 6 | ||
7 | [arm] | ||
8 | DEFAULTSERVICES = | ||
9 | |||
10 | [transport] | 7 | [transport] |
11 | #PREFIX = valgrind -v --gen-suppressions=yes | 8 | #PREFIX = valgrind -v --gen-suppressions=yes |
12 | 9 | ||
13 | [core] | 10 | [core] |
14 | AUTOSTART = NO | 11 | AUTOSTART = NO |
12 | FORCESTART = NO | ||
15 | 13 | ||
16 | [datastore] | 14 | [datastore] |
17 | AUTOSTART = NO | 15 | AUTOSTART = NO |
18 | 16 | ||
19 | [fs] | 17 | [fs] |
20 | AUTOSTART = NO | 18 | AUTOSTART = NO |
19 | FORCESTART = NO | ||
21 | 20 | ||
22 | [dht] | 21 | [dht] |
23 | AUTOSTART = NO | 22 | AUTOSTART = NO |
23 | FORCESTART = NO | ||
24 | 24 | ||
25 | [cadet] | 25 | [cadet] |
26 | AUTOSTART = NO | 26 | AUTOSTART = NO |
27 | FORCESTART = NO | ||
27 | 28 | ||
28 | [nse] | 29 | [nse] |
29 | AUTOSTART = NO | 30 | AUTOSTART = NO |
31 | FORCESTART = NO | ||
30 | 32 | ||
31 | [dns] | 33 | [dns] |
32 | AUTOSTART = NO | 34 | AUTOSTART = NO |
@@ -58,9 +60,6 @@ AUTOSTART = NO | |||
58 | [sensor] | 60 | [sensor] |
59 | AUTOSTART = NO | 61 | AUTOSTART = NO |
60 | 62 | ||
61 | [mesh] | ||
62 | AUTOSTART = NO | ||
63 | |||
64 | [set] | 63 | [set] |
65 | AUTOSTART = NO | 64 | AUTOSTART = NO |
66 | 65 | ||
@@ -75,6 +74,7 @@ AUTOSTART = NO | |||
75 | 74 | ||
76 | [revocation] | 75 | [revocation] |
77 | AUTOSTART = NO | 76 | AUTOSTART = NO |
77 | FORCESTART = NO | ||
78 | 78 | ||
79 | [nat] | 79 | [nat] |
80 | DISABLEV6 = NO | 80 | DISABLEV6 = NO |
@@ -83,8 +83,5 @@ BINDTO = 127.0.0.1 | |||
83 | INTERNAL_ADDRESS = 127.0.0.1 | 83 | INTERNAL_ADDRESS = 127.0.0.1 |
84 | EXTERNAL_ADDRESS = 127.0.0.1 | 84 | EXTERNAL_ADDRESS = 127.0.0.1 |
85 | 85 | ||
86 | [TESTING] | ||
87 | WEAKRANDOM = YES | ||
88 | |||
89 | [transport-udp] | 86 | [transport-udp] |
90 | BROADCAST_RECEIVE = no | 87 | 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 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | 3 | ||
4 | [arm] | ||
5 | DEFAULTSERVICES = transport | ||
6 | |||
7 | [transport-tcp] | 4 | [transport-tcp] |
8 | PORT = 2094 | 5 | PORT = 2094 |
9 | 6 | ||
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 | |||
29 | 29 | ||
30 | [arm] | 30 | [arm] |
31 | PORT = 12014 | 31 | PORT = 12014 |
32 | DEFAULTSERVICES = transport | ||
33 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 32 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
34 | 33 | ||
35 | [statistics] | 34 | [statistics] |