aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-12-11 13:43:39 +0000
committerChristian Grothoff <christian@grothoff.org>2014-12-11 13:43:39 +0000
commit0a1098b10093d1344be7455c901e938806753fd0 (patch)
treecee50f8d54bb66e32363af55dbcf1c2f72a0b196
parentd40de2c07c4a5327669044abce9675c6310a3448 (diff)
downloadgnunet-0a1098b10093d1344be7455c901e938806753fd0.tar.gz
gnunet-0a1098b10093d1344be7455c901e938806753fd0.zip
-simplifying configs
-rw-r--r--src/transport/perf_http_peer1.conf19
-rw-r--r--src/transport/perf_http_peer2.conf22
-rw-r--r--src/transport/perf_https_peer1.conf21
-rw-r--r--src/transport/perf_https_peer2.conf22
-rw-r--r--src/transport/perf_tcp_peer1.conf22
-rw-r--r--src/transport/perf_tcp_peer2.conf22
-rw-r--r--src/transport/perf_udp_peer1.conf21
-rw-r--r--src/transport/perf_udp_peer2.conf19
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf34
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf35
-rw-r--r--src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf19
-rw-r--r--src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf25
-rw-r--r--src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf25
-rw-r--r--src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf25
-rw-r--r--src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf23
-rw-r--r--src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf25
-rw-r--r--src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf25
-rw-r--r--src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf23
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 @@
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
4 4
5[transport] 5[transport]
6PORT = 12001
7UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
8PLUGINS = http_client 6PLUGINS = 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)
14RETURN_LOCAL_ADDRESSES = NO 12RETURN_LOCAL_ADDRESSES = NO
15 13
16
17[arm]
18PORT = 12005
19UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
20
21[statistics]
22PORT = 12004
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
24
25[resolver]
26PORT = 12003
27UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
28
29[peerinfo]
30PORT = 12002
31UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
32
33[hostlist] 14[hostlist]
34OPTIONS = -b 15OPTIONS = -b
35SERVERS = http://localhost:9080/ 16SERVERS = 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 @@
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
4 4
5[transport] 5[transport]
6PORT = 12010
7PLUGINS = http_server 6PLUGINS = http_server
8UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
9
10[transport-http_server]
11PORT = 12090
12USE_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)
18RETURN_LOCAL_ADDRESSES = NO 12RETURN_LOCAL_ADDRESSES = NO
19 13
20[arm]
21PORT = 12014
22UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
23
24[statistics]
25PORT = 12013
26UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
27
28[resolver]
29PORT = 12012
30UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
31
32[peerinfo]
33PORT = 12011
34UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
35
36[hostlist] 14[hostlist]
37HTTPPORT = 9080 15HTTPPORT = 9080
38OPTIONS = -p 16OPTIONS = -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 @@
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
4 4
5[transport] 5[transport]
6PORT = 12001
7UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
8PLUGINS = https_client 6PLUGINS = https_client
9 7
10[transport-https_client]
11
12[nat] 8[nat]
13# Disable IPv6 support 9# Disable IPv6 support
14DISABLEV6 = YES 10DISABLEV6 = 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)
16RETURN_LOCAL_ADDRESSES = NO 12RETURN_LOCAL_ADDRESSES = NO
17 13
18
19[arm]
20PORT = 12005
21UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
22
23[statistics]
24PORT = 12004
25UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
26
27[resolver]
28PORT = 12003
29UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
30
31[peerinfo]
32PORT = 12002
33UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
34
35[hostlist] 14[hostlist]
36OPTIONS = -b 15OPTIONS = -b
37SERVERS = http://localhost:9080/ 16SERVERS = 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 @@
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
4 4
5[transport] 5[transport]
6PORT = 12010
7PLUGINS = https_server 6PLUGINS = https_server
8UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
9
10[transport-https_server]
11PORT = 12090
12USE_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)
18RETURN_LOCAL_ADDRESSES = NO 12RETURN_LOCAL_ADDRESSES = NO
19 13
20[arm]
21PORT = 12014
22UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
23
24[statistics]
25PORT = 12013
26UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
27
28[resolver]
29PORT = 12012
30UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
31
32[peerinfo]
33PORT = 12011
34UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
35
36[hostlist] 14[hostlist]
37HTTPPORT = 9080 15HTTPPORT = 9080
38OPTIONS = -p 16OPTIONS = -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]
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
4 4
5[transport-tcp]
6PORT = 12000
7TIMEOUT = 5 s
8
9[arm]
10PORT = 12005
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
12
13[statistics]
14PORT = 12004
15UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
16
17[resolver]
18PORT = 12003
19UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
20
21[peerinfo]
22PORT = 12002
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
24
25[transport] 5[transport]
26PORT = 12001
27UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
28PLUGINS = tcp 6PLUGINS = 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]
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
4 4
5[transport-tcp]
6PORT = 12015
7TIMEOUT = 5 s
8
9[arm]
10PORT = 12014
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
12
13[statistics]
14PORT = 12013
15UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
16
17[resolver]
18PORT = 12012
19UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
20
21[peerinfo]
22PORT = 12011
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
24
25[transport] 5[transport]
26PORT = 12010
27PLUGINS = tcp 6PLUGINS = tcp
28UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
29 7
30[hostlist] 8[hostlist]
31HTTPPORT = 9080 9HTTPPORT = 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 @@
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
4 4
5[transport] 5[transport]
6PORT = 12001
7UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
8PLUGINS = udp 6PLUGINS = udp
9 7
10[transport-udp] 8[transport-udp]
11# Use PORT = 0 to autodetect a port available
12PORT = 12015
13BROADCAST = NO 9BROADCAST = NO
14BROADCAST_RECEIVE = NO 10BROADCAST_RECEIVE = NO
15BROADCAST_INTERVAL = 30 s 11BROADCAST_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)
22RETURN_LOCAL_ADDRESSES = NO 18RETURN_LOCAL_ADDRESSES = NO
23 19
24
25[arm]
26PORT = 12005
27UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
28
29[statistics]
30PORT = 12004
31UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
32
33[resolver]
34PORT = 12003
35UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
36
37[peerinfo]
38PORT = 12002
39UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
40
41[hostlist] 20[hostlist]
42OPTIONS = -b 21OPTIONS = -b
43SERVERS = http://localhost:9080/ 22SERVERS = 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 @@
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
4 4
5[transport] 5[transport]
6PORT = 12010
7PLUGINS = udp 6PLUGINS = udp
8UNIXPATH = $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
13PORT = 12115
14BROADCAST = NO 11BROADCAST = NO
15BROADCAST_RECEIVE = NO 12BROADCAST_RECEIVE = NO
16BROADCAST_INTERVAL = 30 s 13BROADCAST_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)
23RETURN_LOCAL_ADDRESSES = NO 20RETURN_LOCAL_ADDRESSES = NO
24 21
25[arm]
26PORT = 12014
27UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
28
29[statistics]
30PORT = 12013
31UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
32
33[resolver]
34PORT = 12012
35UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
36
37[peerinfo]
38PORT = 12011
39UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
40
41[hostlist] 22[hostlist]
42HTTPPORT = 9080 23HTTPPORT = 9080
43OPTIONS = -p 24OPTIONS = -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]
3GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p1/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p1/
4 4
5[transport-tcp]
6PORT = 12140
7TIMEOUT = 5 s
8
9[transport-udp]
10PORT = 12141
11
12[transport-http]
13PORT = 12142
14
15[transport-https]
16PORT = 12143
17
18[arm]
19PORT = 12149
20UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
21
22[statistics]
23PORT = 12148
24UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
25
26[resolver]
27PORT = 12147
28UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
29
30[peerinfo]
31PORT = 12146
32UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
33
34[transport] 5[transport]
35PORT = 12145
36PLUGINS = tcp udp 6PLUGINS = tcp udp
37UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
38
39[transport-unix]
40PORT = 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]
6ALLOW_NAT = NO 6ALLOW_NAT = NO
7 7
8[transport-tcp]
9PORT = 12150
10TIMEOUT = 5 s
11
12[transport-udp]
13PORT = 12151
14
15[transport-http]
16PORT = 12152
17
18[transport-https]
19PORT = 12153
20
21[arm]
22PORT = 12159
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
24
25[statistics]
26PORT = 12158
27UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
28
29[resolver]
30PORT = 12157
31UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
32
33[peerinfo]
34PORT = 12156
35UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
36
37[transport] 8[transport]
38PORT = 12155
39PLUGINS = tcp udp 9PLUGINS = tcp udp
40UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
41
42[transport-unix]
43PORT = 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/
6PORT = 12000 6PORT = 12000
7TIMEOUT = 5 s 7TIMEOUT = 5 s
8 8
9[arm]
10PORT = 12005
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
12
13[statistics]
14PORT = 12004
15UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
16
17[resolver]
18PORT = 12003
19UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
20
21[peerinfo]
22PORT = 12002
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
24
25[transport] 9[transport]
26#PREFIX = valgrind --leak-check=full
27PORT = 12001
28UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
29PLUGINS = tcp 10PLUGINS = 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]
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
4 4
5[transport-tcp]
6PORT = 12000
7TIMEOUT = 5 s
8
9[arm]
10PORT = 12005
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
12
13[statistics]
14PORT = 12004
15UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
16
17[resolver]
18PORT = 12003
19UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
20
21[peerinfo]
22PORT = 12002
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
24
25[transport] 5[transport]
26#PREFIX = valgrind --leak-check=full
27PORT = 12001
28UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
29PLUGINS = tcp udp 6PLUGINS = 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]
35DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp 12DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = 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]
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
4 4
5[transport-tcp]
6PORT = 12000
7TIMEOUT = 5 s
8
9[arm]
10PORT = 12005
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
12
13[statistics]
14PORT = 12004
15UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
16
17[resolver]
18PORT = 12003
19UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
20
21[peerinfo]
22PORT = 12002
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
24
25[transport] 5[transport]
26#PREFIX = valgrind --leak-check=full
27PORT = 12001
28UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
29PLUGINS = tcp 6PLUGINS = 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]
35DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp 12DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = 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]
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
4 4
5[transport-tcp]
6PORT = 12015
7TIMEOUT = 5 s
8
9[arm]
10PORT = 12014
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
12
13[statistics]
14PORT = 12013
15UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
16
17[resolver]
18PORT = 12012
19UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
20
21[peerinfo]
22PORT = 12011
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
24
25[transport] 5[transport]
26#PREFIX = valgrind --leak-check=full
27PORT = 12010
28PLUGINS = tcp 6PLUGINS = tcp
29UNIXPATH = $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]
356YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = 126YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG =
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]
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
4 4
5[transport-tcp]
6PORT = 12015
7TIMEOUT = 5 s
8
9[arm]
10PORT = 12014
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
12
13[statistics]
14PORT = 12013
15UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
16
17[resolver]
18PORT = 12012
19UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
20
21[peerinfo]
22PORT = 12011
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
24
25[transport] 5[transport]
26#PREFIX = valgrind --leak-check=full
27PORT = 12010
28PLUGINS = tcp udp 6PLUGINS = tcp udp
29UNIXPATH = $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]
3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ 3GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
4 4
5[transport-tcp]
6PORT = 12015
7TIMEOUT = 5 s
8
9[arm]
10PORT = 12014
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
12
13[statistics]
14PORT = 12013
15UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
16
17[resolver]
18PORT = 12012
19UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
20
21[peerinfo]
22PORT = 12011
23UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
24
25[transport] 5[transport]
26#PREFIX = valgrind --leak-check=full
27PORT = 12010
28PLUGINS = tcp 6PLUGINS = tcp
29UNIXPATH = $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]
356YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp 126YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = 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]
23GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/ 23GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/
24 24
25[transport-tcp]
26PORT = 4094
27
28[transport-udp]
29PORT = 4094
30
31[arm]
32PORT = 4087
33UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock
34
35[statistics]
36PORT = 4088
37UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock
38
39[resolver]
40PORT = 4089
41UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock
42
43[peerinfo]
44PORT = 4090
45UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock
46
47[transport] 25[transport]
48PORT = 4091
49PLUGINS = tcp 26PLUGINS = tcp
50UNIXPATH = $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]
24GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ 24GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
25 25
26[transport-tcp]
27PORT = 12015
28TIMEOUT = 5 s
29
30[arm]
31PORT = 12014
32UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
33
34[statistics]
35PORT = 12013
36UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
37
38[resolver]
39PORT = 12012
40UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
41
42[peerinfo]
43PORT = 12011
44UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
45
46[transport] 26[transport]
47PORT = 12010
48PLUGINS = tcp 27PLUGINS = tcp
49UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock 28
50 29