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