diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-16 12:32:58 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-16 12:32:58 +0000 |
commit | 2aff944f4bce448c67c576d384926c2ffe8c8c5a (patch) | |
tree | d998a3b512d7ecb20f860420d37e5c283a83caed | |
parent | 79da60ccee66fd4f4bff337e298915a45f808768 (diff) | |
download | gnunet-2aff944f4bce448c67c576d384926c2ffe8c8c5a.tar.gz gnunet-2aff944f4bce448c67c576d384926c2ffe8c8c5a.zip |
updated _api_, _api_reliability_ and api_unrel... confs
17 files changed, 199 insertions, 380 deletions
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index e4e972c8c..d9ab3c5e0 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-http] | 1 | [transport-http] |
2 | PORT = 12389 | 2 | PORT = 12080 |
3 | DEBUG = NO | 3 | DEBUG = NO |
4 | USE_IPv6 = YES | 4 | USE_IPv6 = YES |
5 | USE_IPv4 = YES | 5 | USE_IPv4 = YES |
@@ -7,23 +7,6 @@ USE_IPv4 = YES | |||
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 | |||
18 | [fs] | ||
19 | AUTOSTART = NO | ||
20 | |||
21 | [datastore] | ||
22 | AUTOSTART = NO | ||
23 | |||
24 | [core] | ||
25 | AUTOSTART = NO | ||
26 | |||
27 | [hostlist] | 10 | [hostlist] |
28 | HTTP-PROXY = | 11 | HTTP-PROXY = |
29 | SERVERS = http://gnunet.org:8080/ | 12 | SERVERS = http://gnunet.org:8080/ |
@@ -45,7 +28,6 @@ MINIMUM-FRIENDS = 0 | |||
45 | 28 | ||
46 | [transport] | 29 | [transport] |
47 | PLUGINS = http | 30 | PLUGINS = http |
48 | #PLUGINS = tcp http | ||
49 | #DEBUG = YES | 31 | #DEBUG = YES |
50 | ACCEPT_FROM6 = ::1; | 32 | ACCEPT_FROM6 = ::1; |
51 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
@@ -54,7 +36,7 @@ BINARY = gnunet-service-transport | |||
54 | CONFIG = $DEFAULTCONFIG | 36 | CONFIG = $DEFAULTCONFIG |
55 | HOME = $SERVICEHOME | 37 | HOME = $SERVICEHOME |
56 | HOSTNAME = localhost | 38 | HOSTNAME = localhost |
57 | PORT = 12365 | 39 | PORT = 12081 |
58 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 40 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
59 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | 41 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args |
60 | #PREFIX = valgrind --leak-check=full | 42 | #PREFIX = valgrind --leak-check=full |
@@ -69,7 +51,7 @@ BINARY = gnunet-service-peerinfo | |||
69 | CONFIG = $DEFAULTCONFIG | 51 | CONFIG = $DEFAULTCONFIG |
70 | HOME = $SERVICEHOME | 52 | HOME = $SERVICEHOME |
71 | HOSTNAME = localhost | 53 | HOSTNAME = localhost |
72 | PORT = 12369 | 54 | PORT = 12082 |
73 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 55 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
74 | 56 | ||
75 | [resolver] | 57 | [resolver] |
@@ -79,7 +61,7 @@ BINARY = gnunet-service-resolver | |||
79 | CONFIG = $DEFAULTCONFIG | 61 | CONFIG = $DEFAULTCONFIG |
80 | HOME = $SERVICEHOME | 62 | HOME = $SERVICEHOME |
81 | HOSTNAME = localhost | 63 | HOSTNAME = localhost |
82 | PORT = 12364 | 64 | PORT = 12083 |
83 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 65 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
84 | 66 | ||
85 | [statistics] | 67 | [statistics] |
@@ -89,7 +71,7 @@ BINARY = gnunet-service-statistics | |||
89 | CONFIG = $DEFAULTCONFIG | 71 | CONFIG = $DEFAULTCONFIG |
90 | HOME = $SERVICEHOME | 72 | HOME = $SERVICEHOME |
91 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
92 | PORT = 12367 | 74 | PORT = 12084 |
93 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 75 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
94 | 76 | ||
95 | [arm] | 77 | [arm] |
@@ -100,13 +82,9 @@ BINARY = gnunet-service-arm | |||
100 | CONFIG = $DEFAULTCONFIG | 82 | CONFIG = $DEFAULTCONFIG |
101 | HOME = $SERVICEHOME | 83 | HOME = $SERVICEHOME |
102 | HOSTNAME = localhost | 84 | HOSTNAME = localhost |
103 | PORT = 12366 | 85 | PORT = 12085 |
104 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 86 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
105 | 87 | ||
106 | [transport-tcp] | ||
107 | PORT = 12399 | ||
108 | #DEBUG = YES | ||
109 | |||
110 | 88 | ||
111 | [TESTING] | 89 | [TESTING] |
112 | WEAKRANDOM = YES | 90 | WEAKRANDOM = YES |
@@ -115,8 +93,16 @@ WEAKRANDOM = YES | |||
115 | HOSTKEY = $SERVICEHOME/.hostkey | 93 | HOSTKEY = $SERVICEHOME/.hostkey |
116 | 94 | ||
117 | [PATHS] | 95 | [PATHS] |
118 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 96 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
97 | |||
98 | [fs] | ||
99 | AUTOSTART = NO | ||
100 | |||
101 | [datastore] | ||
102 | AUTOSTART = NO | ||
119 | 103 | ||
104 | [core] | ||
105 | AUTOSTART = NO | ||
120 | 106 | ||
121 | [dht] | 107 | [dht] |
122 | AUTOSTART = NO | 108 | AUTOSTART = NO |
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index a8833c7a4..a4b7b8bf0 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-http] | 1 | [transport-http] |
2 | PORT = 22368 | 2 | PORT = 12090 |
3 | DEBUG = NO | 3 | DEBUG = NO |
4 | USE_IPv6 = YES | 4 | USE_IPv6 = YES |
5 | USE_IPv4 = YES | 5 | USE_IPv4 = YES |
@@ -7,23 +7,6 @@ USE_IPv4 = YES | |||
7 | #BINDTO6 = ::1 | 7 | #BINDTO6 = ::1 |
8 | USE_LOCALADDR = YES | 8 | USE_LOCALADDR = YES |
9 | 9 | ||
10 | [transport-https] | ||
11 | PORT = 42388 | ||
12 | DEBUG = NO | ||
13 | USE_IPv6 = YES | ||
14 | USE_IPv4 = YES | ||
15 | #BINDTO4 = 127.0.0.1 | ||
16 | #BINDTO6 = ::1 | ||
17 | |||
18 | [fs] | ||
19 | AUTOSTART = NO | ||
20 | |||
21 | [datastore] | ||
22 | AUTOSTART = NO | ||
23 | |||
24 | [core] | ||
25 | AUTOSTART = NO | ||
26 | |||
27 | [hostlist] | 10 | [hostlist] |
28 | HTTP-PROXY = | 11 | HTTP-PROXY = |
29 | SERVERS = http://gnunet.org:8080/ | 12 | SERVERS = http://gnunet.org:8080/ |
@@ -45,7 +28,6 @@ MINIMUM-FRIENDS = 0 | |||
45 | 28 | ||
46 | [transport] | 29 | [transport] |
47 | PLUGINS = http | 30 | PLUGINS = http |
48 | #PLUGINS = tcp http | ||
49 | #DEBUG = YES | 31 | #DEBUG = YES |
50 | ACCEPT_FROM6 = ::1; | 32 | ACCEPT_FROM6 = ::1; |
51 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
@@ -54,7 +36,7 @@ BINARY = gnunet-service-transport | |||
54 | CONFIG = $DEFAULTCONFIG | 36 | CONFIG = $DEFAULTCONFIG |
55 | HOME = $SERVICEHOME | 37 | HOME = $SERVICEHOME |
56 | HOSTNAME = localhost | 38 | HOSTNAME = localhost |
57 | PORT = 22365 | 39 | PORT = 12091 |
58 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 40 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
59 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args | 41 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args |
60 | #PREFIX = valgrind --leak-check=full | 42 | #PREFIX = valgrind --leak-check=full |
@@ -69,7 +51,7 @@ BINARY = gnunet-service-peerinfo | |||
69 | CONFIG = $DEFAULTCONFIG | 51 | CONFIG = $DEFAULTCONFIG |
70 | HOME = $SERVICEHOME | 52 | HOME = $SERVICEHOME |
71 | HOSTNAME = localhost | 53 | HOSTNAME = localhost |
72 | PORT = 22369 | 54 | PORT = 12092 |
73 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 55 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
74 | 56 | ||
75 | [resolver] | 57 | [resolver] |
@@ -79,7 +61,7 @@ BINARY = gnunet-service-resolver | |||
79 | CONFIG = $DEFAULTCONFIG | 61 | CONFIG = $DEFAULTCONFIG |
80 | HOME = $SERVICEHOME | 62 | HOME = $SERVICEHOME |
81 | HOSTNAME = localhost | 63 | HOSTNAME = localhost |
82 | PORT = 22364 | 64 | PORT = 12093 |
83 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 65 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
84 | 66 | ||
85 | [statistics] | 67 | [statistics] |
@@ -89,7 +71,7 @@ BINARY = gnunet-service-statistics | |||
89 | CONFIG = $DEFAULTCONFIG | 71 | CONFIG = $DEFAULTCONFIG |
90 | HOME = $SERVICEHOME | 72 | HOME = $SERVICEHOME |
91 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
92 | PORT = 22367 | 74 | PORT = 12094 |
93 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 75 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
94 | 76 | ||
95 | 77 | ||
@@ -101,18 +83,9 @@ BINARY = gnunet-service-arm | |||
101 | CONFIG = $DEFAULTCONFIG | 83 | CONFIG = $DEFAULTCONFIG |
102 | HOME = $SERVICEHOME | 84 | HOME = $SERVICEHOME |
103 | HOSTNAME = localhost | 85 | HOSTNAME = localhost |
104 | PORT = 22366 | 86 | PORT = 12095 |
105 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 87 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
106 | 88 | ||
107 | |||
108 | [transport-http] | ||
109 | PORT = 22389 | ||
110 | DEBUG = NO | ||
111 | |||
112 | [transport-tcp] | ||
113 | PORT = 22399 | ||
114 | #DEBUG = YES | ||
115 | |||
116 | [TESTING] | 89 | [TESTING] |
117 | WEAKRANDOM = YES | 90 | WEAKRANDOM = YES |
118 | 91 | ||
@@ -120,8 +93,16 @@ WEAKRANDOM = YES | |||
120 | HOSTKEY = $SERVICEHOME/.hostkey | 93 | HOSTKEY = $SERVICEHOME/.hostkey |
121 | 94 | ||
122 | [PATHS] | 95 | [PATHS] |
123 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 96 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
97 | |||
98 | [fs] | ||
99 | AUTOSTART = NO | ||
124 | 100 | ||
101 | [datastore] | ||
102 | AUTOSTART = NO | ||
103 | |||
104 | [core] | ||
105 | AUTOSTART = NO | ||
125 | 106 | ||
126 | [dht] | 107 | [dht] |
127 | AUTOSTART = NO | 108 | AUTOSTART = NO |
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index a2decb6fb..e441bfc2b 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf | |||
@@ -1,13 +1,5 @@ | |||
1 | [transport-http] | ||
2 | PORT = 12389 | ||
3 | DEBUG = NO | ||
4 | USE_IPv6 = YES | ||
5 | USE_IPv4 = YES | ||
6 | #BINDTO4 = 127.0.0.1 | ||
7 | #BINDTO6 = ::1 | ||
8 | |||
9 | [transport-https] | 1 | [transport-https] |
10 | PORT = 42389 | 2 | PORT = 12100 |
11 | DEBUG = NO | 3 | DEBUG = NO |
12 | USE_IPv6 = YES | 4 | USE_IPv6 = YES |
13 | USE_IPv4 = YES | 5 | USE_IPv4 = YES |
@@ -50,7 +42,6 @@ MINIMUM-FRIENDS = 0 | |||
50 | 42 | ||
51 | [transport] | 43 | [transport] |
52 | PLUGINS = https | 44 | PLUGINS = https |
53 | #PLUGINS = tcp http | ||
54 | DEBUG = NO | 45 | DEBUG = NO |
55 | ACCEPT_FROM6 = ::1; | 46 | ACCEPT_FROM6 = ::1; |
56 | ACCEPT_FROM = 127.0.0.1; | 47 | ACCEPT_FROM = 127.0.0.1; |
@@ -59,7 +50,7 @@ BINARY = gnunet-service-transport | |||
59 | CONFIG = $DEFAULTCONFIG | 50 | CONFIG = $DEFAULTCONFIG |
60 | HOME = $SERVICEHOME | 51 | HOME = $SERVICEHOME |
61 | HOSTNAME = localhost | 52 | HOSTNAME = localhost |
62 | PORT = 12365 | 53 | PORT = 12101 |
63 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 54 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
64 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | 55 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args |
65 | #PREFIX = valgrind --leak-check=full | 56 | #PREFIX = valgrind --leak-check=full |
@@ -74,7 +65,7 @@ BINARY = gnunet-service-peerinfo | |||
74 | CONFIG = $DEFAULTCONFIG | 65 | CONFIG = $DEFAULTCONFIG |
75 | HOME = $SERVICEHOME | 66 | HOME = $SERVICEHOME |
76 | HOSTNAME = localhost | 67 | HOSTNAME = localhost |
77 | PORT = 12369 | 68 | PORT = 12102 |
78 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 69 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
79 | 70 | ||
80 | [resolver] | 71 | [resolver] |
@@ -84,7 +75,7 @@ BINARY = gnunet-service-resolver | |||
84 | CONFIG = $DEFAULTCONFIG | 75 | CONFIG = $DEFAULTCONFIG |
85 | HOME = $SERVICEHOME | 76 | HOME = $SERVICEHOME |
86 | HOSTNAME = localhost | 77 | HOSTNAME = localhost |
87 | PORT = 12364 | 78 | PORT = 12103 |
88 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 79 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
89 | 80 | ||
90 | [statistics] | 81 | [statistics] |
@@ -94,7 +85,7 @@ BINARY = gnunet-service-statistics | |||
94 | CONFIG = $DEFAULTCONFIG | 85 | CONFIG = $DEFAULTCONFIG |
95 | HOME = $SERVICEHOME | 86 | HOME = $SERVICEHOME |
96 | HOSTNAME = localhost | 87 | HOSTNAME = localhost |
97 | PORT = 12367 | 88 | PORT = 12104 |
98 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 89 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
99 | 90 | ||
100 | [arm] | 91 | [arm] |
@@ -105,24 +96,7 @@ BINARY = gnunet-service-arm | |||
105 | CONFIG = $DEFAULTCONFIG | 96 | CONFIG = $DEFAULTCONFIG |
106 | HOME = $SERVICEHOME | 97 | HOME = $SERVICEHOME |
107 | HOSTNAME = localhost | 98 | HOSTNAME = localhost |
108 | PORT = 12366[mesh] | 99 | PORT = 12105 |
109 | AUTOSTART = YES | ||
110 | PORT = 10512 | ||
111 | HOSTNAME = localhost | ||
112 | HOME = $SERVICEHOME | ||
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-mesh | ||
115 | ACCEPT_FROM = 127.0.0.1; | ||
116 | ACCEPT_FROM6 = ::1; | ||
117 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
118 | UNIX_MATCH_UID = YES | ||
119 | UNIX_MATCH_GID = YES | ||
120 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | ||
121 | |||
122 | [transport-tcp] | ||
123 | PORT = 12399 | ||
124 | DEBUG = YES | ||
125 | |||
126 | 100 | ||
127 | [TESTING] | 101 | [TESTING] |
128 | WEAKRANDOM = YES | 102 | WEAKRANDOM = YES |
@@ -131,7 +105,7 @@ WEAKRANDOM = YES | |||
131 | HOSTKEY = $SERVICEHOME/.hostkey | 105 | HOSTKEY = $SERVICEHOME/.hostkey |
132 | 106 | ||
133 | [PATHS] | 107 | [PATHS] |
134 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 108 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
135 | 109 | ||
136 | 110 | ||
137 | [dht] | 111 | [dht] |
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index 07495835c..cf0c5c915 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf | |||
@@ -1,13 +1,5 @@ | |||
1 | [transport-http] | ||
2 | PORT = 22368 | ||
3 | DEBUG = NO | ||
4 | USE_IPv6 = YES | ||
5 | USE_IPv4 = YES | ||
6 | #BINDTO4 = 127.0.0.1 | ||
7 | #BINDTO6 = ::1 | ||
8 | |||
9 | [transport-https] | 1 | [transport-https] |
10 | PORT = 42388 | 2 | PORT = 12110 |
11 | DEBUG = NO | 3 | DEBUG = NO |
12 | USE_IPv6 = YES | 4 | USE_IPv6 = YES |
13 | USE_IPv4 = YES | 5 | USE_IPv4 = YES |
@@ -59,7 +51,7 @@ BINARY = gnunet-service-transport | |||
59 | CONFIG = $DEFAULTCONFIG | 51 | CONFIG = $DEFAULTCONFIG |
60 | HOME = $SERVICEHOME | 52 | HOME = $SERVICEHOME |
61 | HOSTNAME = localhost | 53 | HOSTNAME = localhost |
62 | PORT = 22365 | 54 | PORT = 12111 |
63 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 55 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
64 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args | 56 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args |
65 | #PREFIX = valgrind --leak-check=full | 57 | #PREFIX = valgrind --leak-check=full |
@@ -74,7 +66,7 @@ BINARY = gnunet-service-peerinfo | |||
74 | CONFIG = $DEFAULTCONFIG | 66 | CONFIG = $DEFAULTCONFIG |
75 | HOME = $SERVICEHOME | 67 | HOME = $SERVICEHOME |
76 | HOSTNAME = localhost | 68 | HOSTNAME = localhost |
77 | PORT = 22369 | 69 | PORT = 12112 |
78 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 70 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
79 | 71 | ||
80 | [resolver] | 72 | [resolver] |
@@ -84,7 +76,7 @@ BINARY = gnunet-service-resolver | |||
84 | CONFIG = $DEFAULTCONFIG | 76 | CONFIG = $DEFAULTCONFIG |
85 | HOME = $SERVICEHOME | 77 | HOME = $SERVICEHOME |
86 | HOSTNAME = localhost | 78 | HOSTNAME = localhost |
87 | PORT = 22364 | 79 | PORT = 12113 |
88 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 80 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
89 | 81 | ||
90 | [statistics] | 82 | [statistics] |
@@ -94,7 +86,7 @@ BINARY = gnunet-service-statistics | |||
94 | CONFIG = $DEFAULTCONFIG | 86 | CONFIG = $DEFAULTCONFIG |
95 | HOME = $SERVICEHOME | 87 | HOME = $SERVICEHOME |
96 | HOSTNAME = localhost | 88 | HOSTNAME = localhost |
97 | PORT = 22367 | 89 | PORT = 12114 |
98 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 90 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
99 | 91 | ||
100 | 92 | ||
@@ -106,18 +98,9 @@ BINARY = gnunet-service-arm | |||
106 | CONFIG = $DEFAULTCONFIG | 98 | CONFIG = $DEFAULTCONFIG |
107 | HOME = $SERVICEHOME | 99 | HOME = $SERVICEHOME |
108 | HOSTNAME = localhost | 100 | HOSTNAME = localhost |
109 | PORT = 22366 | 101 | PORT = 12115 |
110 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 102 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
111 | 103 | ||
112 | |||
113 | [transport-http] | ||
114 | PORT = 22389 | ||
115 | DEBUG = NO | ||
116 | |||
117 | [transport-tcp] | ||
118 | PORT = 22399 | ||
119 | DEBUG = YES | ||
120 | |||
121 | [TESTING] | 104 | [TESTING] |
122 | WEAKRANDOM = YES | 105 | WEAKRANDOM = YES |
123 | 106 | ||
@@ -125,8 +108,7 @@ WEAKRANDOM = YES | |||
125 | HOSTKEY = $SERVICEHOME/.hostkey | 108 | HOSTKEY = $SERVICEHOME/.hostkey |
126 | 109 | ||
127 | [PATHS] | 110 | [PATHS] |
128 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 111 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
129 | |||
130 | 112 | ||
131 | [dht] | 113 | [dht] |
132 | AUTOSTART = NO | 114 | AUTOSTART = NO |
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index 959388391..003491323 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-tcp] | 1 | [transport-tcp] |
2 | PORT = 30001 | 2 | PORT = 12140 |
3 | BINDTO = 127.0.0.1 | 3 | BINDTO = 127.0.0.1 |
4 | USE_LOCALADDR = YES | 4 | USE_LOCALADDR = YES |
5 | 5 | ||
@@ -12,11 +12,11 @@ INTERNAL_ADDRESS = 127.0.0.1 | |||
12 | EXTERNAL_ADDRESS = 127.0.0.1 | 12 | EXTERNAL_ADDRESS = 127.0.0.1 |
13 | 13 | ||
14 | [transport-udp] | 14 | [transport-udp] |
15 | PORT = 30001 | 15 | PORT = 12141 |
16 | USE_LOCALADDR = YES | 16 | USE_LOCALADDR = YES |
17 | 17 | ||
18 | [transport-http] | 18 | [transport-http] |
19 | PORT = 30002 | 19 | PORT = 12142 |
20 | DEBUG = NO | 20 | DEBUG = NO |
21 | USE_IPv6 = YES | 21 | USE_IPv6 = YES |
22 | USE_IPv4 = YES | 22 | USE_IPv4 = YES |
@@ -25,7 +25,7 @@ USE_IPv4 = YES | |||
25 | USE_LOCALADDR = YES | 25 | USE_LOCALADDR = YES |
26 | 26 | ||
27 | [transport-https] | 27 | [transport-https] |
28 | PORT = 30003 | 28 | PORT = 12143 |
29 | DEBUG = NO | 29 | DEBUG = NO |
30 | USE_IPv6 = YES | 30 | USE_IPv6 = YES |
31 | USE_IPv4 = YES | 31 | USE_IPv4 = YES |
@@ -34,7 +34,7 @@ USE_IPv4 = YES | |||
34 | USE_LOCALADDR = YES | 34 | USE_LOCALADDR = YES |
35 | 35 | ||
36 | [transport-unix] | 36 | [transport-unix] |
37 | PORT = 30004 | 37 | PORT = 12144 |
38 | 38 | ||
39 | [fs] | 39 | [fs] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
@@ -73,11 +73,10 @@ ACCEPT_FROM6 = ::1; | |||
73 | ACCEPT_FROM = 127.0.0.1; | 73 | ACCEPT_FROM = 127.0.0.1; |
74 | NEIGHBOUR_LIMIT = 50 | 74 | NEIGHBOUR_LIMIT = 50 |
75 | BINARY = gnunet-service-transport | 75 | BINARY = gnunet-service-transport |
76 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport | ||
77 | CONFIG = $DEFAULTCONFIG | 76 | CONFIG = $DEFAULTCONFIG |
78 | HOME = $SERVICEHOME | 77 | HOME = $SERVICEHOME |
79 | HOSTNAME = localhost | 78 | HOSTNAME = localhost |
80 | PORT = 12365 | 79 | PORT = 12145 |
81 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 80 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
82 | 81 | ||
83 | [peerinfo] | 82 | [peerinfo] |
@@ -89,7 +88,7 @@ BINARY = gnunet-service-peerinfo | |||
89 | CONFIG = $DEFAULTCONFIG | 88 | CONFIG = $DEFAULTCONFIG |
90 | HOME = $SERVICEHOME | 89 | HOME = $SERVICEHOME |
91 | HOSTNAME = localhost | 90 | HOSTNAME = localhost |
92 | PORT = 12369 | 91 | PORT = 12146 |
93 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 92 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
94 | 93 | ||
95 | [resolver] | 94 | [resolver] |
@@ -99,7 +98,7 @@ BINARY = gnunet-service-resolver | |||
99 | CONFIG = $DEFAULTCONFIG | 98 | CONFIG = $DEFAULTCONFIG |
100 | HOME = $SERVICEHOME | 99 | HOME = $SERVICEHOME |
101 | HOSTNAME = localhost | 100 | HOSTNAME = localhost |
102 | PORT = 1236 | 101 | PORT = 12147 |
103 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 102 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
104 | 103 | ||
105 | [statistics] | 104 | [statistics] |
@@ -110,7 +109,7 @@ BINARY = gnunet-service-statistics | |||
110 | CONFIG = $DEFAULTCONFIG | 109 | CONFIG = $DEFAULTCONFIG |
111 | HOME = $SERVICEHOME | 110 | HOME = $SERVICEHOME |
112 | HOSTNAME = localhost | 111 | HOSTNAME = localhost |
113 | PORT = 12367 | 112 | PORT = 12148 |
114 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 113 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
115 | 114 | ||
116 | [arm] | 115 | [arm] |
@@ -121,7 +120,7 @@ BINARY = gnunet-service-arm | |||
121 | CONFIG = $DEFAULTCONFIG | 120 | CONFIG = $DEFAULTCONFIG |
122 | HOME = $SERVICEHOME | 121 | HOME = $SERVICEHOME |
123 | HOSTNAME = localhost | 122 | HOSTNAME = localhost |
124 | PORT = 12366 | 123 | PORT = 12149 |
125 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 124 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
126 | 125 | ||
127 | [TESTING] | 126 | [TESTING] |
@@ -132,7 +131,7 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
132 | 131 | ||
133 | [PATHS] | 132 | [PATHS] |
134 | DEFAULTCONFIG = test_transport_api_multi_peer1.conf | 133 | DEFAULTCONFIG = test_transport_api_multi_peer1.conf |
135 | SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-1/ | 134 | SERVICEHOME = /tmp/test-transport/api-multi-p1/ |
136 | 135 | ||
137 | 136 | ||
138 | [dht] | 137 | [dht] |
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index ca7a505c9..fcfc1db03 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-tcp] | 1 | [transport-tcp] |
2 | PORT = 40001 | 2 | PORT = 12150 |
3 | USE_LOCALADDR = YES | 3 | USE_LOCALADDR = YES |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
@@ -12,11 +12,11 @@ EXTERNAL_ADDRESS = 127.0.0.1 | |||
12 | INTERNAL_ADDRESS = 127.0.0.1 | 12 | INTERNAL_ADDRESS = 127.0.0.1 |
13 | 13 | ||
14 | [transport-udp] | 14 | [transport-udp] |
15 | PORT = 40002 | 15 | PORT = 12151 |
16 | USE_LOCALADDR = YES | 16 | USE_LOCALADDR = YES |
17 | 17 | ||
18 | [transport-http] | 18 | [transport-http] |
19 | PORT = 40003 | 19 | PORT = 12152 |
20 | DEBUG = NO | 20 | DEBUG = NO |
21 | USE_IPv6 = YES | 21 | USE_IPv6 = YES |
22 | USE_IPv4 = YES | 22 | USE_IPv4 = YES |
@@ -25,7 +25,7 @@ USE_IPv4 = YES | |||
25 | USE_LOCALADDR = YES | 25 | USE_LOCALADDR = YES |
26 | 26 | ||
27 | [transport-https] | 27 | [transport-https] |
28 | PORT = 40004 | 28 | PORT = 12153 |
29 | DEBUG = NO | 29 | DEBUG = NO |
30 | USE_IPv6 = YES | 30 | USE_IPv6 = YES |
31 | USE_IPv4 = YES | 31 | USE_IPv4 = YES |
@@ -34,7 +34,7 @@ USE_IPv4 = YES | |||
34 | USE_LOCALADDR = YES | 34 | USE_LOCALADDR = YES |
35 | 35 | ||
36 | [transport-unix] | 36 | [transport-unix] |
37 | PORT = 40005 | 37 | PORT = 12154 |
38 | 38 | ||
39 | [core] | 39 | [core] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
@@ -44,18 +44,7 @@ AUTOSTART = NO | |||
44 | 44 | ||
45 | [datastore] | 45 | [datastore] |
46 | AUTOSTART = NO | 46 | AUTOSTART = NO |
47 | [mesh] | 47 | |
48 | AUTOSTART = YES | ||
49 | PORT = 10512 | ||
50 | HOSTNAME = localhost | ||
51 | HOME = $SERVICEHOME | ||
52 | CONFIG = $DEFAULTCONFIG | ||
53 | BINARY = gnunet-service-mesh | ||
54 | ACCEPT_FROM = 127.0.0.1; | ||
55 | ACCEPT_FROM6 = ::1; | ||
56 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
57 | UNIX_MATCH_UID = YES | ||
58 | UNIX_MATCH_GID = YES | ||
59 | [hostlist] | 48 | [hostlist] |
60 | HTTP-PROXY = | 49 | HTTP-PROXY = |
61 | SERVERS = http://gnunet.org:8080/ | 50 | SERVERS = http://gnunet.org:8080/ |
@@ -86,7 +75,7 @@ BINARY = gnunet-service-transport | |||
86 | CONFIG = $DEFAULTCONFIG | 75 | CONFIG = $DEFAULTCONFIG |
87 | HOME = $SERVICEHOME | 76 | HOME = $SERVICEHOME |
88 | HOSTNAME = localhost | 77 | HOSTNAME = localhost |
89 | PORT = 22365 | 78 | PORT = 12155 |
90 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 79 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
91 | #PREFIX = valgrind --tool=callgrind | 80 | #PREFIX = valgrind --tool=callgrind |
92 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | 81 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args |
@@ -101,7 +90,7 @@ BINARY = gnunet-service-peerinfo | |||
101 | CONFIG = $DEFAULTCONFIG | 90 | CONFIG = $DEFAULTCONFIG |
102 | HOME = $SERVICEHOME | 91 | HOME = $SERVICEHOME |
103 | HOSTNAME = localhost | 92 | HOSTNAME = localhost |
104 | PORT = 22369 | 93 | PORT = 12156 |
105 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 94 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
106 | 95 | ||
107 | [resolver] | 96 | [resolver] |
@@ -111,7 +100,7 @@ BINARY = gnunet-service-resolver | |||
111 | CONFIG = $DEFAULTCONFIG | 100 | CONFIG = $DEFAULTCONFIG |
112 | HOME = $SERVICEHOME | 101 | HOME = $SERVICEHOME |
113 | HOSTNAME = localhost | 102 | HOSTNAME = localhost |
114 | PORT = 22364 | 103 | PORT = 12157 |
115 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 104 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
116 | 105 | ||
117 | [statistics] | 106 | [statistics] |
@@ -122,7 +111,7 @@ BINARY = gnunet-service-statistics | |||
122 | CONFIG = $DEFAULTCONFIG | 111 | CONFIG = $DEFAULTCONFIG |
123 | HOME = $SERVICEHOME | 112 | HOME = $SERVICEHOME |
124 | HOSTNAME = localhost | 113 | HOSTNAME = localhost |
125 | PORT = 22367 | 114 | PORT = 12158 |
126 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 115 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
127 | 116 | ||
128 | [arm] | 117 | [arm] |
@@ -133,7 +122,7 @@ BINARY = gnunet-service-arm | |||
133 | CONFIG = $DEFAULTCONFIG | 122 | CONFIG = $DEFAULTCONFIG |
134 | HOME = $SERVICEHOME | 123 | HOME = $SERVICEHOME |
135 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
136 | PORT = 22366 | 125 | PORT = 12159 |
137 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 126 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
138 | 127 | ||
139 | [TESTING] | 128 | [TESTING] |
@@ -144,7 +133,7 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
144 | 133 | ||
145 | [PATHS] | 134 | [PATHS] |
146 | DEFAULTCONFIG = test_transport_api_multi_peer2.conf | 135 | DEFAULTCONFIG = test_transport_api_multi_peer2.conf |
147 | SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-2/ | 136 | SERVICEHOME = /tmp/test-transport/api-multi-p2/ |
148 | 137 | ||
149 | 138 | ||
150 | [dht] | 139 | [dht] |
diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf index 8f7640f21..3c8621b39 100644 --- a/src/transport/test_transport_api_rel_http_peer2.conf +++ b/src/transport/test_transport_api_rel_http_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 = 42389 | 2 | PORT = 12090 |
12 | DEBUG = NO | 3 | DEBUG = NO |
13 | USE_IPv6 = YES | 4 | USE_IPv6 = YES |
14 | USE_IPv4 = YES | 5 | USE_IPv4 = YES |
@@ -56,7 +47,7 @@ BINARY = gnunet-service-transport | |||
56 | CONFIG = $DEFAULTCONFIG | 47 | CONFIG = $DEFAULTCONFIG |
57 | HOME = $SERVICEHOME | 48 | HOME = $SERVICEHOME |
58 | HOSTNAME = localhost | 49 | HOSTNAME = localhost |
59 | PORT = 22365 | 50 | PORT = 12091 |
60 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 51 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
61 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args | 52 | #PREFIX = xterm -T transport1 -e gdb --command=cmd --args |
62 | #PREFIX = valgrind --leak-check=full | 53 | #PREFIX = valgrind --leak-check=full |
@@ -73,7 +64,7 @@ BINARY = gnunet-service-peerinfo | |||
73 | CONFIG = $DEFAULTCONFIG | 64 | CONFIG = $DEFAULTCONFIG |
74 | HOME = $SERVICEHOME | 65 | HOME = $SERVICEHOME |
75 | HOSTNAME = localhost | 66 | HOSTNAME = localhost |
76 | PORT = 22369 | 67 | PORT = 12092 |
77 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 68 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
78 | 69 | ||
79 | [resolver] | 70 | [resolver] |
@@ -83,7 +74,7 @@ BINARY = gnunet-service-resolver | |||
83 | CONFIG = $DEFAULTCONFIG | 74 | CONFIG = $DEFAULTCONFIG |
84 | HOME = $SERVICEHOME | 75 | HOME = $SERVICEHOME |
85 | HOSTNAME = localhost | 76 | HOSTNAME = localhost |
86 | PORT = 22364 | 77 | PORT = 12093 |
87 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 78 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
88 | 79 | ||
89 | [statistics] | 80 | [statistics] |
@@ -93,7 +84,7 @@ BINARY = gnunet-service-statistics | |||
93 | CONFIG = $DEFAULTCONFIG | 84 | CONFIG = $DEFAULTCONFIG |
94 | HOME = $SERVICEHOME | 85 | HOME = $SERVICEHOME |
95 | HOSTNAME = localhost | 86 | HOSTNAME = localhost |
96 | PORT = 22367 | 87 | PORT = 12094 |
97 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 88 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
98 | 89 | ||
99 | 90 | ||
@@ -105,18 +96,9 @@ BINARY = gnunet-service-arm | |||
105 | CONFIG = $DEFAULTCONFIG | 96 | CONFIG = $DEFAULTCONFIG |
106 | HOME = $SERVICEHOME | 97 | HOME = $SERVICEHOME |
107 | HOSTNAME = localhost | 98 | HOSTNAME = localhost |
108 | PORT = 22366 | 99 | PORT = 12095 |
109 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 100 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
110 | 101 | ||
111 | |||
112 | [transport-http] | ||
113 | PORT = 22389 | ||
114 | #DEBUG = NO | ||
115 | |||
116 | [transport-tcp] | ||
117 | PORT = 22399 | ||
118 | #DEBUG = YES | ||
119 | |||
120 | [TESTING] | 102 | [TESTING] |
121 | WEAKRANDOM = YES | 103 | WEAKRANDOM = YES |
122 | 104 | ||
@@ -124,7 +106,7 @@ WEAKRANDOM = YES | |||
124 | HOSTKEY = $SERVICEHOME/.hostkey | 106 | HOSTKEY = $SERVICEHOME/.hostkey |
125 | 107 | ||
126 | [PATHS] | 108 | [PATHS] |
127 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 109 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
128 | 110 | ||
129 | 111 | ||
130 | [dht] | 112 | [dht] |
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 2afe41210..e7724aa88 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-tcp] | 1 | [transport-tcp] |
2 | PORT = 12368 | 2 | PORT = 12020 |
3 | USE_LOCALADDR = YES | 3 | USE_LOCALADDR = YES |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
@@ -11,15 +11,6 @@ ENABLE_NAT_SERVER = YES | |||
11 | INTERNAL_ADDRESS = 127.0.0.1 | 11 | INTERNAL_ADDRESS = 127.0.0.1 |
12 | EXTERNAL_ADDRESS = 127.0.0.1 | 12 | EXTERNAL_ADDRESS = 127.0.0.1 |
13 | 13 | ||
14 | [fs] | ||
15 | AUTOSTART = NO | ||
16 | |||
17 | [datastore] | ||
18 | AUTOSTART = NO | ||
19 | |||
20 | [core] | ||
21 | AUTOSTART = NO | ||
22 | |||
23 | [hostlist] | 14 | [hostlist] |
24 | HTTP-PROXY = | 15 | HTTP-PROXY = |
25 | SERVERS = http://gnunet.org:8080/ | 16 | SERVERS = http://gnunet.org:8080/ |
@@ -64,7 +55,7 @@ BINARY = gnunet-service-peerinfo | |||
64 | CONFIG = $DEFAULTCONFIG | 55 | CONFIG = $DEFAULTCONFIG |
65 | HOME = $SERVICEHOME | 56 | HOME = $SERVICEHOME |
66 | HOSTNAME = localhost | 57 | HOSTNAME = localhost |
67 | PORT = 12369 | 58 | PORT = 12021 |
68 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 59 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
69 | 60 | ||
70 | [resolver] | 61 | [resolver] |
@@ -74,7 +65,7 @@ BINARY = gnunet-service-resolver | |||
74 | CONFIG = $DEFAULTCONFIG | 65 | CONFIG = $DEFAULTCONFIG |
75 | HOME = $SERVICEHOME | 66 | HOME = $SERVICEHOME |
76 | HOSTNAME = localhost | 67 | HOSTNAME = localhost |
77 | PORT = 1236 | 68 | PORT = 12022 |
78 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 69 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
79 | 70 | ||
80 | [statistics] | 71 | [statistics] |
@@ -85,7 +76,7 @@ BINARY = gnunet-service-statistics | |||
85 | CONFIG = $DEFAULTCONFIG | 76 | CONFIG = $DEFAULTCONFIG |
86 | HOME = $SERVICEHOME | 77 | HOME = $SERVICEHOME |
87 | HOSTNAME = localhost | 78 | HOSTNAME = localhost |
88 | PORT = 12367 | 79 | PORT = 12023 |
89 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 80 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
90 | 81 | ||
91 | [arm] | 82 | [arm] |
@@ -96,22 +87,9 @@ BINARY = gnunet-service-arm | |||
96 | CONFIG = $DEFAULTCONFIG | 87 | CONFIG = $DEFAULTCONFIG |
97 | HOME = $SERVICEHOME | 88 | HOME = $SERVICEHOME |
98 | HOSTNAME = localhost | 89 | HOSTNAME = localhost |
99 | PORT = 12366 | 90 | PORT = 1204 |
100 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 91 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
101 | 92 | ||
102 | [mesh] | ||
103 | AUTOSTART = NO | ||
104 | PORT = 10511 | ||
105 | HOSTNAME = localhost | ||
106 | HOME = $SERVICEHOME | ||
107 | CONFIG = $DEFAULTCONFIG | ||
108 | BINARY = gnunet-service-mesh | ||
109 | ACCEPT_FROM = 127.0.0.1; | ||
110 | ACCEPT_FROM6 = ::1; | ||
111 | UNIXPATH = /tmp/gnunet-service-mesh.sock | ||
112 | UNIX_MATCH_UID = YES | ||
113 | UNIX_MATCH_GID = YES | ||
114 | |||
115 | [TESTING] | 93 | [TESTING] |
116 | WEAKRANDOM = YES | 94 | WEAKRANDOM = YES |
117 | 95 | ||
@@ -121,16 +99,21 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
121 | 99 | ||
122 | [PATHS] | 100 | [PATHS] |
123 | DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf | 101 | DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf |
124 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 102 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ |
125 | 103 | ||
104 | [fs] | ||
105 | AUTOSTART = NO | ||
126 | 106 | ||
127 | [dht] | 107 | [datastore] |
128 | AUTOSTART = NO | 108 | AUTOSTART = NO |
129 | 109 | ||
130 | [mesh] | 110 | [core] |
131 | AUTOSTART = NO | 111 | AUTOSTART = NO |
132 | 112 | ||
133 | 113 | ||
114 | [dht] | ||
115 | AUTOSTART = NO | ||
116 | |||
134 | [dns] | 117 | [dns] |
135 | AUTOSTART = NO | 118 | AUTOSTART = NO |
136 | 119 | ||
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf index b8e0906e2..1bc6a530d 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_tcp_nat_peer2.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-tcp] | 1 | [transport-tcp] |
2 | PORT = 23000 | 2 | PORT = 12030 |
3 | USE_LOCALADDR = YES | 3 | USE_LOCALADDR = YES |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
@@ -10,15 +10,6 @@ ENABLE_NAT_CLIENT = YES | |||
10 | EXTERNAL_ADDRESS = 127.0.0.1 | 10 | EXTERNAL_ADDRESS = 127.0.0.1 |
11 | INTERNAL_ADDRESS = 127.0.0.1 | 11 | INTERNAL_ADDRESS = 127.0.0.1 |
12 | 12 | ||
13 | [core] | ||
14 | AUTOSTART = NO | ||
15 | |||
16 | [fs] | ||
17 | AUTOSTART = NO | ||
18 | |||
19 | [datastore] | ||
20 | AUTOSTART = NO | ||
21 | |||
22 | [hostlist] | 13 | [hostlist] |
23 | HTTP-PROXY = | 14 | HTTP-PROXY = |
24 | SERVERS = http://gnunet.org:8080/ | 15 | SERVERS = http://gnunet.org:8080/ |
@@ -63,7 +54,7 @@ BINARY = gnunet-service-peerinfo | |||
63 | CONFIG = $DEFAULTCONFIG | 54 | CONFIG = $DEFAULTCONFIG |
64 | HOME = $SERVICEHOME | 55 | HOME = $SERVICEHOME |
65 | HOSTNAME = localhost | 56 | HOSTNAME = localhost |
66 | PORT = 22369 | 57 | PORT = 12031 |
67 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 58 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
68 | 59 | ||
69 | [resolver] | 60 | [resolver] |
@@ -73,7 +64,7 @@ BINARY = gnunet-service-resolver | |||
73 | CONFIG = $DEFAULTCONFIG | 64 | CONFIG = $DEFAULTCONFIG |
74 | HOME = $SERVICEHOME | 65 | HOME = $SERVICEHOME |
75 | HOSTNAME = localhost | 66 | HOSTNAME = localhost |
76 | PORT = 22364 | 67 | PORT = 12032 |
77 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 68 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
78 | 69 | ||
79 | [statistics] | 70 | [statistics] |
@@ -84,7 +75,7 @@ BINARY = gnunet-service-statistics | |||
84 | CONFIG = $DEFAULTCONFIG | 75 | CONFIG = $DEFAULTCONFIG |
85 | HOME = $SERVICEHOME | 76 | HOME = $SERVICEHOME |
86 | HOSTNAME = localhost | 77 | HOSTNAME = localhost |
87 | PORT = 22367 | 78 | PORT = 12033 |
88 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 79 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
89 | 80 | ||
90 | [arm] | 81 | [arm] |
@@ -95,7 +86,7 @@ BINARY = gnunet-service-arm | |||
95 | CONFIG = $DEFAULTCONFIG | 86 | CONFIG = $DEFAULTCONFIG |
96 | HOME = $SERVICEHOME | 87 | HOME = $SERVICEHOME |
97 | HOSTNAME = localhost | 88 | HOSTNAME = localhost |
98 | PORT = 22366 | 89 | PORT = 12034 |
99 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 90 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
100 | 91 | ||
101 | [TESTING] | 92 | [TESTING] |
@@ -107,8 +98,16 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
107 | 98 | ||
108 | [PATHS] | 99 | [PATHS] |
109 | DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf | 100 | DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf |
110 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 101 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/ |
111 | 102 | ||
103 | [core] | ||
104 | AUTOSTART = NO | ||
105 | |||
106 | [fs] | ||
107 | AUTOSTART = NO | ||
108 | |||
109 | [datastore] | ||
110 | AUTOSTART = NO | ||
112 | 111 | ||
113 | [dht] | 112 | [dht] |
114 | AUTOSTART = NO | 113 | AUTOSTART = NO |
@@ -116,7 +115,6 @@ AUTOSTART = NO | |||
116 | [mesh] | 115 | [mesh] |
117 | AUTOSTART = NO | 116 | AUTOSTART = NO |
118 | 117 | ||
119 | |||
120 | [dns] | 118 | [dns] |
121 | AUTOSTART = NO | 119 | AUTOSTART = NO |
122 | 120 | ||
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index c4a27ea98..f677f9001 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | [transport-tcp] | 1 | [transport-tcp] |
2 | USE_LOCALADDR = YES | 2 | USE_LOCALADDR = YES |
3 | PORT = 12368 | 3 | PORT = 12000 |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
6 | DISABLEV6 = YES | 6 | DISABLEV6 = YES |
@@ -11,15 +11,6 @@ ENABLE_UPNP = NO | |||
11 | INTERNAL_ADDRESS = 127.0.0.1 | 11 | INTERNAL_ADDRESS = 127.0.0.1 |
12 | EXTERNAL_ADDRESS = 127.0.0.1 | 12 | EXTERNAL_ADDRESS = 127.0.0.1 |
13 | 13 | ||
14 | [fs] | ||
15 | AUTOSTART = NO | ||
16 | |||
17 | [datastore] | ||
18 | AUTOSTART = NO | ||
19 | |||
20 | [core] | ||
21 | AUTOSTART = NO | ||
22 | |||
23 | [hostlist] | 14 | [hostlist] |
24 | HTTP-PROXY = | 15 | HTTP-PROXY = |
25 | SERVERS = http://gnunet.org:8080/ | 16 | SERVERS = http://gnunet.org:8080/ |
@@ -52,7 +43,7 @@ BINARY = gnunet-service-transport | |||
52 | CONFIG = $DEFAULTCONFIG | 43 | CONFIG = $DEFAULTCONFIG |
53 | HOME = $SERVICEHOME | 44 | HOME = $SERVICEHOME |
54 | HOSTNAME = localhost | 45 | HOSTNAME = localhost |
55 | PORT = 12365 | 46 | PORT = 12001 |
56 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 47 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
57 | 48 | ||
58 | [peerinfo] | 49 | [peerinfo] |
@@ -64,7 +55,7 @@ BINARY = gnunet-service-peerinfo | |||
64 | CONFIG = $DEFAULTCONFIG | 55 | CONFIG = $DEFAULTCONFIG |
65 | HOME = $SERVICEHOME | 56 | HOME = $SERVICEHOME |
66 | HOSTNAME = localhost | 57 | HOSTNAME = localhost |
67 | PORT = 12369 | 58 | PORT = 12002 |
68 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 59 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
69 | 60 | ||
70 | [resolver] | 61 | [resolver] |
@@ -74,7 +65,7 @@ BINARY = gnunet-service-resolver | |||
74 | CONFIG = $DEFAULTCONFIG | 65 | CONFIG = $DEFAULTCONFIG |
75 | HOME = $SERVICEHOME | 66 | HOME = $SERVICEHOME |
76 | HOSTNAME = localhost | 67 | HOSTNAME = localhost |
77 | PORT = 1236 | 68 | PORT = 12003 |
78 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 69 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
79 | 70 | ||
80 | [statistics] | 71 | [statistics] |
@@ -85,7 +76,7 @@ BINARY = gnunet-service-statistics | |||
85 | CONFIG = $DEFAULTCONFIG | 76 | CONFIG = $DEFAULTCONFIG |
86 | HOME = $SERVICEHOME | 77 | HOME = $SERVICEHOME |
87 | HOSTNAME = localhost | 78 | HOSTNAME = localhost |
88 | PORT = 12367 | 79 | PORT = 12004 |
89 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 80 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
90 | 81 | ||
91 | [arm] | 82 | [arm] |
@@ -96,7 +87,7 @@ BINARY = gnunet-service-arm | |||
96 | CONFIG = $DEFAULTCONFIG | 87 | CONFIG = $DEFAULTCONFIG |
97 | HOME = $SERVICEHOME | 88 | HOME = $SERVICEHOME |
98 | HOSTNAME = localhost | 89 | HOSTNAME = localhost |
99 | PORT = 12366 | 90 | PORT = 12005 |
100 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 91 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
101 | 92 | ||
102 | [TESTING] | 93 | [TESTING] |
@@ -107,8 +98,16 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
107 | 98 | ||
108 | [PATHS] | 99 | [PATHS] |
109 | #DEFAULTCONFIG = test_transport_api_tcp_peer1.conf | 100 | #DEFAULTCONFIG = test_transport_api_tcp_peer1.conf |
110 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 101 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
111 | 102 | ||
103 | [fs] | ||
104 | AUTOSTART = NO | ||
105 | |||
106 | [datastore] | ||
107 | AUTOSTART = NO | ||
108 | |||
109 | [core] | ||
110 | AUTOSTART = NO | ||
112 | 111 | ||
113 | [dht] | 112 | [dht] |
114 | AUTOSTART = NO | 113 | AUTOSTART = NO |
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 000e4c6fd..a0074f155 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf | |||
@@ -11,15 +11,6 @@ ENABLE_UPNP = NO | |||
11 | EXTERNAL_ADDRESS = 127.0.0.1 | 11 | EXTERNAL_ADDRESS = 127.0.0.1 |
12 | INTERNAL_ADDRESS = 127.0.0.1 | 12 | INTERNAL_ADDRESS = 127.0.0.1 |
13 | 13 | ||
14 | [core] | ||
15 | AUTOSTART = NO | ||
16 | |||
17 | [fs] | ||
18 | AUTOSTART = NO | ||
19 | |||
20 | [datastore] | ||
21 | AUTOSTART = NO | ||
22 | |||
23 | [hostlist] | 14 | [hostlist] |
24 | HTTP-PROXY = | 15 | HTTP-PROXY = |
25 | SERVERS = http://gnunet.org:8080/ | 16 | SERVERS = http://gnunet.org:8080/ |
@@ -50,7 +41,7 @@ BINARY = gnunet-service-transport | |||
50 | CONFIG = $DEFAULTCONFIG | 41 | CONFIG = $DEFAULTCONFIG |
51 | HOME = $SERVICEHOME | 42 | HOME = $SERVICEHOME |
52 | HOSTNAME = localhost | 43 | HOSTNAME = localhost |
53 | PORT = 22365 | 44 | PORT = 12010 |
54 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 45 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
55 | #PREFIX = valgrind --tool=callgrind | 46 | #PREFIX = valgrind --tool=callgrind |
56 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | 47 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args |
@@ -65,7 +56,7 @@ BINARY = gnunet-service-peerinfo | |||
65 | CONFIG = $DEFAULTCONFIG | 56 | CONFIG = $DEFAULTCONFIG |
66 | HOME = $SERVICEHOME | 57 | HOME = $SERVICEHOME |
67 | HOSTNAME = localhost | 58 | HOSTNAME = localhost |
68 | PORT = 22369 | 59 | PORT = 12011 |
69 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 60 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
70 | 61 | ||
71 | [resolver] | 62 | [resolver] |
@@ -75,7 +66,7 @@ BINARY = gnunet-service-resolver | |||
75 | CONFIG = $DEFAULTCONFIG | 66 | CONFIG = $DEFAULTCONFIG |
76 | HOME = $SERVICEHOME | 67 | HOME = $SERVICEHOME |
77 | HOSTNAME = localhost | 68 | HOSTNAME = localhost |
78 | PORT = 22364 | 69 | PORT = 12012 |
79 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 70 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
80 | 71 | ||
81 | [statistics] | 72 | [statistics] |
@@ -86,7 +77,7 @@ BINARY = gnunet-service-statistics | |||
86 | CONFIG = $DEFAULTCONFIG | 77 | CONFIG = $DEFAULTCONFIG |
87 | HOME = $SERVICEHOME | 78 | HOME = $SERVICEHOME |
88 | HOSTNAME = localhost | 79 | HOSTNAME = localhost |
89 | PORT = 22367 | 80 | PORT = 12013 |
90 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 81 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
91 | 82 | ||
92 | [arm] | 83 | [arm] |
@@ -97,7 +88,7 @@ BINARY = gnunet-service-arm | |||
97 | CONFIG = $DEFAULTCONFIG | 88 | CONFIG = $DEFAULTCONFIG |
98 | HOME = $SERVICEHOME | 89 | HOME = $SERVICEHOME |
99 | HOSTNAME = localhost | 90 | HOSTNAME = localhost |
100 | PORT = 22366 | 91 | PORT = 12014 |
101 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 92 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
102 | 93 | ||
103 | [TESTING] | 94 | [TESTING] |
@@ -108,8 +99,16 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
108 | 99 | ||
109 | [PATHS] | 100 | [PATHS] |
110 | #DEFAULTCONFIG = test_transport_api_tcp_peer2.conf | 101 | #DEFAULTCONFIG = test_transport_api_tcp_peer2.conf |
111 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 102 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
112 | 103 | ||
104 | [core] | ||
105 | AUTOSTART = NO | ||
106 | |||
107 | [fs] | ||
108 | AUTOSTART = NO | ||
109 | |||
110 | [datastore] | ||
111 | AUTOSTART = NO | ||
113 | 112 | ||
114 | [dht] | 113 | [dht] |
115 | AUTOSTART = NO | 114 | AUTOSTART = NO |
@@ -117,7 +116,6 @@ AUTOSTART = NO | |||
117 | [mesh] | 116 | [mesh] |
118 | AUTOSTART = NO | 117 | AUTOSTART = NO |
119 | 118 | ||
120 | |||
121 | [dns] | 119 | [dns] |
122 | AUTOSTART = NO | 120 | AUTOSTART = NO |
123 | 121 | ||
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index 0dead9a63..12e1bafb5 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-udp] | 1 | [transport-udp] |
2 | PORT = 12368 | 2 | PORT = 12060 |
3 | USE_LOCALADDR = YES | 3 | USE_LOCALADDR = YES |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
@@ -10,15 +10,6 @@ ONLY_NAT_ADDRESSES = YES | |||
10 | INTERNAL_ADDRESS = 127.0.0.1 | 10 | INTERNAL_ADDRESS = 127.0.0.1 |
11 | EXTERNAL_ADDRESS = 127.0.0.1 | 11 | EXTERNAL_ADDRESS = 127.0.0.1 |
12 | 12 | ||
13 | [fs] | ||
14 | AUTOSTART = NO | ||
15 | |||
16 | [datastore-sqlite] | ||
17 | FILENAME = $SERVICEHOME/datastore/sqlite.db | ||
18 | |||
19 | [datastore] | ||
20 | AUTOSTART = NO | ||
21 | |||
22 | [hostlist] | 13 | [hostlist] |
23 | HTTP-PROXY = | 14 | HTTP-PROXY = |
24 | SERVERS = http://gnunet.org:8080/ | 15 | SERVERS = http://gnunet.org:8080/ |
@@ -38,21 +29,17 @@ AUTOCONNECT = YES | |||
38 | FRIENDS-ONLY = NO | 29 | FRIENDS-ONLY = NO |
39 | MINIMUM-FRIENDS = 0 | 30 | MINIMUM-FRIENDS = 0 |
40 | 31 | ||
41 | [core] | ||
42 | AUTOSTART = NO | ||
43 | |||
44 | [transport] | 32 | [transport] |
45 | PLUGINS = udp | 33 | PLUGINS = udp |
46 | DEBUG = NO | 34 | DEBUG = NO |
47 | ACCEPT_FROM6 = ::1; | 35 | ACCEPT_FROM6 = ::1; |
48 | ACCEPT_FROM = 127.0.0.1; | 36 | ACCEPT_FROM = 127.0.0.1; |
49 | NEIGHBOUR_LIMIT = 50 | 37 | NEIGHBOUR_LIMIT = 50 |
50 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport | ||
51 | BINARY = gnunet-service-transport | 38 | BINARY = gnunet-service-transport |
52 | CONFIG = $DEFAULTCONFIG | 39 | CONFIG = $DEFAULTCONFIG |
53 | HOME = $SERVICEHOME | 40 | HOME = $SERVICEHOME |
54 | HOSTNAME = localhost | 41 | HOSTNAME = localhost |
55 | PORT = 12365 | 42 | PORT = 12061 |
56 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 43 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
57 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log | 44 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log |
58 | #PREFIX = xterm -e xterm -T transport -e gdb --args | 45 | #PREFIX = xterm -e xterm -T transport -e gdb --args |
@@ -66,7 +53,7 @@ BINARY = gnunet-service-peerinfo | |||
66 | CONFIG = $DEFAULTCONFIG | 53 | CONFIG = $DEFAULTCONFIG |
67 | HOME = $SERVICEHOME | 54 | HOME = $SERVICEHOME |
68 | HOSTNAME = localhost | 55 | HOSTNAME = localhost |
69 | PORT = 12369 | 56 | PORT = 12062 |
70 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 57 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
71 | 58 | ||
72 | [resolver] | 59 | [resolver] |
@@ -76,7 +63,7 @@ BINARY = gnunet-service-resolver | |||
76 | CONFIG = $DEFAULTCONFIG | 63 | CONFIG = $DEFAULTCONFIG |
77 | HOME = $SERVICEHOME | 64 | HOME = $SERVICEHOME |
78 | HOSTNAME = localhost | 65 | HOSTNAME = localhost |
79 | PORT = 12364 | 66 | PORT = 12063 |
80 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 67 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
81 | 68 | ||
82 | [statistics] | 69 | [statistics] |
@@ -86,7 +73,7 @@ BINARY = gnunet-service-statistics | |||
86 | CONFIG = $DEFAULTCONFIG | 73 | CONFIG = $DEFAULTCONFIG |
87 | HOME = $SERVICEHOME | 74 | HOME = $SERVICEHOME |
88 | HOSTNAME = localhost | 75 | HOSTNAME = localhost |
89 | PORT = 12367 | 76 | PORT = 12064 |
90 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 77 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
91 | 78 | ||
92 | [arm] | 79 | [arm] |
@@ -97,13 +84,9 @@ BINARY = gnunet-service-arm | |||
97 | CONFIG = $DEFAULTCONFIG | 84 | CONFIG = $DEFAULTCONFIG |
98 | HOME = $SERVICEHOME | 85 | HOME = $SERVICEHOME |
99 | HOSTNAME = localhost | 86 | HOSTNAME = localhost |
100 | PORT = 12366 | 87 | PORT = 12065 |
101 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 88 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
102 | 89 | ||
103 | [transport-tcp] | ||
104 | TIMEOUT = 300000 | ||
105 | PORT = 12368 | ||
106 | |||
107 | [TESTING] | 90 | [TESTING] |
108 | WEAKRANDOM = YES | 91 | WEAKRANDOM = YES |
109 | 92 | ||
@@ -112,13 +95,24 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
112 | 95 | ||
113 | [PATHS] | 96 | [PATHS] |
114 | DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf | 97 | DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf |
115 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 98 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ |
116 | 99 | ||
117 | [mesh] | 100 | [mesh] |
118 | AUTOSTART = NO | 101 | AUTOSTART = NO |
119 | 102 | ||
103 | [fs] | ||
104 | AUTOSTART = NO | ||
105 | |||
106 | [datastore-sqlite] | ||
107 | FILENAME = $SERVICEHOME/datastore/sqlite.db | ||
108 | |||
109 | [datastore] | ||
110 | AUTOSTART = NO | ||
120 | 111 | ||
121 | [dns] | 112 | [dns] |
122 | AUTOSTART = NO | 113 | AUTOSTART = NO |
123 | 114 | ||
115 | [core] | ||
116 | AUTOSTART = NO | ||
117 | |||
124 | 118 | ||
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index c291e9e5a..3d2063854 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-udp] | 1 | [transport-udp] |
2 | PORT = 22368 | 2 | PORT = 12070 |
3 | USE_LOCALADDR = YES | 3 | USE_LOCALADDR = YES |
4 | 4 | ||
5 | [nat] | 5 | [nat] |
@@ -9,12 +9,6 @@ ALLOW_NAT = YES | |||
9 | EXTERNAL_ADDRESS = 127.0.0.1 | 9 | EXTERNAL_ADDRESS = 127.0.0.1 |
10 | INTERNAL_ADDRESS = 127.0.0.1 | 10 | INTERNAL_ADDRESS = 127.0.0.1 |
11 | 11 | ||
12 | [fs] | ||
13 | AUTOSTART = NO | ||
14 | |||
15 | [datastore] | ||
16 | AUTOSTART = NO | ||
17 | |||
18 | [hostlist] | 12 | [hostlist] |
19 | HTTP-PROXY = | 13 | HTTP-PROXY = |
20 | SERVERS = http://gnunet.org:8080/ | 14 | SERVERS = http://gnunet.org:8080/ |
@@ -45,11 +39,10 @@ ACCEPT_FROM6 = ::1; | |||
45 | ACCEPT_FROM = 127.0.0.1; | 39 | ACCEPT_FROM = 127.0.0.1; |
46 | NEIGHBOUR_LIMIT = 50 | 40 | NEIGHBOUR_LIMIT = 50 |
47 | BINARY = gnunet-service-transport | 41 | BINARY = gnunet-service-transport |
48 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport | ||
49 | CONFIG = $DEFAULTCONFIG | 42 | CONFIG = $DEFAULTCONFIG |
50 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
51 | HOSTNAME = localhost | 44 | HOSTNAME = localhost |
52 | PORT = 22365 | 45 | PORT = 12071 |
53 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 46 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
54 | #PREFIX = xterm -e xterm -T transport -e gdb --args | 47 | #PREFIX = xterm -e xterm -T transport -e gdb --args |
55 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log | 48 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log |
@@ -63,7 +56,7 @@ BINARY = gnunet-service-peerinfo | |||
63 | CONFIG = $DEFAULTCONFIG | 56 | CONFIG = $DEFAULTCONFIG |
64 | HOME = $SERVICEHOME | 57 | HOME = $SERVICEHOME |
65 | HOSTNAME = localhost | 58 | HOSTNAME = localhost |
66 | PORT = 22369 | 59 | PORT = 12072 |
67 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 60 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
68 | 61 | ||
69 | [resolver] | 62 | [resolver] |
@@ -73,7 +66,7 @@ BINARY = gnunet-service-resolver | |||
73 | CONFIG = $DEFAULTCONFIG | 66 | CONFIG = $DEFAULTCONFIG |
74 | HOME = $SERVICEHOME | 67 | HOME = $SERVICEHOME |
75 | HOSTNAME = localhost | 68 | HOSTNAME = localhost |
76 | PORT = 22364 | 69 | PORT = 12073 |
77 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 70 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
78 | 71 | ||
79 | [statistics] | 72 | [statistics] |
@@ -83,7 +76,7 @@ BINARY = gnunet-service-statistics | |||
83 | CONFIG = $DEFAULTCONFIG | 76 | CONFIG = $DEFAULTCONFIG |
84 | HOME = $SERVICEHOME | 77 | HOME = $SERVICEHOME |
85 | HOSTNAME = localhost | 78 | HOSTNAME = localhost |
86 | PORT = 22367 | 79 | PORT = 12074 |
87 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 80 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
88 | 81 | ||
89 | [arm] | 82 | [arm] |
@@ -94,25 +87,10 @@ BINARY = gnunet-service-arm | |||
94 | CONFIG = $DEFAULTCONFIG | 87 | CONFIG = $DEFAULTCONFIG |
95 | HOME = $SERVICEHOME | 88 | HOME = $SERVICEHOME |
96 | HOSTNAME = localhost | 89 | HOSTNAME = localhost |
97 | PORT = 22366 | 90 | PORT = 12075 |
98 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 91 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
99 | 92 | ||
100 | [transport-tcp] | 93 | [TESTING] |
101 | TIMEOUT = 300000 | ||
102 | PORT = 22368 | ||
103 | |||
104 | [TESTING][mesh] | ||
105 | AUTOSTART = YES | ||
106 | PORT = 10512 | ||
107 | HOSTNAME = localhost | ||
108 | HOME = $SERVICEHOME | ||
109 | CONFIG = $DEFAULTCONFIG | ||
110 | BINARY = gnunet-service-mesh | ||
111 | ACCEPT_FROM = 127.0.0.1; | ||
112 | ACCEPT_FROM6 = ::1; | ||
113 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
114 | UNIX_MATCH_UID = YES | ||
115 | UNIX_MATCH_GID = YES | ||
116 | WEAKRANDOM = YES | 94 | WEAKRANDOM = YES |
117 | 95 | ||
118 | [gnunetd] | 96 | [gnunetd] |
@@ -120,8 +98,13 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
120 | 98 | ||
121 | [PATHS] | 99 | [PATHS] |
122 | DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf | 100 | DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf |
123 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 101 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ |
124 | 102 | ||
103 | [fs] | ||
104 | AUTOSTART = NO | ||
105 | |||
106 | [datastore] | ||
107 | AUTOSTART = NO | ||
125 | 108 | ||
126 | [dht] | 109 | [dht] |
127 | AUTOSTART = NO | 110 | AUTOSTART = NO |
@@ -129,7 +112,6 @@ AUTOSTART = NO | |||
129 | [mesh] | 112 | [mesh] |
130 | AUTOSTART = NO | 113 | AUTOSTART = NO |
131 | 114 | ||
132 | |||
133 | [dns] | 115 | [dns] |
134 | AUTOSTART = NO | 116 | AUTOSTART = NO |
135 | 117 | ||
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index dab597fbd..40986e0df 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-udp] | 1 | [transport-udp] |
2 | PORT = 12368 | 2 | PORT = 12040 |
3 | USE_LOCALADDR = YES | 3 | USE_LOCALADDR = YES |
4 | 4 | ||
5 | [fs] | 5 | [fs] |
@@ -47,7 +47,7 @@ BINARY = gnunet-service-transport | |||
47 | CONFIG = $DEFAULTCONFIG | 47 | CONFIG = $DEFAULTCONFIG |
48 | HOME = $SERVICEHOME | 48 | HOME = $SERVICEHOME |
49 | HOSTNAME = localhost | 49 | HOSTNAME = localhost |
50 | PORT = 12365 | 50 | PORT = 12041 |
51 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 51 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
52 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log | 52 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log |
53 | #PREFIX = xterm -e xterm -T transport -e gdb --args | 53 | #PREFIX = xterm -e xterm -T transport -e gdb --args |
@@ -61,7 +61,7 @@ BINARY = gnunet-service-peerinfo | |||
61 | CONFIG = $DEFAULTCONFIG | 61 | CONFIG = $DEFAULTCONFIG |
62 | HOME = $SERVICEHOME | 62 | HOME = $SERVICEHOME |
63 | HOSTNAME = localhost | 63 | HOSTNAME = localhost |
64 | PORT = 12369 | 64 | PORT = 12042 |
65 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 65 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
66 | 66 | ||
67 | [resolver] | 67 | [resolver] |
@@ -71,7 +71,7 @@ BINARY = gnunet-service-resolver | |||
71 | CONFIG = $DEFAULTCONFIG | 71 | CONFIG = $DEFAULTCONFIG |
72 | HOME = $SERVICEHOME | 72 | HOME = $SERVICEHOME |
73 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
74 | PORT = 12364 | 74 | PORT = 12043 |
75 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 75 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
76 | 76 | ||
77 | [statistics] | 77 | [statistics] |
@@ -81,7 +81,7 @@ BINARY = gnunet-service-statistics | |||
81 | CONFIG = $DEFAULTCONFIG | 81 | CONFIG = $DEFAULTCONFIG |
82 | HOME = $SERVICEHOME | 82 | HOME = $SERVICEHOME |
83 | HOSTNAME = localhost | 83 | HOSTNAME = localhost |
84 | PORT = 12367 | 84 | PORT = 12044 |
85 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 85 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
86 | 86 | ||
87 | [arm] | 87 | [arm] |
@@ -92,13 +92,9 @@ BINARY = gnunet-service-arm | |||
92 | CONFIG = $DEFAULTCONFIG | 92 | CONFIG = $DEFAULTCONFIG |
93 | HOME = $SERVICEHOME | 93 | HOME = $SERVICEHOME |
94 | HOSTNAME = localhost | 94 | HOSTNAME = localhost |
95 | PORT = 12366 | 95 | PORT = 12045 |
96 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 96 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
97 | 97 | ||
98 | [transport-tcp] | ||
99 | TIMEOUT = 300000 | ||
100 | PORT = 12368 | ||
101 | |||
102 | [TESTING] | 98 | [TESTING] |
103 | WEAKRANDOM = YES | 99 | WEAKRANDOM = YES |
104 | 100 | ||
@@ -107,7 +103,7 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
107 | 103 | ||
108 | [PATHS] | 104 | [PATHS] |
109 | DEFAULTCONFIG = test_transport_api_udp_peer1.conf | 105 | DEFAULTCONFIG = test_transport_api_udp_peer1.conf |
110 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 106 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
111 | 107 | ||
112 | 108 | ||
113 | [dht] | 109 | [dht] |
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index 2bdeaa6fb..62e21f866 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf | |||
@@ -1,20 +1,11 @@ | |||
1 | [transport-udp] | 1 | [transport-udp] |
2 | PORT = 22368 | 2 | PORT = 12050 |
3 | USE_LOCALADDR = YES | 3 | USE_LOCALADDR = YES |
4 | 4 | ||
5 | [fs] | ||
6 | AUTOSTART = NO | ||
7 | |||
8 | [nat] | 5 | [nat] |
9 | # Are we behind NAT? | 6 | # Are we behind NAT? |
10 | BEHIND_NAT = NO | 7 | BEHIND_NAT = NO |
11 | 8 | ||
12 | [datastore] | ||
13 | AUTOSTART = NO | ||
14 | |||
15 | [core] | ||
16 | AUTOSTART = NO | ||
17 | |||
18 | [hostlist] | 9 | [hostlist] |
19 | HTTP-PROXY = | 10 | HTTP-PROXY = |
20 | SERVERS = http://gnunet.org:8080/ | 11 | SERVERS = http://gnunet.org:8080/ |
@@ -45,7 +36,7 @@ BINARY = gnunet-service-transport | |||
45 | CONFIG = $DEFAULTCONFIG | 36 | CONFIG = $DEFAULTCONFIG |
46 | HOME = $SERVICEHOME | 37 | HOME = $SERVICEHOME |
47 | HOSTNAME = localhost | 38 | HOSTNAME = localhost |
48 | PORT = 22365 | 39 | PORT = 12051 |
49 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 40 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
50 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log | 41 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log |
51 | 42 | ||
@@ -58,7 +49,7 @@ BINARY = gnunet-service-peerinfo | |||
58 | CONFIG = $DEFAULTCONFIG | 49 | CONFIG = $DEFAULTCONFIG |
59 | HOME = $SERVICEHOME | 50 | HOME = $SERVICEHOME |
60 | HOSTNAME = localhost | 51 | HOSTNAME = localhost |
61 | PORT = 22369 | 52 | PORT = 12052 |
62 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 53 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
63 | 54 | ||
64 | [resolver] | 55 | [resolver] |
@@ -68,7 +59,7 @@ BINARY = gnunet-service-resolver | |||
68 | CONFIG = $DEFAULTCONFIG | 59 | CONFIG = $DEFAULTCONFIG |
69 | HOME = $SERVICEHOME | 60 | HOME = $SERVICEHOME |
70 | HOSTNAME = localhost | 61 | HOSTNAME = localhost |
71 | PORT = 22364 | 62 | PORT = 12053 |
72 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 63 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
73 | 64 | ||
74 | [statistics] | 65 | [statistics] |
@@ -78,7 +69,7 @@ BINARY = gnunet-service-statistics | |||
78 | CONFIG = $DEFAULTCONFIG | 69 | CONFIG = $DEFAULTCONFIG |
79 | HOME = $SERVICEHOME | 70 | HOME = $SERVICEHOME |
80 | HOSTNAME = localhost | 71 | HOSTNAME = localhost |
81 | PORT = 22367 | 72 | PORT = 12054 |
82 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 73 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
83 | 74 | ||
84 | [arm] | 75 | [arm] |
@@ -89,13 +80,9 @@ BINARY = gnunet-service-arm | |||
89 | CONFIG = $DEFAULTCONFIG | 80 | CONFIG = $DEFAULTCONFIG |
90 | HOME = $SERVICEHOME | 81 | HOME = $SERVICEHOME |
91 | HOSTNAME = localhost | 82 | HOSTNAME = localhost |
92 | PORT = 22366 | 83 | PORT = 12055 |
93 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 84 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
94 | 85 | ||
95 | [transport-tcp] | ||
96 | TIMEOUT = 300000 | ||
97 | PORT = 22368 | ||
98 | |||
99 | [TESTING] | 86 | [TESTING] |
100 | WEAKRANDOM = YES | 87 | WEAKRANDOM = YES |
101 | 88 | ||
@@ -104,19 +91,17 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
104 | 91 | ||
105 | [PATHS] | 92 | [PATHS] |
106 | DEFAULTCONFIG = test_transport_api_udp_peer2.conf | 93 | DEFAULTCONFIG = test_transport_api_udp_peer2.conf |
107 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 94 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
108 | [mesh] | 95 | |
109 | AUTOSTART = YES | 96 | |
110 | PORT = 10512 | 97 | [fs] |
111 | HOSTNAME = localhost | 98 | AUTOSTART = NO |
112 | HOME = $SERVICEHOME | 99 | |
113 | CONFIG = $DEFAULTCONFIG | 100 | [datastore] |
114 | BINARY = gnunet-service-mesh | 101 | AUTOSTART = NO |
115 | ACCEPT_FROM = 127.0.0.1; | 102 | |
116 | ACCEPT_FROM6 = ::1; | 103 | [core] |
117 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | 104 | AUTOSTART = NO |
118 | UNIX_MATCH_UID = YES | ||
119 | UNIX_MATCH_GID = YES | ||
120 | 105 | ||
121 | [dht] | 106 | [dht] |
122 | AUTOSTART = NO | 107 | AUTOSTART = NO |
@@ -124,7 +109,6 @@ AUTOSTART = NO | |||
124 | [mesh] | 109 | [mesh] |
125 | AUTOSTART = NO | 110 | AUTOSTART = NO |
126 | 111 | ||
127 | |||
128 | [dns] | 112 | [dns] |
129 | AUTOSTART = NO | 113 | AUTOSTART = NO |
130 | 114 | ||
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf index 04d198d62..b896bafa5 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-unix] | 1 | [transport-unix] |
2 | PORT = 12368 | 2 | PORT = 12120 |
3 | 3 | ||
4 | [fs] | 4 | [fs] |
5 | AUTOSTART = NO | 5 | AUTOSTART = NO |
@@ -42,7 +42,7 @@ BINARY = gnunet-service-transport | |||
42 | CONFIG = $DEFAULTCONFIG | 42 | CONFIG = $DEFAULTCONFIG |
43 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
44 | HOSTNAME = localhost | 44 | HOSTNAME = localhost |
45 | PORT = 12365 | 45 | PORT = 12121 |
46 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 46 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
47 | 47 | ||
48 | 48 | ||
@@ -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 = 12369 | 58 | PORT = 12122 |
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 = 12364 | 68 | PORT = 12123 |
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 = 12367 | 78 | PORT = 12124 |
79 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 79 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
80 | 80 | ||
81 | [arm] | 81 | [arm] |
@@ -86,13 +86,9 @@ BINARY = gnunet-service-arm | |||
86 | CONFIG = $DEFAULTCONFIG | 86 | CONFIG = $DEFAULTCONFIG |
87 | HOME = $SERVICEHOME | 87 | HOME = $SERVICEHOME |
88 | HOSTNAME = localhost | 88 | HOSTNAME = localhost |
89 | PORT = 12366 | 89 | PORT = 12125 |
90 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 90 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
91 | 91 | ||
92 | [transport-tcp] | ||
93 | TIMEOUT = 300000 | ||
94 | PORT = 12368 | ||
95 | |||
96 | [TESTING] | 92 | [TESTING] |
97 | WEAKRANDOM = YES | 93 | WEAKRANDOM = YES |
98 | 94 | ||
@@ -101,7 +97,7 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
101 | 97 | ||
102 | [PATHS] | 98 | [PATHS] |
103 | DEFAULTCONFIG = test_transport_api_unix_peer1.conf | 99 | DEFAULTCONFIG = test_transport_api_unix_peer1.conf |
104 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 100 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ |
105 | 101 | ||
106 | [dht] | 102 | [dht] |
107 | AUTOSTART = NO | 103 | AUTOSTART = NO |
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index 50623fd93..fd5f5fa47 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [transport-unix] | 1 | [transport-unix] |
2 | PORT = 22368 | 2 | PORT = 12130 |
3 | 3 | ||
4 | [fs] | 4 | [fs] |
5 | AUTOSTART = NO | 5 | AUTOSTART = NO |
@@ -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 = 22365 | 43 | PORT = 12131 |
44 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 44 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
45 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log | 45 | #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log |
46 | 46 | ||
@@ -53,7 +53,7 @@ BINARY = gnunet-service-peerinfo | |||
53 | CONFIG = $DEFAULTCONFIG | 53 | CONFIG = $DEFAULTCONFIG |
54 | HOME = $SERVICEHOME | 54 | HOME = $SERVICEHOME |
55 | HOSTNAME = localhost | 55 | HOSTNAME = localhost |
56 | PORT = 22369 | 56 | PORT = 12132 |
57 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 57 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
58 | 58 | ||
59 | [resolver] | 59 | [resolver] |
@@ -63,7 +63,7 @@ BINARY = gnunet-service-resolver | |||
63 | CONFIG = $DEFAULTCONFIG | 63 | CONFIG = $DEFAULTCONFIG |
64 | HOME = $SERVICEHOME | 64 | HOME = $SERVICEHOME |
65 | HOSTNAME = localhost | 65 | HOSTNAME = localhost |
66 | PORT = 22364 | 66 | PORT = 12133 |
67 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 67 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
68 | 68 | ||
69 | [statistics] | 69 | [statistics] |
@@ -73,7 +73,7 @@ BINARY = gnunet-service-statistics | |||
73 | CONFIG = $DEFAULTCONFIG | 73 | CONFIG = $DEFAULTCONFIG |
74 | HOME = $SERVICEHOME | 74 | HOME = $SERVICEHOME |
75 | HOSTNAME = localhost | 75 | HOSTNAME = localhost |
76 | PORT = 22367 | 76 | PORT = 12134 |
77 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 77 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
78 | 78 | ||
79 | [arm] | 79 | [arm] |
@@ -84,13 +84,9 @@ BINARY = gnunet-service-arm | |||
84 | CONFIG = $DEFAULTCONFIG | 84 | CONFIG = $DEFAULTCONFIG |
85 | HOME = $SERVICEHOME | 85 | HOME = $SERVICEHOME |
86 | HOSTNAME = localhost | 86 | HOSTNAME = localhost |
87 | PORT = 22366 | 87 | PORT = 12135 |
88 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 88 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
89 | 89 | ||
90 | [transport-tcp] | ||
91 | TIMEOUT = 300000 | ||
92 | PORT = 22368 | ||
93 | |||
94 | [TESTING] | 90 | [TESTING] |
95 | WEAKRANDOM = YES | 91 | WEAKRANDOM = YES |
96 | 92 | ||
@@ -99,7 +95,7 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
99 | 95 | ||
100 | [PATHS] | 96 | [PATHS] |
101 | DEFAULTCONFIG = test_transport_api_unix_peer2.conf | 97 | DEFAULTCONFIG = test_transport_api_unix_peer2.conf |
102 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 98 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ |
103 | 99 | ||
104 | 100 | ||
105 | [dht] | 101 | [dht] |