diff options
Diffstat (limited to 'src')
9 files changed, 56 insertions, 77 deletions
diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf index d618f33eb..d118a8880 100644 --- a/src/transport/test_plugin_transport_data_http.conf +++ b/src/transport/test_plugin_transport_data_http.conf | |||
@@ -1,12 +1,12 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | DEFAULTCONFIG = test_plugin_transport_data_http.conf | 2 | DEFAULTCONFIG = test_plugin_transport_data_http.conf |
3 | SERVICEHOME = /tmp/test_plugin_transport_http/ | 3 | SERVICEHOME = /tmp/test-transport/plugin_http/ |
4 | 4 | ||
5 | [TESTING] | 5 | [TESTING] |
6 | WEAKRANDOM = YES | 6 | WEAKRANDOM = YES |
7 | 7 | ||
8 | [transport-http] | 8 | [transport-http] |
9 | PORT = 12389 | 9 | PORT = 12320 |
10 | DEBUG = YES | 10 | DEBUG = YES |
11 | #USE_IPv4 = NO | 11 | #USE_IPv4 = NO |
12 | #USE_IPv6 = NO | 12 | #USE_IPv6 = NO |
@@ -17,7 +17,7 @@ USE_IPv6 = YES | |||
17 | 17 | ||
18 | 18 | ||
19 | [transport-https] | 19 | [transport-https] |
20 | PORT = 12389 | 20 | PORT = 12321 |
21 | DEBUG = YES | 21 | DEBUG = YES |
22 | #USE_IPv4 = NO | 22 | #USE_IPv4 = NO |
23 | #USE_IPv6 = NO | 23 | #USE_IPv6 = NO |
@@ -42,7 +42,7 @@ BINARY = gnunet-service-statistics | |||
42 | CONFIG = $DEFAULTCONFIG | 42 | CONFIG = $DEFAULTCONFIG |
43 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
44 | HOSTNAME = localhost | 44 | HOSTNAME = localhost |
45 | PORT = 12367 | 45 | PORT = 12322 |
46 | 46 | ||
47 | [arm] | 47 | [arm] |
48 | DEFAULTSERVICES = topology hostlist | 48 | DEFAULTSERVICES = topology hostlist |
@@ -52,7 +52,7 @@ BINARY = gnunet-service-arm | |||
52 | CONFIG = $DEFAULTCONFIG | 52 | CONFIG = $DEFAULTCONFIG |
53 | HOME = $SERVICEHOME | 53 | HOME = $SERVICEHOME |
54 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
55 | PORT = 12366 | 55 | PORT = 12323 |
56 | 56 | ||
57 | [dht] | 57 | [dht] |
58 | AUTOSTART = NO | 58 | AUTOSTART = NO |
@@ -61,6 +61,4 @@ AUTOSTART = NO | |||
61 | AUTOSTART = NO | 61 | AUTOSTART = NO |
62 | 62 | ||
63 | [dns] | 63 | [dns] |
64 | AUTOSTART = NO | 64 | AUTOSTART = NO \ No newline at end of file |
65 | |||
66 | |||
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 13875a0e8..85cd22a4f 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 2 | SERVICEHOME = /tmp/test-transport/quota-http-p1/ |
3 | DEFAULTCONFIG = test_quota_compliance_http_peer1.conf | 3 | DEFAULTCONFIG = test_quota_compliance_http_peer1.conf |
4 | 4 | ||
5 | [fs] | 5 | [fs] |
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index de0a4ca7c..d6fc3850d 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 2 | SERVICEHOME = SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ |
3 | DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf | 3 | DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf |
4 | 4 | ||
5 | [fs] | 5 | [fs] |
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index e441bfc2b..89baab8d2 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf | |||
@@ -5,8 +5,8 @@ USE_IPv6 = YES | |||
5 | USE_IPv4 = YES | 5 | USE_IPv4 = YES |
6 | #BINDTO4 = 127.0.0.1 | 6 | #BINDTO4 = 127.0.0.1 |
7 | #BINDTO6 = ::1 | 7 | #BINDTO6 = ::1 |
8 | KEY_FILE = https_key_p1.key | 8 | KEY_FILE = $SERVICEHOME/https_key_p1.key |
9 | CERT_FILE = https_cert_p1.crt | 9 | CERT_FILE = $SERVICEHOME/https_cert_p1.crt |
10 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL | 10 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL |
11 | #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL | 11 | #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL |
12 | #CRYPTO_INIT = PERFORMANCE | 12 | #CRYPTO_INIT = PERFORMANCE |
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index cf0c5c915..e510b20f4 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf | |||
@@ -5,8 +5,8 @@ USE_IPv6 = YES | |||
5 | USE_IPv4 = YES | 5 | USE_IPv4 = YES |
6 | #BINDTO4 = 127.0.0.1 | 6 | #BINDTO4 = 127.0.0.1 |
7 | #BINDTO6 = ::1 | 7 | #BINDTO6 = ::1 |
8 | KEY_FILE = https_key_p2.key | 8 | KEY_FILE = $SERVICEHOME/https_key_p2.key |
9 | CERT_FILE = https_cert_p2.crt | 9 | CERT_FILE = $SERVICEHOME/https_cert_p2.crt |
10 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL | 10 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL |
11 | #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL | 11 | #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL |
12 | #CRYPTO_INIT = PERFORMANCE | 12 | #CRYPTO_INIT = PERFORMANCE |
diff --git a/src/transport/test_transport_api_rel_http_peer1.conf b/src/transport/test_transport_api_rel_http_peer1.conf index fac0accc5..9c66918cf 100644 --- a/src/transport/test_transport_api_rel_http_peer1.conf +++ b/src/transport/test_transport_api_rel_http_peer1.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-http] | 1 | [transport-http] |
2 | PORT = 12389 | 2 | PORT = 12180 |
3 | DEBUG = NO | 3 | DEBUG = NO |
4 | USE_IPv4 = YES | 4 | USE_IPv4 = YES |
5 | USE_IPv6 = NO | 5 | USE_IPv6 = NO |
@@ -7,25 +7,6 @@ BINDTO4 = 127.0.0.1 | |||
7 | #BINDTO6 = ::1 | 7 | #BINDTO6 = ::1 |
8 | USE_LOCALADDR = YES | 8 | USE_LOCALADDR = YES |
9 | 9 | ||
10 | [transport-https] | ||
11 | PORT = 42389 | ||
12 | DEBUG = NO | ||
13 | USE_IPv6 = YES | ||
14 | USE_IPv4 = YES | ||
15 | #BINDTO4 = 127.0.0.1 | ||
16 | #BINDTO6 = ::1 | ||
17 | KEY_FILE = https_key_p1.key | ||
18 | CERT_FILE = https_cert_p1.crt | ||
19 | |||
20 | [fs] | ||
21 | AUTOSTART = NO | ||
22 | |||
23 | [datastore] | ||
24 | AUTOSTART = NO | ||
25 | |||
26 | [core] | ||
27 | AUTOSTART = NO | ||
28 | |||
29 | [hostlist] | 10 | [hostlist] |
30 | HTTP-PROXY = | 11 | HTTP-PROXY = |
31 | SERVERS = http://gnunet.org:8080/ | 12 | SERVERS = http://gnunet.org:8080/ |
@@ -47,7 +28,6 @@ MINIMUM-FRIENDS = 0 | |||
47 | 28 | ||
48 | [transport] | 29 | [transport] |
49 | PLUGINS = http | 30 | PLUGINS = http |
50 | #PLUGINS = tcp http | ||
51 | #DEBUG = YES | 31 | #DEBUG = YES |
52 | ACCEPT_FROM6 = ::1; | 32 | ACCEPT_FROM6 = ::1; |
53 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
@@ -56,7 +36,7 @@ BINARY = gnunet-service-transport | |||
56 | CONFIG = $DEFAULTCONFIG | 36 | CONFIG = $DEFAULTCONFIG |
57 | HOME = $SERVICEHOME | 37 | HOME = $SERVICEHOME |
58 | HOSTNAME = localhost | 38 | HOSTNAME = localhost |
59 | PORT = 12365 | 39 | PORT = 12181 |
60 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 40 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
61 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | 41 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args |
62 | #PREFIX = valgrind --leak-check=full | 42 | #PREFIX = valgrind --leak-check=full |
@@ -72,7 +52,7 @@ BINARY = gnunet-service-peerinfo | |||
72 | CONFIG = $DEFAULTCONFIG | 52 | CONFIG = $DEFAULTCONFIG |
73 | HOME = $SERVICEHOME | 53 | HOME = $SERVICEHOME |
74 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
75 | PORT = 12369 | 55 | PORT = 12182 |
76 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 56 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
77 | 57 | ||
78 | [resolver] | 58 | [resolver] |
@@ -82,7 +62,7 @@ BINARY = gnunet-service-resolver | |||
82 | CONFIG = $DEFAULTCONFIG | 62 | CONFIG = $DEFAULTCONFIG |
83 | HOME = $SERVICEHOME | 63 | HOME = $SERVICEHOME |
84 | HOSTNAME = localhost | 64 | HOSTNAME = localhost |
85 | PORT = 12364 | 65 | PORT = 12183 |
86 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 66 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
87 | 67 | ||
88 | [statistics] | 68 | [statistics] |
@@ -92,7 +72,7 @@ BINARY = gnunet-service-statistics | |||
92 | CONFIG = $DEFAULTCONFIG | 72 | CONFIG = $DEFAULTCONFIG |
93 | HOME = $SERVICEHOME | 73 | HOME = $SERVICEHOME |
94 | HOSTNAME = localhost | 74 | HOSTNAME = localhost |
95 | PORT = 12367 | 75 | PORT = 12184 |
96 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 76 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
97 | 77 | ||
98 | [arm] | 78 | [arm] |
@@ -103,14 +83,9 @@ BINARY = gnunet-service-arm | |||
103 | CONFIG = $DEFAULTCONFIG | 83 | CONFIG = $DEFAULTCONFIG |
104 | HOME = $SERVICEHOME | 84 | HOME = $SERVICEHOME |
105 | HOSTNAME = localhost | 85 | HOSTNAME = localhost |
106 | PORT = 12366 | 86 | PORT = 12185 |
107 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 87 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
108 | 88 | ||
109 | [transport-tcp] | ||
110 | PORT = 12399 | ||
111 | #DEBUG = YES | ||
112 | |||
113 | |||
114 | [TESTING] | 89 | [TESTING] |
115 | WEAKRANDOM = YES | 90 | WEAKRANDOM = YES |
116 | 91 | ||
@@ -118,8 +93,17 @@ WEAKRANDOM = YES | |||
118 | HOSTKEY = $SERVICEHOME/.hostkey | 93 | HOSTKEY = $SERVICEHOME/.hostkey |
119 | 94 | ||
120 | [PATHS] | 95 | [PATHS] |
121 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 96 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
97 | |||
98 | |||
99 | [fs] | ||
100 | AUTOSTART = NO | ||
101 | |||
102 | [datastore] | ||
103 | AUTOSTART = NO | ||
122 | 104 | ||
105 | [core] | ||
106 | AUTOSTART = NO | ||
123 | 107 | ||
124 | [dht] | 108 | [dht] |
125 | AUTOSTART = NO | 109 | AUTOSTART = NO |
diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf index 3c8621b39..ffcb68105 100644 --- a/src/transport/test_transport_api_rel_http_peer2.conf +++ b/src/transport/test_transport_api_rel_http_peer2.conf | |||
@@ -1,13 +1,11 @@ | |||
1 | [transport-https] | 1 | [transport-http] |
2 | PORT = 12090 | 2 | PORT = 12190 |
3 | DEBUG = NO | 3 | DEBUG = NO |
4 | USE_IPv6 = YES | ||
5 | USE_IPv4 = YES | 4 | USE_IPv4 = YES |
6 | #BINDTO4 = 127.0.0.1 | 5 | USE_IPv6 = NO |
6 | BINDTO4 = 127.0.0.1 | ||
7 | #BINDTO6 = ::1 | 7 | #BINDTO6 = ::1 |
8 | KEY_FILE = https_key_p2.key | 8 | USE_LOCALADDR = YES |
9 | CERT_FILE = https_cert_p2.crt | ||
10 | |||
11 | [fs] | 9 | [fs] |
12 | AUTOSTART = NO | 10 | AUTOSTART = NO |
13 | 11 | ||
@@ -38,7 +36,6 @@ MINIMUM-FRIENDS = 0 | |||
38 | 36 | ||
39 | [transport] | 37 | [transport] |
40 | PLUGINS = http | 38 | PLUGINS = http |
41 | #PLUGINS = tcp http | ||
42 | #DEBUG = YES | 39 | #DEBUG = YES |
43 | ACCEPT_FROM6 = ::1; | 40 | ACCEPT_FROM6 = ::1; |
44 | ACCEPT_FROM = 127.0.0.1; | 41 | ACCEPT_FROM = 127.0.0.1; |
@@ -47,7 +44,7 @@ BINARY = gnunet-service-transport | |||
47 | CONFIG = $DEFAULTCONFIG | 44 | CONFIG = $DEFAULTCONFIG |
48 | HOME = $SERVICEHOME | 45 | HOME = $SERVICEHOME |
49 | HOSTNAME = localhost | 46 | HOSTNAME = localhost |
50 | PORT = 12091 | 47 | PORT = 12191 |
51 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 48 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
52 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args | 49 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args |
53 | #PREFIX = valgrind --leak-check=full | 50 | #PREFIX = valgrind --leak-check=full |
@@ -64,7 +61,7 @@ BINARY = gnunet-service-peerinfo | |||
64 | CONFIG = $DEFAULTCONFIG | 61 | CONFIG = $DEFAULTCONFIG |
65 | HOME = $SERVICEHOME | 62 | HOME = $SERVICEHOME |
66 | HOSTNAME = localhost | 63 | HOSTNAME = localhost |
67 | PORT = 12092 | 64 | PORT = 12192 |
68 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 65 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
69 | 66 | ||
70 | [resolver] | 67 | [resolver] |
@@ -74,7 +71,7 @@ BINARY = gnunet-service-resolver | |||
74 | CONFIG = $DEFAULTCONFIG | 71 | CONFIG = $DEFAULTCONFIG |
75 | HOME = $SERVICEHOME | 72 | HOME = $SERVICEHOME |
76 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
77 | PORT = 12093 | 74 | PORT = 12193 |
78 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 75 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
79 | 76 | ||
80 | [statistics] | 77 | [statistics] |
@@ -84,7 +81,7 @@ BINARY = gnunet-service-statistics | |||
84 | CONFIG = $DEFAULTCONFIG | 81 | CONFIG = $DEFAULTCONFIG |
85 | HOME = $SERVICEHOME | 82 | HOME = $SERVICEHOME |
86 | HOSTNAME = localhost | 83 | HOSTNAME = localhost |
87 | PORT = 12094 | 84 | PORT = 12194 |
88 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 85 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
89 | 86 | ||
90 | 87 | ||
@@ -96,7 +93,7 @@ BINARY = gnunet-service-arm | |||
96 | CONFIG = $DEFAULTCONFIG | 93 | CONFIG = $DEFAULTCONFIG |
97 | HOME = $SERVICEHOME | 94 | HOME = $SERVICEHOME |
98 | HOSTNAME = localhost | 95 | HOSTNAME = localhost |
99 | PORT = 12095 | 96 | PORT = 12195 |
100 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 97 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
101 | 98 | ||
102 | [TESTING] | 99 | [TESTING] |
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf index d0b9e7272..d3298bdc7 100644 --- a/src/transport/test_transport_api_rel_https_peer1.conf +++ b/src/transport/test_transport_api_rel_https_peer1.conf | |||
@@ -1,12 +1,12 @@ | |||
1 | [transport-https] | 1 | [transport-https] |
2 | PORT = 13301 | 2 | PORT = 12300 |
3 | USE_IPv4 = YES | 3 | USE_IPv4 = YES |
4 | USE_IPv6 = NO | 4 | USE_IPv6 = NO |
5 | BINDTO4 = 127.0.0.1 | 5 | BINDTO4 = 127.0.0.1 |
6 | #BINDTO6 = ::1 | 6 | #BINDTO6 = ::1 |
7 | USE_LOCALADDR = YES | 7 | USE_LOCALADDR = YES |
8 | KEY_FILE = https_key_p1.key | 8 | KEY_FILE = $SERVICEHOME/https_key_p1.key |
9 | CERT_FILE = https_cert_p1.crt | 9 | CERT_FILE = $SERVICEHOME/https_cert_p1.crt |
10 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL | 10 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL |
11 | #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL | 11 | #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL |
12 | #CRYPTO_INIT = PERFORMANCE | 12 | #CRYPTO_INIT = PERFORMANCE |
@@ -40,7 +40,7 @@ BINARY = gnunet-service-transport | |||
40 | CONFIG = $DEFAULTCONFIG | 40 | CONFIG = $DEFAULTCONFIG |
41 | HOME = $SERVICEHOME | 41 | HOME = $SERVICEHOME |
42 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
43 | PORT = 13302 | 43 | PORT = 12301 |
44 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 44 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
45 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | 45 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args |
46 | #PREFIX = valgrind --leak-check=full | 46 | #PREFIX = valgrind --leak-check=full |
@@ -55,7 +55,7 @@ BINARY = gnunet-service-peerinfo | |||
55 | CONFIG = $DEFAULTCONFIG | 55 | CONFIG = $DEFAULTCONFIG |
56 | HOME = $SERVICEHOME | 56 | HOME = $SERVICEHOME |
57 | HOSTNAME = localhost | 57 | HOSTNAME = localhost |
58 | PORT = 13303 | 58 | PORT = 12302 |
59 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 59 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
60 | 60 | ||
61 | [resolver] | 61 | [resolver] |
@@ -65,7 +65,7 @@ BINARY = gnunet-service-resolver | |||
65 | CONFIG = $DEFAULTCONFIG | 65 | CONFIG = $DEFAULTCONFIG |
66 | HOME = $SERVICEHOME | 66 | HOME = $SERVICEHOME |
67 | HOSTNAME = localhost | 67 | HOSTNAME = localhost |
68 | PORT = 13304 | 68 | PORT = 12303 |
69 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 69 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
70 | 70 | ||
71 | [statistics] | 71 | [statistics] |
@@ -75,7 +75,7 @@ BINARY = gnunet-service-statistics | |||
75 | CONFIG = $DEFAULTCONFIG | 75 | CONFIG = $DEFAULTCONFIG |
76 | HOME = $SERVICEHOME | 76 | HOME = $SERVICEHOME |
77 | HOSTNAME = localhost | 77 | HOSTNAME = localhost |
78 | PORT = 13305 | 78 | PORT = 12304 |
79 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 79 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
80 | 80 | ||
81 | [arm] | 81 | [arm] |
@@ -86,7 +86,7 @@ BINARY = gnunet-service-arm | |||
86 | CONFIG = $DEFAULTCONFIG | 86 | CONFIG = $DEFAULTCONFIG |
87 | HOME = $SERVICEHOME | 87 | HOME = $SERVICEHOME |
88 | HOSTNAME = localhost | 88 | HOSTNAME = localhost |
89 | PORT = 13306 | 89 | PORT = 12305 |
90 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 90 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
91 | 91 | ||
92 | [TESTING] | 92 | [TESTING] |
@@ -96,7 +96,7 @@ WEAKRANDOM = YES | |||
96 | HOSTKEY = $SERVICEHOME/.hostkey | 96 | HOSTKEY = $SERVICEHOME/.hostkey |
97 | 97 | ||
98 | [PATHS] | 98 | [PATHS] |
99 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 99 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
100 | 100 | ||
101 | [fs] | 101 | [fs] |
102 | AUTOSTART = NO | 102 | AUTOSTART = NO |
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf index cfec1e0a5..713422a4b 100644 --- a/src/transport/test_transport_api_rel_https_peer2.conf +++ b/src/transport/test_transport_api_rel_https_peer2.conf | |||
@@ -1,12 +1,12 @@ | |||
1 | [transport-https] | 1 | [transport-https] |
2 | PORT = 13401 | 2 | PORT = 12310 |
3 | DEBUG = NO | 3 | DEBUG = NO |
4 | USE_IPv4 = YES | 4 | USE_IPv4 = YES |
5 | USE_IPv6 = NO | 5 | USE_IPv6 = NO |
6 | BINDTO4 = 127.0.0.1 | 6 | BINDTO4 = 127.0.0.1 |
7 | #BINDTO6 = ::1 | 7 | #BINDTO6 = ::1 |
8 | KEY_FILE = https_key_p2.key | 8 | KEY_FILE = $SERVICEHOME/https_key_p2.key |
9 | CERT_FILE = https_cert_p2.crt | 9 | CERT_FILE = $SERVICEHOME/https_cert_p2.crt |
10 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL | 10 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL |
11 | #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL | 11 | #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL |
12 | #CRYPTO_INIT = PERFORMANCE | 12 | #CRYPTO_INIT = PERFORMANCE |
@@ -41,7 +41,7 @@ BINARY = gnunet-service-transport | |||
41 | CONFIG = $DEFAULTCONFIG | 41 | CONFIG = $DEFAULTCONFIG |
42 | HOME = $SERVICEHOME | 42 | HOME = $SERVICEHOME |
43 | HOSTNAME = localhost | 43 | HOSTNAME = localhost |
44 | PORT = 13402 | 44 | PORT = 12311 |
45 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 45 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
46 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args | 46 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args |
47 | #PREFIX = valgrind --leak-check=full | 47 | #PREFIX = valgrind --leak-check=full |
@@ -56,7 +56,7 @@ BINARY = gnunet-service-peerinfo | |||
56 | CONFIG = $DEFAULTCONFIG | 56 | CONFIG = $DEFAULTCONFIG |
57 | HOME = $SERVICEHOME | 57 | HOME = $SERVICEHOME |
58 | HOSTNAME = localhost | 58 | HOSTNAME = localhost |
59 | PORT = 13403 | 59 | PORT = 12312 |
60 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 60 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
61 | 61 | ||
62 | [resolver] | 62 | [resolver] |
@@ -66,7 +66,7 @@ BINARY = gnunet-service-resolver | |||
66 | CONFIG = $DEFAULTCONFIG | 66 | CONFIG = $DEFAULTCONFIG |
67 | HOME = $SERVICEHOME | 67 | HOME = $SERVICEHOME |
68 | HOSTNAME = localhost | 68 | HOSTNAME = localhost |
69 | PORT = 13404 | 69 | PORT = 12313 |
70 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 70 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
71 | 71 | ||
72 | [statistics] | 72 | [statistics] |
@@ -76,7 +76,7 @@ BINARY = gnunet-service-statistics | |||
76 | CONFIG = $DEFAULTCONFIG | 76 | CONFIG = $DEFAULTCONFIG |
77 | HOME = $SERVICEHOME | 77 | HOME = $SERVICEHOME |
78 | HOSTNAME = localhost | 78 | HOSTNAME = localhost |
79 | PORT = 13405 | 79 | PORT = 12314 |
80 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 80 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
81 | 81 | ||
82 | 82 | ||
@@ -88,7 +88,7 @@ BINARY = gnunet-service-arm | |||
88 | CONFIG = $DEFAULTCONFIG | 88 | CONFIG = $DEFAULTCONFIG |
89 | HOME = $SERVICEHOME | 89 | HOME = $SERVICEHOME |
90 | HOSTNAME = localhost | 90 | HOSTNAME = localhost |
91 | PORT = 13406 | 91 | PORT = 12315 |
92 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 92 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
93 | 93 | ||
94 | [TESTING] | 94 | [TESTING] |
@@ -98,7 +98,7 @@ WEAKRANDOM = YES | |||
98 | HOSTKEY = $SERVICEHOME/.hostkey | 98 | HOSTKEY = $SERVICEHOME/.hostkey |
99 | 99 | ||
100 | [PATHS] | 100 | [PATHS] |
101 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 101 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
102 | 102 | ||
103 | [fs] | 103 | [fs] |
104 | AUTOSTART = NO | 104 | AUTOSTART = NO |