diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-11 13:43:39 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-11 13:43:39 +0000 |
commit | 0a1098b10093d1344be7455c901e938806753fd0 (patch) | |
tree | cee50f8d54bb66e32363af55dbcf1c2f72a0b196 | |
parent | d40de2c07c4a5327669044abce9675c6310a3448 (diff) | |
download | gnunet-0a1098b10093d1344be7455c901e938806753fd0.tar.gz gnunet-0a1098b10093d1344be7455c901e938806753fd0.zip |
-simplifying configs
18 files changed, 6 insertions, 421 deletions
diff --git a/src/transport/perf_http_peer1.conf b/src/transport/perf_http_peer1.conf index fd99469ae..e683a8145 100644 --- a/src/transport/perf_http_peer1.conf +++ b/src/transport/perf_http_peer1.conf | |||
@@ -3,8 +3,6 @@ | |||
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PORT = 12001 | ||
7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
8 | PLUGINS = http_client | 6 | PLUGINS = http_client |
9 | 7 | ||
10 | [nat] | 8 | [nat] |
@@ -13,23 +11,6 @@ DISABLEV6 = YES | |||
13 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | 11 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) |
14 | RETURN_LOCAL_ADDRESSES = NO | 12 | RETURN_LOCAL_ADDRESSES = NO |
15 | 13 | ||
16 | |||
17 | [arm] | ||
18 | PORT = 12005 | ||
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
20 | |||
21 | [statistics] | ||
22 | PORT = 12004 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
24 | |||
25 | [resolver] | ||
26 | PORT = 12003 | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
28 | |||
29 | [peerinfo] | ||
30 | PORT = 12002 | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
32 | |||
33 | [hostlist] | 14 | [hostlist] |
34 | OPTIONS = -b | 15 | OPTIONS = -b |
35 | SERVERS = http://localhost:9080/ | 16 | SERVERS = http://localhost:9080/ |
diff --git a/src/transport/perf_http_peer2.conf b/src/transport/perf_http_peer2.conf index 3c6f7fd8e..ab093d0ff 100644 --- a/src/transport/perf_http_peer2.conf +++ b/src/transport/perf_http_peer2.conf | |||
@@ -3,13 +3,7 @@ | |||
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PORT = 12010 | ||
7 | PLUGINS = http_server | 6 | PLUGINS = http_server |
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
9 | |||
10 | [transport-http_server] | ||
11 | PORT = 12090 | ||
12 | USE_IPv6 = YES | ||
13 | 7 | ||
14 | [nat] | 8 | [nat] |
15 | # Disable IPv6 support | 9 | # Disable IPv6 support |
@@ -17,22 +11,6 @@ DISABLEV6 = YES | |||
17 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | 11 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) |
18 | RETURN_LOCAL_ADDRESSES = NO | 12 | RETURN_LOCAL_ADDRESSES = NO |
19 | 13 | ||
20 | [arm] | ||
21 | PORT = 12014 | ||
22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 12013 | ||
26 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
27 | |||
28 | [resolver] | ||
29 | PORT = 12012 | ||
30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
31 | |||
32 | [peerinfo] | ||
33 | PORT = 12011 | ||
34 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
35 | |||
36 | [hostlist] | 14 | [hostlist] |
37 | HTTPPORT = 9080 | 15 | HTTPPORT = 9080 |
38 | OPTIONS = -p | 16 | OPTIONS = -p |
diff --git a/src/transport/perf_https_peer1.conf b/src/transport/perf_https_peer1.conf index 1f8c5bc90..bad98c532 100644 --- a/src/transport/perf_https_peer1.conf +++ b/src/transport/perf_https_peer1.conf | |||
@@ -3,35 +3,14 @@ | |||
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PORT = 12001 | ||
7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
8 | PLUGINS = https_client | 6 | PLUGINS = https_client |
9 | 7 | ||
10 | [transport-https_client] | ||
11 | |||
12 | [nat] | 8 | [nat] |
13 | # Disable IPv6 support | 9 | # Disable IPv6 support |
14 | DISABLEV6 = YES | 10 | DISABLEV6 = YES |
15 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | 11 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) |
16 | RETURN_LOCAL_ADDRESSES = NO | 12 | RETURN_LOCAL_ADDRESSES = NO |
17 | 13 | ||
18 | |||
19 | [arm] | ||
20 | PORT = 12005 | ||
21 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
22 | |||
23 | [statistics] | ||
24 | PORT = 12004 | ||
25 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
26 | |||
27 | [resolver] | ||
28 | PORT = 12003 | ||
29 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
30 | |||
31 | [peerinfo] | ||
32 | PORT = 12002 | ||
33 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
34 | |||
35 | [hostlist] | 14 | [hostlist] |
36 | OPTIONS = -b | 15 | OPTIONS = -b |
37 | SERVERS = http://localhost:9080/ | 16 | SERVERS = http://localhost:9080/ |
diff --git a/src/transport/perf_https_peer2.conf b/src/transport/perf_https_peer2.conf index 96d09a9ba..923426dc3 100644 --- a/src/transport/perf_https_peer2.conf +++ b/src/transport/perf_https_peer2.conf | |||
@@ -3,13 +3,7 @@ | |||
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PORT = 12010 | ||
7 | PLUGINS = https_server | 6 | PLUGINS = https_server |
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
9 | |||
10 | [transport-https_server] | ||
11 | PORT = 12090 | ||
12 | USE_IPv6 = YES | ||
13 | 7 | ||
14 | [nat] | 8 | [nat] |
15 | # Disable IPv6 support | 9 | # Disable IPv6 support |
@@ -17,22 +11,6 @@ DISABLEV6 = YES | |||
17 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | 11 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) |
18 | RETURN_LOCAL_ADDRESSES = NO | 12 | RETURN_LOCAL_ADDRESSES = NO |
19 | 13 | ||
20 | [arm] | ||
21 | PORT = 12014 | ||
22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 12013 | ||
26 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
27 | |||
28 | [resolver] | ||
29 | PORT = 12012 | ||
30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
31 | |||
32 | [peerinfo] | ||
33 | PORT = 12011 | ||
34 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
35 | |||
36 | [hostlist] | 14 | [hostlist] |
37 | HTTPPORT = 9080 | 15 | HTTPPORT = 9080 |
38 | OPTIONS = -p | 16 | OPTIONS = -p |
diff --git a/src/transport/perf_tcp_peer1.conf b/src/transport/perf_tcp_peer1.conf index 610a88ab6..2471633fc 100644 --- a/src/transport/perf_tcp_peer1.conf +++ b/src/transport/perf_tcp_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 | 7 | ||
30 | [hostlist] | 8 | [hostlist] |
diff --git a/src/transport/perf_tcp_peer2.conf b/src/transport/perf_tcp_peer2.conf index a39b985dc..e1517ff75 100644 --- a/src/transport/perf_tcp_peer2.conf +++ b/src/transport/perf_tcp_peer2.conf | |||
@@ -2,30 +2,8 @@ | |||
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 | ||
30 | [hostlist] | 8 | [hostlist] |
31 | HTTPPORT = 9080 | 9 | HTTPPORT = 9080 |
diff --git a/src/transport/perf_udp_peer1.conf b/src/transport/perf_udp_peer1.conf index 225303fee..10e44c178 100644 --- a/src/transport/perf_udp_peer1.conf +++ b/src/transport/perf_udp_peer1.conf | |||
@@ -3,13 +3,9 @@ | |||
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PORT = 12001 | ||
7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
8 | PLUGINS = udp | 6 | PLUGINS = udp |
9 | 7 | ||
10 | [transport-udp] | 8 | [transport-udp] |
11 | # Use PORT = 0 to autodetect a port available | ||
12 | PORT = 12015 | ||
13 | BROADCAST = NO | 9 | BROADCAST = NO |
14 | BROADCAST_RECEIVE = NO | 10 | BROADCAST_RECEIVE = NO |
15 | BROADCAST_INTERVAL = 30 s | 11 | BROADCAST_INTERVAL = 30 s |
@@ -21,23 +17,6 @@ DISABLEV6 = YES | |||
21 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | 17 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) |
22 | RETURN_LOCAL_ADDRESSES = NO | 18 | RETURN_LOCAL_ADDRESSES = NO |
23 | 19 | ||
24 | |||
25 | [arm] | ||
26 | PORT = 12005 | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
28 | |||
29 | [statistics] | ||
30 | PORT = 12004 | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
32 | |||
33 | [resolver] | ||
34 | PORT = 12003 | ||
35 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
36 | |||
37 | [peerinfo] | ||
38 | PORT = 12002 | ||
39 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
40 | |||
41 | [hostlist] | 20 | [hostlist] |
42 | OPTIONS = -b | 21 | OPTIONS = -b |
43 | SERVERS = http://localhost:9080/ | 22 | SERVERS = http://localhost:9080/ |
diff --git a/src/transport/perf_udp_peer2.conf b/src/transport/perf_udp_peer2.conf index 6562da5aa..4f27b2d71 100644 --- a/src/transport/perf_udp_peer2.conf +++ b/src/transport/perf_udp_peer2.conf | |||
@@ -3,14 +3,11 @@ | |||
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | PORT = 12010 | ||
7 | PLUGINS = udp | 6 | PLUGINS = udp |
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
9 | 7 | ||
10 | 8 | ||
11 | [transport-udp] | 9 | [transport-udp] |
12 | # Use PORT = 0 to autodetect a port available | 10 | # Use PORT = 0 to autodetect a port available |
13 | PORT = 12115 | ||
14 | BROADCAST = NO | 11 | BROADCAST = NO |
15 | BROADCAST_RECEIVE = NO | 12 | BROADCAST_RECEIVE = NO |
16 | BROADCAST_INTERVAL = 30 s | 13 | BROADCAST_INTERVAL = 30 s |
@@ -22,22 +19,6 @@ DISABLEV6 = YES | |||
22 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | 19 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) |
23 | RETURN_LOCAL_ADDRESSES = NO | 20 | RETURN_LOCAL_ADDRESSES = NO |
24 | 21 | ||
25 | [arm] | ||
26 | PORT = 12014 | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
28 | |||
29 | [statistics] | ||
30 | PORT = 12013 | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
32 | |||
33 | [resolver] | ||
34 | PORT = 12012 | ||
35 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
36 | |||
37 | [peerinfo] | ||
38 | PORT = 12011 | ||
39 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
40 | |||
41 | [hostlist] | 22 | [hostlist] |
42 | HTTPPORT = 9080 | 23 | HTTPPORT = 9080 |
43 | OPTIONS = -p | 24 | OPTIONS = -p |
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index 4a2bc08da..87b7610ed 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf | |||
@@ -2,40 +2,6 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p1/ | 3 | GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p1/ |
4 | 4 | ||
5 | [transport-tcp] | ||
6 | PORT = 12140 | ||
7 | TIMEOUT = 5 s | ||
8 | |||
9 | [transport-udp] | ||
10 | PORT = 12141 | ||
11 | |||
12 | [transport-http] | ||
13 | PORT = 12142 | ||
14 | |||
15 | [transport-https] | ||
16 | PORT = 12143 | ||
17 | |||
18 | [arm] | ||
19 | PORT = 12149 | ||
20 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock | ||
21 | |||
22 | [statistics] | ||
23 | PORT = 12148 | ||
24 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock | ||
25 | |||
26 | [resolver] | ||
27 | PORT = 12147 | ||
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock | ||
29 | |||
30 | [peerinfo] | ||
31 | PORT = 12146 | ||
32 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock | ||
33 | |||
34 | [transport] | 5 | [transport] |
35 | PORT = 12145 | ||
36 | PLUGINS = tcp udp | 6 | PLUGINS = tcp udp |
37 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
38 | |||
39 | [transport-unix] | ||
40 | PORT = 12144 | ||
41 | 7 | ||
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index 1cf0d9e2e..f6bb59183 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf | |||
@@ -5,40 +5,5 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p2/ | |||
5 | [nat] | 5 | [nat] |
6 | ALLOW_NAT = NO | 6 | ALLOW_NAT = NO |
7 | 7 | ||
8 | [transport-tcp] | ||
9 | PORT = 12150 | ||
10 | TIMEOUT = 5 s | ||
11 | |||
12 | [transport-udp] | ||
13 | PORT = 12151 | ||
14 | |||
15 | [transport-http] | ||
16 | PORT = 12152 | ||
17 | |||
18 | [transport-https] | ||
19 | PORT = 12153 | ||
20 | |||
21 | [arm] | ||
22 | PORT = 12159 | ||
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
24 | |||
25 | [statistics] | ||
26 | PORT = 12158 | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
28 | |||
29 | [resolver] | ||
30 | PORT = 12157 | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
32 | |||
33 | [peerinfo] | ||
34 | PORT = 12156 | ||
35 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
36 | |||
37 | [transport] | 8 | [transport] |
38 | PORT = 12155 | ||
39 | PLUGINS = tcp udp | 9 | PLUGINS = tcp udp |
40 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
41 | |||
42 | [transport-unix] | ||
43 | PORT = 12154 | ||
44 | |||
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 d9e665e35..3f2742c91 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf | |||
@@ -6,26 +6,7 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ | |||
6 | PORT = 12000 | 6 | PORT = 12000 |
7 | TIMEOUT = 5 s | 7 | TIMEOUT = 5 s |
8 | 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] | 9 | [transport] |
26 | #PREFIX = valgrind --leak-check=full | ||
27 | PORT = 12001 | ||
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
29 | PLUGINS = tcp | 10 | PLUGINS = tcp |
30 | 11 | ||
31 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG | 12 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG |
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 3f5dd407f..bd0108b9b 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 | |||
@@ -2,30 +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 | #PREFIX = valgrind --leak-check=full | ||
27 | PORT = 12001 | ||
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
29 | PLUGINS = tcp udp | 6 | PLUGINS = tcp udp |
30 | 7 | ||
31 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG | 8 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG |
@@ -33,4 +10,4 @@ PLUGINS = tcp udp | |||
33 | 10 | ||
34 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] | 11 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] |
35 | DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp | 12 | DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp |
36 | 13 | ||
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 d1650a014..6261fa7a1 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf | |||
@@ -2,30 +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 | #PREFIX = valgrind --leak-check=full | ||
27 | PORT = 12001 | ||
28 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock | ||
29 | PLUGINS = tcp | 6 | PLUGINS = tcp |
30 | 7 | ||
31 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG | 8 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG |
@@ -33,4 +10,4 @@ PLUGINS = tcp | |||
33 | 10 | ||
34 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] | 11 | [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG] |
35 | DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp | 12 | DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp |
36 | 13 | ||
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 85e8d7518..cfcc2a24a 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf | |||
@@ -2,35 +2,12 @@ | |||
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 | #PREFIX = valgrind --leak-check=full | ||
27 | PORT = 12010 | ||
28 | PLUGINS = tcp | 6 | PLUGINS = tcp |
29 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
30 | 7 | ||
31 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG | 8 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG |
32 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 | 9 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 |
33 | 10 | ||
34 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] | 11 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] |
35 | 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = | 12 | 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = |
36 | 13 | ||
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 c16da07a9..5f54b7321 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 | |||
@@ -2,31 +2,8 @@ | |||
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 | #PREFIX = valgrind --leak-check=full | ||
27 | PORT = 12010 | ||
28 | PLUGINS = tcp udp | 6 | PLUGINS = tcp udp |
29 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
30 | 7 | ||
31 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG | 8 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG |
32 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 | 9 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 |
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 6af51d699..98a5e787f 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf | |||
@@ -2,34 +2,11 @@ | |||
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 | #PREFIX = valgrind --leak-check=full | ||
27 | PORT = 12010 | ||
28 | PLUGINS = tcp | 6 | PLUGINS = tcp |
29 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | ||
30 | 7 | ||
31 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG | 8 | #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG |
32 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 | 9 | #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 |
33 | 10 | ||
34 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] | 11 | [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50] |
35 | 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp | 12 | 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp |
diff --git a/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf b/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf index 17954c83c..4a550402d 100644 --- a/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf +++ b/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf | |||
@@ -22,31 +22,8 @@ BLUETOOTH_QUOTA_OUT = 8 KiB | |||
22 | [PATHS] | 22 | [PATHS] |
23 | GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/ | 23 | GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/ |
24 | 24 | ||
25 | [transport-tcp] | ||
26 | PORT = 4094 | ||
27 | |||
28 | [transport-udp] | ||
29 | PORT = 4094 | ||
30 | |||
31 | [arm] | ||
32 | PORT = 4087 | ||
33 | UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock | ||
34 | |||
35 | [statistics] | ||
36 | PORT = 4088 | ||
37 | UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock | ||
38 | |||
39 | [resolver] | ||
40 | PORT = 4089 | ||
41 | UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock | ||
42 | |||
43 | [peerinfo] | ||
44 | PORT = 4090 | ||
45 | UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock | ||
46 | |||
47 | [transport] | 25 | [transport] |
48 | PORT = 4091 | ||
49 | PLUGINS = tcp | 26 | PLUGINS = tcp |
50 | UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_transport_peer1.sock | 27 | |
51 | 28 | ||
52 | 29 | ||
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 377cfe689..927c35c56 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 | |||
@@ -23,28 +23,7 @@ BLUETOOTH_QUOTA_OUT = 8 KiB | |||
23 | [PATHS] | 23 | [PATHS] |
24 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ | 24 | GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ |
25 | 25 | ||
26 | [transport-tcp] | ||
27 | PORT = 12015 | ||
28 | TIMEOUT = 5 s | ||
29 | |||
30 | [arm] | ||
31 | PORT = 12014 | ||
32 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock | ||
33 | |||
34 | [statistics] | ||
35 | PORT = 12013 | ||
36 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock | ||
37 | |||
38 | [resolver] | ||
39 | PORT = 12012 | ||
40 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock | ||
41 | |||
42 | [peerinfo] | ||
43 | PORT = 12011 | ||
44 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock | ||
45 | |||
46 | [transport] | 26 | [transport] |
47 | PORT = 12010 | ||
48 | PLUGINS = tcp | 27 | PLUGINS = tcp |
49 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock | 28 | |
50 | 29 | ||