diff options
25 files changed, 14 insertions, 495 deletions
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index fbac192c1..45441ea9e 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf | |||
@@ -12,6 +12,16 @@ BROADCAST = NO | |||
12 | [transport-unix] | 12 | [transport-unix] |
13 | PORT = 12017 | 13 | PORT = 12017 |
14 | 14 | ||
15 | [transport-http_server] | ||
16 | PORT = 12018 | ||
17 | USE_IPv6 = YES | ||
18 | |||
19 | [transport-https_server] | ||
20 | PORT = 12019 | ||
21 | KEY_FILE = $GNUNET_TEST_HOME/https_key_p1.key | ||
22 | CERT_FILE = $GNUNET_TEST_HOME/https_cert_p1.crt | ||
23 | USE_IPv6 = YES | ||
24 | |||
15 | [arm] | 25 | [arm] |
16 | PORT = 12014 | 26 | PORT = 12014 |
17 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | 27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf index 8f50bf113..b707ee971 100644 --- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf | |||
@@ -6,25 +6,7 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/ | |||
6 | INTERFACE = hci0 | 6 | INTERFACE = hci0 |
7 | TESTMODE = 1 | 7 | TESTMODE = 1 |
8 | 8 | ||
9 | [arm] | ||
10 | PORT = 12164 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12163 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12162 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12161 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 9 | [transport] |
26 | PORT = 12160 | ||
27 | PLUGINS = bluetooth | 10 | PLUGINS = bluetooth |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
29 | 11 | ||
30 | 12 | ||
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf index 1816ec99e..ba79f4ab2 100644 --- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf | |||
@@ -6,24 +6,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/ | |||
6 | INTERFACE = hci1 | 6 | INTERFACE = hci1 |
7 | TESTMODE = 2 | 7 | TESTMODE = 2 |
8 | 8 | ||
9 | [arm] | ||
10 | PORT = 12174 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12173 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12172 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12171 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 9 | [transport] |
26 | PORT = 12170 | ||
27 | PLUGINS = bluetooth | 10 | PLUGINS = bluetooth |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
29 | 11 | ||
diff --git a/src/transport/test_transport_address_switch_http_peer1.conf b/src/transport/test_transport_address_switch_http_peer1.conf index 623d1c114..e361719ec 100644 --- a/src/transport/test_transport_address_switch_http_peer1.conf +++ b/src/transport/test_transport_address_switch_http_peer1.conf | |||
@@ -21,28 +21,6 @@ WLAN_QUOTA_OUT = 8 KiB | |||
21 | BLUETOOTH_QUOTA_IN = 8 KiB | 21 | BLUETOOTH_QUOTA_IN = 8 KiB |
22 | BLUETOOTH_QUOTA_OUT = 8 KiB | 22 | BLUETOOTH_QUOTA_OUT = 8 KiB |
23 | 23 | ||
24 | [transport-tcp] | ||
25 | PORT = 12000 | ||
26 | TIMEOUT = 5 s | ||
27 | |||
28 | [arm] | ||
29 | PORT = 12005 | ||
30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
31 | |||
32 | [statistics] | ||
33 | PORT = 12004 | ||
34 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
35 | |||
36 | [resolver] | ||
37 | PORT = 12003 | ||
38 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
39 | |||
40 | [peerinfo] | ||
41 | PORT = 12002 | ||
42 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
43 | |||
44 | [transport] | 24 | [transport] |
45 | PORT = 12001 | ||
46 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
47 | PLUGINS = http_server http_client | 25 | PLUGINS = http_server http_client |
48 | 26 | ||
diff --git a/src/transport/test_transport_address_switch_http_peer2.conf b/src/transport/test_transport_address_switch_http_peer2.conf index b783b0710..3c6f4a2a8 100644 --- a/src/transport/test_transport_address_switch_http_peer2.conf +++ b/src/transport/test_transport_address_switch_http_peer2.conf | |||
@@ -21,28 +21,6 @@ WLAN_QUOTA_OUT = 8 KiB | |||
21 | BLUETOOTH_QUOTA_IN = 8 KiB | 21 | BLUETOOTH_QUOTA_IN = 8 KiB |
22 | BLUETOOTH_QUOTA_OUT = 8 KiB | 22 | BLUETOOTH_QUOTA_OUT = 8 KiB |
23 | 23 | ||
24 | [transport-tcp] | ||
25 | PORT = 12015 | ||
26 | TIMEOUT = 5 s | ||
27 | |||
28 | [arm] | ||
29 | PORT = 12014 | ||
30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
31 | |||
32 | [statistics] | ||
33 | PORT = 12013 | ||
34 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
35 | |||
36 | [resolver] | ||
37 | PORT = 12012 | ||
38 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
39 | |||
40 | [peerinfo] | ||
41 | PORT = 12011 | ||
42 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
43 | |||
44 | [transport] | 24 | [transport] |
45 | PORT = 12010 | ||
46 | PLUGINS = http_client http_server | 25 | PLUGINS = http_client http_server |
47 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
48 | 26 | ||
diff --git a/src/transport/test_transport_api_bluetooth_peer1.conf b/src/transport/test_transport_api_bluetooth_peer1.conf index d63bca939..12d2ee881 100644 --- a/src/transport/test_transport_api_bluetooth_peer1.conf +++ b/src/transport/test_transport_api_bluetooth_peer1.conf | |||
@@ -6,30 +6,5 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/ | |||
6 | INTERFACE = hci0 | 6 | INTERFACE = hci0 |
7 | TESTMODE = 1 | 7 | TESTMODE = 1 |
8 | 8 | ||
9 | [arm] | ||
10 | PORT = 12164 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12163 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12162 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12161 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 9 | [transport] |
26 | PORT = 12160 | ||
27 | PLUGINS = bluetooth | 10 | PLUGINS = bluetooth |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
29 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | ||
30 | #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 | ||
31 | #PREFIX = valgrind --leak-check=full --show-reachable=yes | ||
32 | #PREFIX = valgrind --leak-check=full | ||
33 | #PREFIX = valgrind --tool=massif | ||
34 | #PREFIX = gdbserver :2345 | ||
35 | |||
diff --git a/src/transport/test_transport_api_bluetooth_peer2.conf b/src/transport/test_transport_api_bluetooth_peer2.conf index 4a19cddf5..b44f7cc53 100644 --- a/src/transport/test_transport_api_bluetooth_peer2.conf +++ b/src/transport/test_transport_api_bluetooth_peer2.conf | |||
@@ -6,29 +6,5 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/ | |||
6 | INTERFACE = hci1 | 6 | INTERFACE = hci1 |
7 | TESTMODE = 2 | 7 | TESTMODE = 2 |
8 | 8 | ||
9 | [arm] | ||
10 | PORT = 12174 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12173 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12172 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12171 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 9 | [transport] |
26 | PORT = 12170 | ||
27 | PLUGINS = bluetooth | 10 | PLUGINS = bluetooth |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
29 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | ||
30 | #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 | ||
31 | #PREFIX = valgrind --leak-check=full --show-reachable=yes | ||
32 | #PREFIX = valgrind --leak-check=full | ||
33 | #PREFIX = valgrind --tool=massif | ||
34 | #PREFIX = gdbserver :2345 | ||
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf index 297382fcf..72b8006b1 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf | |||
@@ -2,28 +2,6 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | ||
6 | PORT = 12000 | ||
7 | TIMEOUT = 5 s | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12005 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12004 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12003 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12002 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 5 | [transport] |
26 | PORT = 12001 | ||
27 | PLUGINS = tcp | 6 | PLUGINS = tcp |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
29 | 7 | ||
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf index 326943504..ba7e5ff24 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf | |||
@@ -2,28 +2,7 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | ||
6 | PORT = 12015 | ||
7 | TIMEOUT = 5 s | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12014 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12013 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12012 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12011 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 5 | [transport] |
26 | PORT = 12010 | ||
27 | PLUGINS = tcp | 6 | PLUGINS = tcp |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | 7 | |
29 | 8 | ||
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index f7bc22fd2..de0ff8506 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf | |||
@@ -2,29 +2,5 @@ | |||
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 | [transport-http_client] | ||
6 | |||
7 | [arm] | ||
8 | PORT = 12085 | ||
9 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
10 | |||
11 | [statistics] | ||
12 | PORT = 12084 | ||
13 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
14 | |||
15 | [resolver] | ||
16 | PORT = 12083 | ||
17 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
18 | |||
19 | [peerinfo] | ||
20 | PORT = 12082 | ||
21 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
22 | |||
23 | [transport] | 5 | [transport] |
24 | PORT = 12081 | ||
25 | PLUGINS = http_client | 6 | PLUGINS = http_client |
26 | #BINARY = .libs/gnunet-service-transport | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
28 | #PREFIX = valgrind --leak-check=full | ||
29 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | ||
30 | |||
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 4e443d890..1559c78fd 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf | |||
@@ -2,29 +2,5 @@ | |||
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 | [transport-http_server] | ||
6 | PORT = 12090 | ||
7 | USE_IPv6 = YES | ||
8 | #BINDTO = 127.0.0.1 | ||
9 | |||
10 | [arm] | ||
11 | PORT = 12095 | ||
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
13 | |||
14 | [statistics] | ||
15 | PORT = 12094 | ||
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
17 | |||
18 | [resolver] | ||
19 | PORT = 12093 | ||
20 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
21 | |||
22 | [peerinfo] | ||
23 | PORT = 12092 | ||
24 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
25 | |||
26 | [transport] | 5 | [transport] |
27 | PORT = 12091 | ||
28 | PLUGINS = http_server | 6 | PLUGINS = http_server |
29 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
30 | #PREFIX = valgrind --leak-check=full | ||
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf index 9b203a819..ae29d8a29 100644 --- a/src/transport/test_transport_api_http_reverse_peer1.conf +++ b/src/transport/test_transport_api_http_reverse_peer1.conf | |||
@@ -2,37 +2,10 @@ | |||
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 | |||
6 | [transport-http_client] | ||
7 | |||
8 | [arm] | ||
9 | PORT = 12095 | ||
10 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
11 | |||
12 | [statistics] | ||
13 | PORT = 12094 | ||
14 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
15 | |||
16 | [resolver] | ||
17 | PORT = 12093 | ||
18 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
19 | |||
20 | [peerinfo] | ||
21 | PORT = 12092 | ||
22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
23 | |||
24 | [transport] | 5 | [transport] |
25 | PORT = 12091 | ||
26 | PLUGINS = http_client | 6 | PLUGINS = http_client |
27 | #BINARY = .libs/gnunet-service-transport | ||
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
29 | PREFIX = valgrind --leak-check=full | ||
30 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | ||
31 | |||
32 | 7 | ||
33 | [ats] | 8 | [ats] |
34 | WAN_QUOTA_IN = unlimited | 9 | WAN_QUOTA_IN = unlimited |
35 | WAN_QUOTA_OUT = unlimited | 10 | WAN_QUOTA_OUT = unlimited |
36 | PORT = 12006 | ||
37 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-http_reserver_p1-service-ats.sock | ||
38 | 11 | ||
diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf index e5a2fa73d..7117895ef 100644 --- a/src/transport/test_transport_api_http_reverse_peer2.conf +++ b/src/transport/test_transport_api_http_reverse_peer2.conf | |||
@@ -2,38 +2,12 @@ | |||
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 | |||
6 | [transport-http_client] | ||
7 | |||
8 | [transport-http_server] | 5 | [transport-http_server] |
9 | PORT = 8080 | 6 | PORT = 8080 |
10 | EXTERNAL_HOSTNAME = fulcrum.net.in.tum.de/gnunet | 7 | EXTERNAL_HOSTNAME = fulcrum.net.in.tum.de/gnunet |
11 | EXTERNAL_HOSTNAME_ONLY = YES | 8 | EXTERNAL_HOSTNAME_ONLY = YES |
12 | #USE_IPV4 = YES | ||
13 | #USE_IPV6 = YES | ||
14 | #BINDTO = 127.0.0.1 | ||
15 | #BINDTO6 = ::1 | ||
16 | |||
17 | [arm] | ||
18 | PORT = 12085 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
20 | |||
21 | [statistics] | ||
22 | PORT = 12084 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
24 | |||
25 | [resolver] | ||
26 | PORT = 12083 | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
28 | |||
29 | [peerinfo] | ||
30 | PORT = 12082 | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
32 | 9 | ||
33 | [transport] | 10 | [transport] |
34 | PORT = 12081 | ||
35 | PLUGINS = http_server | 11 | PLUGINS = http_server |
36 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | 12 | |
37 | PREFIX = valgrind --leak-check=full | ||
38 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | ||
39 | 13 | ||
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index e682b9b76..8fc2edf2e 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf | |||
@@ -2,11 +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 | PORT = 12100 | ||
7 | KEY_FILE = $GNUNET_TEST_HOME/https_key_p1.key | ||
8 | CERT_FILE = $GNUNET_TEST_HOME/https_cert_p1.crt | ||
9 | |||
10 | [arm] | 5 | [arm] |
11 | PORT = 12105 | 6 | PORT = 12105 |
12 | 7 | ||
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index b6c699057..d2bf20011 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf | |||
@@ -6,13 +6,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/ | |||
6 | EXTERNAL_HOSTNAME = localhost | 6 | EXTERNAL_HOSTNAME = localhost |
7 | EXTERNAL_HOSTNAME_ONLY = yes | 7 | EXTERNAL_HOSTNAME_ONLY = yes |
8 | EXTERNAL_HOSTNAME_USE_PORT = YES | 8 | EXTERNAL_HOSTNAME_USE_PORT = YES |
9 | #VERIFY_EXTERNAL_HOSTNAME = YES | ||
10 | #PORT = 10000 | ||
11 | # Does the external hostname use the same port? | ||
12 | USE_IPv6 = YES | ||
13 | #BINDTO = 127.0.0.1 | ||
14 | KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key | ||
15 | CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt | ||
16 | 9 | ||
17 | [arm] | 10 | [arm] |
18 | PORT = 12115 | 11 | PORT = 12115 |
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf index 4cdfdcdee..e9b61028c 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf | |||
@@ -2,29 +2,8 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | ||
6 | PORT = 12000 | ||
7 | TIMEOUT = 5 s | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12005 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12004 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12003 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12002 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 5 | [transport] |
26 | PORT = 12001 | ||
27 | PLUGINS = tcp | 6 | PLUGINS = tcp |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | 7 | |
29 | 8 | ||
30 | 9 | ||
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 da6e70185..afb412cd0 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf | |||
@@ -2,28 +2,6 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | ||
6 | PORT = 0 | ||
7 | TIMEOUT = 5 s | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12014 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12013 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12012 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12011 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 5 | [transport] |
26 | PORT = 12010 | ||
27 | PLUGINS = tcp | 6 | PLUGINS = tcp |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
29 | 7 | ||
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf b/src/transport/test_transport_api_manipulation_cfg_peer1.conf index 49ddc3236..e611b1ae9 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer1.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer1.conf | |||
@@ -2,29 +2,7 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | ||
6 | PORT = 12000 | ||
7 | TIMEOUT = 5 s | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12005 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12004 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12003 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12002 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 5 | [transport] |
26 | PORT = 12001 | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
28 | PLUGINS = tcp | 6 | PLUGINS = tcp |
29 | MANIPULATE_DELAY_IN = 100 ms | 7 | MANIPULATE_DELAY_IN = 100 ms |
30 | MANIPULATE_DELAY_OUT = 100 ms | 8 | 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 fa3f25e04..2c0251fa3 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer2.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer2.conf | |||
@@ -2,29 +2,7 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | ||
6 | PORT = 12015 | ||
7 | TIMEOUT = 5 s | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12014 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12013 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12012 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12011 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 5 | [transport] |
26 | PORT = 12010 | ||
27 | PLUGINS = tcp | 6 | PLUGINS = tcp |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
29 | #MANIPULATE_DELAY_IN = 0 ms | 7 | #MANIPULATE_DELAY_IN = 0 ms |
30 | #MANIPULATE_DELAY_OUT = 0 ms | 8 | #MANIPULATE_DELAY_OUT = 0 ms |
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index d75e23e06..72b8006b1 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf | |||
@@ -2,28 +2,6 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport-tcp] | ||
6 | PORT = 12000 | ||
7 | TIMEOUT = 5 s | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12005 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12004 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12003 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12002 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 5 | [transport] |
26 | PORT = 12001 | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
28 | PLUGINS = tcp | 6 | PLUGINS = tcp |
29 | 7 | ||
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 326943504..afb412cd0 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf | |||
@@ -2,28 +2,6 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport-tcp] | ||
6 | PORT = 12015 | ||
7 | TIMEOUT = 5 s | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12014 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
12 | |||
13 | [statistics] | ||
14 | PORT = 12013 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
16 | |||
17 | [resolver] | ||
18 | PORT = 12012 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
20 | |||
21 | [peerinfo] | ||
22 | PORT = 12011 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
24 | |||
25 | [transport] | 5 | [transport] |
26 | PORT = 12010 | ||
27 | PLUGINS = tcp | 6 | PLUGINS = tcp |
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
29 | 7 | ||
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index 70af52994..7c1f0d9f9 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf | |||
@@ -5,31 +5,13 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/ | |||
5 | [transport-udp] | 5 | [transport-udp] |
6 | PORT = 0 | 6 | PORT = 0 |
7 | BROADCAST = NO | 7 | BROADCAST = NO |
8 | BROADCAST_INTERVAL = 30000 | ||
9 | MAX_BPS = 50000000 | 8 | MAX_BPS = 50000000 |
10 | BINDTO = 127.0.0.1 | 9 | BINDTO = 127.0.0.1 |
11 | BINDTO6 = ::1 | 10 | BINDTO6 = ::1 |
12 | 11 | ||
13 | [arm] | ||
14 | PORT = 12045 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
16 | |||
17 | [statistics] | ||
18 | PORT = 12044 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
20 | |||
21 | [resolver] | ||
22 | PORT = 12043 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
24 | |||
25 | [peerinfo] | ||
26 | PORT = 12042 | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
28 | |||
29 | [transport] | 12 | [transport] |
30 | #PREFIX = valgrind --leak-check=full | ||
31 | PORT = 12041 | 13 | PORT = 12041 |
32 | PLUGINS = udp | 14 | PLUGINS = udp |
33 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | 15 | |
34 | 16 | ||
35 | 17 | ||
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index 6400ef554..ab9b2148f 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf | |||
@@ -9,25 +9,7 @@ MAX_BPS = 50000000 | |||
9 | BINDTO = 127.0.0.1 | 9 | BINDTO = 127.0.0.1 |
10 | BINDTO6 = ::1 | 10 | BINDTO6 = ::1 |
11 | 11 | ||
12 | [arm] | ||
13 | PORT = 12055 | ||
14 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
15 | |||
16 | [statistics] | ||
17 | PORT = 12054 | ||
18 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
19 | |||
20 | [resolver] | ||
21 | PORT = 12053 | ||
22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
23 | |||
24 | [peerinfo] | ||
25 | PORT = 12052 | ||
26 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
27 | |||
28 | [transport] | 12 | [transport] |
29 | PORT = 12051 | ||
30 | PLUGINS = udp | 13 | PLUGINS = udp |
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
32 | 14 | ||
33 | 15 | ||
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf index d43ef4a33..292756806 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf | |||
@@ -2,26 +2,8 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/ |
4 | 4 | ||
5 | [arm] | ||
6 | PORT = 12125 | ||
7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
8 | |||
9 | [statistics] | ||
10 | PORT = 12124 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
12 | |||
13 | [resolver] | ||
14 | PORT = 12123 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
16 | |||
17 | [peerinfo] | ||
18 | PORT = 12122 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
20 | |||
21 | [transport] | 5 | [transport] |
22 | PORT = 12121 | ||
23 | PLUGINS = unix | 6 | PLUGINS = unix |
24 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
25 | 7 | ||
26 | [transport-unix] | 8 | [transport-unix] |
27 | PORT = 12120 | 9 | PORT = 12120 |
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index 9feed6592..6da2a2b7c 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf | |||
@@ -2,27 +2,6 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/ |
4 | 4 | ||
5 | [arm] | ||
6 | PORT = 12135 | ||
7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
8 | |||
9 | [statistics] | ||
10 | PORT = 12134 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
12 | |||
13 | [resolver] | ||
14 | PORT = 12133 | ||
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
16 | |||
17 | [peerinfo] | ||
18 | PORT = 12132 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
20 | |||
21 | [transport] | 5 | [transport] |
22 | PORT = 12131 | ||
23 | PLUGINS = unix | 6 | PLUGINS = unix |
24 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
25 | |||
26 | [transport-unix] | ||
27 | PORT = 12136 | ||
28 | 7 | ||