diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-15 12:35:00 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-15 12:35:00 +0000 |
commit | b8ee94560053cd737b5a3ea361cd0b397b395ccc (patch) | |
tree | 26c5190f63904333ba313ebf0f31d85761d3660d | |
parent | 6fe56d071a601aa102d1a0b833bad71a0ef84883 (diff) | |
download | gnunet-b8ee94560053cd737b5a3ea361cd0b397b395ccc.tar.gz gnunet-b8ee94560053cd737b5a3ea361cd0b397b395ccc.zip |
use different ports
-rw-r--r-- | src/transport/test_transport_api_rel_https_peer1.conf | 48 | ||||
-rw-r--r-- | src/transport/test_transport_api_rel_https_peer2.conf | 48 |
2 files changed, 29 insertions, 67 deletions
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf index 676a8a0dd..d0b9e7272 100644 --- a/src/transport/test_transport_api_rel_https_peer1.conf +++ b/src/transport/test_transport_api_rel_https_peer1.conf | |||
@@ -1,34 +1,15 @@ | |||
1 | [transport-http] | ||
2 | PORT = 12389 | ||
3 | DEBUG = NO | ||
4 | USE_IPv4 = YES | ||
5 | USE_IPv6 = NO | ||
6 | BINDTO4 = 127.0.0.1 | ||
7 | #BINDTO6 = ::1 | ||
8 | USE_LOCALADDR = YES | ||
9 | |||
10 | [transport-https] | 1 | [transport-https] |
11 | PORT = 15001 | 2 | PORT = 13301 |
12 | #DEBUG = YES | ||
13 | USE_IPv4 = YES | 3 | USE_IPv4 = YES |
14 | USE_IPv6 = NO | 4 | USE_IPv6 = NO |
15 | BINDTO4 = 127.0.0.1 | 5 | BINDTO4 = 127.0.0.1 |
16 | #BINDTO6 = ::1 | 6 | #BINDTO6 = ::1 |
7 | USE_LOCALADDR = YES | ||
17 | KEY_FILE = https_key_p1.key | 8 | KEY_FILE = https_key_p1.key |
18 | CERT_FILE = https_cert_p1.crt | 9 | CERT_FILE = https_cert_p1.crt |
19 | 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 |
20 | #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 |
21 | #CRYPTO_INIT = PERFORMANCE | 12 | #CRYPTO_INIT = PERFORMANCE |
22 | USE_LOCALADDR = YES | ||
23 | |||
24 | [fs] | ||
25 | AUTOSTART = NO | ||
26 | |||
27 | [datastore] | ||
28 | AUTOSTART = NO | ||
29 | |||
30 | [core] | ||
31 | AUTOSTART = NO | ||
32 | 13 | ||
33 | [hostlist] | 14 | [hostlist] |
34 | HTTP-PROXY = | 15 | HTTP-PROXY = |
@@ -51,7 +32,6 @@ MINIMUM-FRIENDS = 0 | |||
51 | 32 | ||
52 | [transport] | 33 | [transport] |
53 | PLUGINS = https | 34 | PLUGINS = https |
54 | #PLUGINS = tcp http | ||
55 | #DEBUG = YES | 35 | #DEBUG = YES |
56 | ACCEPT_FROM6 = ::1; | 36 | ACCEPT_FROM6 = ::1; |
57 | ACCEPT_FROM = 127.0.0.1; | 37 | ACCEPT_FROM = 127.0.0.1; |
@@ -60,7 +40,7 @@ BINARY = gnunet-service-transport | |||
60 | CONFIG = $DEFAULTCONFIG | 40 | CONFIG = $DEFAULTCONFIG |
61 | HOME = $SERVICEHOME | 41 | HOME = $SERVICEHOME |
62 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
63 | PORT = 15000 | 43 | PORT = 13302 |
64 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 44 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
65 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | 45 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args |
66 | #PREFIX = valgrind --leak-check=full | 46 | #PREFIX = valgrind --leak-check=full |
@@ -75,7 +55,7 @@ BINARY = gnunet-service-peerinfo | |||
75 | CONFIG = $DEFAULTCONFIG | 55 | CONFIG = $DEFAULTCONFIG |
76 | HOME = $SERVICEHOME | 56 | HOME = $SERVICEHOME |
77 | HOSTNAME = localhost | 57 | HOSTNAME = localhost |
78 | PORT = 12369 | 58 | PORT = 13303 |
79 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 59 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
80 | 60 | ||
81 | [resolver] | 61 | [resolver] |
@@ -85,7 +65,7 @@ BINARY = gnunet-service-resolver | |||
85 | CONFIG = $DEFAULTCONFIG | 65 | CONFIG = $DEFAULTCONFIG |
86 | HOME = $SERVICEHOME | 66 | HOME = $SERVICEHOME |
87 | HOSTNAME = localhost | 67 | HOSTNAME = localhost |
88 | PORT = 12364 | 68 | PORT = 13304 |
89 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 69 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
90 | 70 | ||
91 | [statistics] | 71 | [statistics] |
@@ -95,7 +75,7 @@ BINARY = gnunet-service-statistics | |||
95 | CONFIG = $DEFAULTCONFIG | 75 | CONFIG = $DEFAULTCONFIG |
96 | HOME = $SERVICEHOME | 76 | HOME = $SERVICEHOME |
97 | HOSTNAME = localhost | 77 | HOSTNAME = localhost |
98 | PORT = 12367 | 78 | PORT = 13305 |
99 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 79 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
100 | 80 | ||
101 | [arm] | 81 | [arm] |
@@ -106,14 +86,9 @@ BINARY = gnunet-service-arm | |||
106 | CONFIG = $DEFAULTCONFIG | 86 | CONFIG = $DEFAULTCONFIG |
107 | HOME = $SERVICEHOME | 87 | HOME = $SERVICEHOME |
108 | HOSTNAME = localhost | 88 | HOSTNAME = localhost |
109 | PORT = 12366 | 89 | PORT = 13306 |
110 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 90 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
111 | 91 | ||
112 | [transport-tcp] | ||
113 | PORT = 12399 | ||
114 | DEBUG = YES | ||
115 | |||
116 | |||
117 | [TESTING] | 92 | [TESTING] |
118 | WEAKRANDOM = YES | 93 | WEAKRANDOM = YES |
119 | 94 | ||
@@ -123,6 +98,14 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
123 | [PATHS] | 98 | [PATHS] |
124 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 99 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ |
125 | 100 | ||
101 | [fs] | ||
102 | AUTOSTART = NO | ||
103 | |||
104 | [datastore] | ||
105 | AUTOSTART = NO | ||
106 | |||
107 | [core] | ||
108 | AUTOSTART = NO | ||
126 | 109 | ||
127 | [dht] | 110 | [dht] |
128 | AUTOSTART = NO | 111 | AUTOSTART = NO |
@@ -130,7 +113,6 @@ AUTOSTART = NO | |||
130 | [mesh] | 113 | [mesh] |
131 | AUTOSTART = NO | 114 | AUTOSTART = NO |
132 | 115 | ||
133 | |||
134 | [dns] | 116 | [dns] |
135 | AUTOSTART = NO | 117 | AUTOSTART = NO |
136 | 118 | ||
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf index ba7a39454..cfec1e0a5 100644 --- a/src/transport/test_transport_api_rel_https_peer2.conf +++ b/src/transport/test_transport_api_rel_https_peer2.conf | |||
@@ -1,14 +1,5 @@ | |||
1 | [transport-http] | ||
2 | PORT = 22389 | ||
3 | DEBUG = NO | ||
4 | USE_IPv4 = YES | ||
5 | USE_IPv6 = NO | ||
6 | BINDTO4 = 127.0.0.1 | ||
7 | #BINDTO6 = ::1 | ||
8 | USE_LOCALADDR = YES | ||
9 | |||
10 | [transport-https] | 1 | [transport-https] |
11 | PORT = 16001 | 2 | PORT = 13401 |
12 | DEBUG = NO | 3 | DEBUG = NO |
13 | USE_IPv4 = YES | 4 | USE_IPv4 = YES |
14 | USE_IPv6 = NO | 5 | USE_IPv6 = NO |
@@ -21,15 +12,6 @@ CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL | |||
21 | #CRYPTO_INIT = PERFORMANCE | 12 | #CRYPTO_INIT = PERFORMANCE |
22 | USE_LOCALADDR = YES | 13 | USE_LOCALADDR = YES |
23 | 14 | ||
24 | [fs] | ||
25 | AUTOSTART = NO | ||
26 | |||
27 | [datastore] | ||
28 | AUTOSTART = NO | ||
29 | |||
30 | [core] | ||
31 | AUTOSTART = NO | ||
32 | |||
33 | [hostlist] | 15 | [hostlist] |
34 | HTTP-PROXY = | 16 | HTTP-PROXY = |
35 | SERVERS = http://gnunet.org:8080/ | 17 | SERVERS = http://gnunet.org:8080/ |
@@ -51,7 +33,6 @@ MINIMUM-FRIENDS = 0 | |||
51 | 33 | ||
52 | [transport] | 34 | [transport] |
53 | PLUGINS = https | 35 | PLUGINS = https |
54 | #PLUGINS = tcp http | ||
55 | #DEBUG = YES | 36 | #DEBUG = YES |
56 | ACCEPT_FROM6 = ::1; | 37 | ACCEPT_FROM6 = ::1; |
57 | ACCEPT_FROM = 127.0.0.1; | 38 | ACCEPT_FROM = 127.0.0.1; |
@@ -60,7 +41,7 @@ BINARY = gnunet-service-transport | |||
60 | CONFIG = $DEFAULTCONFIG | 41 | CONFIG = $DEFAULTCONFIG |
61 | HOME = $SERVICEHOME | 42 | HOME = $SERVICEHOME |
62 | HOSTNAME = localhost | 43 | HOSTNAME = localhost |
63 | PORT = 16000 | 44 | PORT = 13402 |
64 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 45 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
65 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args | 46 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args |
66 | #PREFIX = valgrind --leak-check=full | 47 | #PREFIX = valgrind --leak-check=full |
@@ -75,7 +56,7 @@ BINARY = gnunet-service-peerinfo | |||
75 | CONFIG = $DEFAULTCONFIG | 56 | CONFIG = $DEFAULTCONFIG |
76 | HOME = $SERVICEHOME | 57 | HOME = $SERVICEHOME |
77 | HOSTNAME = localhost | 58 | HOSTNAME = localhost |
78 | PORT = 22369 | 59 | PORT = 13403 |
79 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 60 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
80 | 61 | ||
81 | [resolver] | 62 | [resolver] |
@@ -85,7 +66,7 @@ BINARY = gnunet-service-resolver | |||
85 | CONFIG = $DEFAULTCONFIG | 66 | CONFIG = $DEFAULTCONFIG |
86 | HOME = $SERVICEHOME | 67 | HOME = $SERVICEHOME |
87 | HOSTNAME = localhost | 68 | HOSTNAME = localhost |
88 | PORT = 22364 | 69 | PORT = 13404 |
89 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 70 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
90 | 71 | ||
91 | [statistics] | 72 | [statistics] |
@@ -95,7 +76,7 @@ BINARY = gnunet-service-statistics | |||
95 | CONFIG = $DEFAULTCONFIG | 76 | CONFIG = $DEFAULTCONFIG |
96 | HOME = $SERVICEHOME | 77 | HOME = $SERVICEHOME |
97 | HOSTNAME = localhost | 78 | HOSTNAME = localhost |
98 | PORT = 22367 | 79 | PORT = 13405 |
99 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 80 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
100 | 81 | ||
101 | 82 | ||
@@ -107,18 +88,9 @@ BINARY = gnunet-service-arm | |||
107 | CONFIG = $DEFAULTCONFIG | 88 | CONFIG = $DEFAULTCONFIG |
108 | HOME = $SERVICEHOME | 89 | HOME = $SERVICEHOME |
109 | HOSTNAME = localhost | 90 | HOSTNAME = localhost |
110 | PORT = 22366 | 91 | PORT = 13406 |
111 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 92 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
112 | 93 | ||
113 | |||
114 | [transport-http] | ||
115 | PORT = 22389 | ||
116 | DEBUG = NO | ||
117 | |||
118 | [transport-tcp] | ||
119 | PORT = 22399 | ||
120 | DEBUG = YES | ||
121 | |||
122 | [TESTING] | 94 | [TESTING] |
123 | WEAKRANDOM = YES | 95 | WEAKRANDOM = YES |
124 | 96 | ||
@@ -128,6 +100,14 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
128 | [PATHS] | 100 | [PATHS] |
129 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 101 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ |
130 | 102 | ||
103 | [fs] | ||
104 | AUTOSTART = NO | ||
105 | |||
106 | [datastore] | ||
107 | AUTOSTART = NO | ||
108 | |||
109 | [core] | ||
110 | AUTOSTART = NO | ||
131 | 111 | ||
132 | [dht] | 112 | [dht] |
133 | AUTOSTART = NO | 113 | AUTOSTART = NO |