aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-08-30 15:48:50 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-08-30 15:48:50 +0000
commitde09ddc0ff815d51f92bd9870a18a64f9c11b0ce (patch)
tree1f3d1b05ad1075a28f205360471eeaad875c9deb /src/integration-tests
parentd7bf7a9efad76cbf74414477ed1761035ef007df (diff)
downloadgnunet-de09ddc0ff815d51f92bd9870a18a64f9c11b0ce.tar.gz
gnunet-de09ddc0ff815d51f92bd9870a18a64f9c11b0ce.zip
integration configuration cleanup
Diffstat (limited to 'src/integration-tests')
-rw-r--r--src/integration-tests/Makefile.am2
-rw-r--r--src/integration-tests/confs/c_bootstrap_server.conf361
-rw-r--r--src/integration-tests/confs/c_bootstrap_server_w_massif.conf348
-rw-r--r--src/integration-tests/confs/c_nat_client.conf364
-rw-r--r--src/integration-tests/confs/c_no_nat_client.conf376
-rw-r--r--src/integration-tests/confs/c_no_nat_client_2.conf359
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http.conf364
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http_2.conf359
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix.conf365
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix_2.conf361
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp.conf360
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp.conf357
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp_http.conf358
-rw-r--r--src/integration-tests/confs/test_defaults.conf93
14 files changed, 607 insertions, 3820 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index b5b7e9231..6c58f6fba 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -126,8 +126,8 @@ EXTRA_DIST = \
126 test_integration_restart.py.in \ 126 test_integration_restart.py.in \
127 test_integration_clique.py.in \ 127 test_integration_clique.py.in \
128 test_integration_clique_nat.py.in \ 128 test_integration_clique_nat.py.in \
129 confs/test_defaults.conf \
129 confs/c_bootstrap_server.conf \ 130 confs/c_bootstrap_server.conf \
130 confs/c_bootstrap_server_w_massif.conf \
131 confs/c_nat_client.conf \ 131 confs/c_nat_client.conf \
132 confs/c_no_nat_client_2.conf \ 132 confs/c_no_nat_client_2.conf \
133 confs/c_no_nat_client.conf \ 133 confs/c_no_nat_client.conf \
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index c84181409..385229708 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,359 +1,84 @@
1@INCLUDE@ confs/test_defaults.conf
2
3
1[PATHS] 4[PATHS]
2SERVICEHOME = /tmp/c_bootstrap_server/ 5SERVICEHOME = /tmp/c_bootstrap_server/
3 6
4[gnunetd]
5#HOSTKEY = $SERVICEHOME/.hostkey
6#HOSTKEY = hostkeys/0000-hostkey
7
8[PEER] 7[PEER]
9PRIVATE_KEY = hostkeys/c_bootstrap_server 8PRIVATE_KEY = hostkeys/c_bootstrap_server
10 9
11[vpn] 10[arm]
12AUTOSTART = YES 11UNIXPATH = /tmp/test-service-arm-4
13PORT = 0 12PORT = 20004
14HOSTNAME = localhost
15HOME = $SERVICEHOME
16BINARY = gnunet-service-dns
17ACCEPT_FROM = 127.0.0.1;
18ACCEPT_FROM6 = ::1;
19UNIXPATH = /tmp/gnunet-service-vpn-15
20 13
21[resolver] 14[dns]
22AUTOSTART = YES 15UNIXPATH = /tmp/test-service-dns-5
23PORT = 20017
24HOSTNAME = localhost
25HOME = $SERVICEHOME
26BINARY = gnunet-service-resolver
27ACCEPT_FROM = 127.0.0.1;
28ACCEPT_FROM6 = ::1;
29UNIXPATH = /tmp/test-service-resolver-14
30UNIX_MATCH_UID = NO
31UNIX_MATCH_GID = NO
32 16
33[mesh] 17[core]
34AUTOSTART = YES 18UNIXPATH = /tmp/test-service-core-3
35PORT = 20016 19PORT = 20003
36HOSTNAME = localhost
37HOME = $SERVICEHOME
38BINARY = gnunet-service-mesh
39ACCEPT_FROM = 127.0.0.1;
40ACCEPT_FROM6 = ::1;
41UNIXPATH = /tmp/test-service-mesh-13
42UNIX_MATCH_UID = YES
43UNIX_MATCH_GID = YES
44 20
45[nse] 21[ats]
46AUTOSTART = YES 22UNIXPATH = /tmp/test-service-ats-9
47PORT = 20015 23PORT = 20012
48HOSTNAME = localhost
49HOME = $SERVICEHOME
50BINARY = gnunet-service-nse
51ACCEPT_FROM = 127.0.0.1;
52ACCEPT_FROM6 = ::1;
53UNIXPATH = /tmp/test-service-nse-12
54UNIX_MATCH_UID = YES
55UNIX_MATCH_GID = YES
56PROOFFILE = $SERVICEHOME/.nse-proof
57HISTOGRAM = $SERVICEHOME/nse-history.log
58WORKDELAY = 5 ms
59INTERVAL = 1 h
60WORKBITS = 1
61 24
62[topology] 25[mesh]
63MINIMUM-FRIENDS = 0 26UNIXPATH = /tmp/test-service-mesh-13
64FRIENDS-ONLY = NO 27PORT = 20016
65AUTOCONNECT = YES
66TARGET-CONNECTION-COUNT = 16
67FRIENDS = $SERVICEHOME/friends
68BINARY = gnunet-daemon-topology
69 28
70[datastore] 29[datastore]
71AUTOSTART = YES
72UNIXPATH = /tmp/test-service-datastore-11 30UNIXPATH = /tmp/test-service-datastore-11
73UNIX_MATCH_UID = YES
74UNIX_MATCH_GID = YES
75PORT = 20014 31PORT = 20014
76HOSTNAME = localhost
77HOME = $SERVICEHOME
78BINARY = gnunet-service-datastore
79ACCEPT_FROM = 127.0.0.1;
80ACCEPT_FROM6 = ::1;
81QUOTA = 100 MB
82BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
83DATABASE = sqlite
84
85[datastore-sqlite]
86FILENAME = $SERVICEHOME/datastore/sqlite.db
87
88[datastore-postgres]
89CONFIG = connect_timeout=10; dbname=gnunet
90 32
91[datastore-mysql] 33[resolver]
92DATABASE = gnunet 34UNIXPATH = /tmp/test-service-resolver-14
93CONFIG = ~/.my.cnf 35PORT = 20017
94
95[peerinfo]
96# Do not load HELLOs shipped with GNUnet
97USE_INCLUDED_HELLOS = NO
98AUTOSTART = YES
99PORT = 20013
100HOSTNAME = localhost
101HOME = $SERVICEHOME
102BINARY = gnunet-service-peerinfo
103ACCEPT_FROM = 127.0.0.1;
104ACCEPT_FROM6 = ::1;
105UNIXPATH = /tmp/test-service-peerinfo-10
106UNIX_MATCH_UID = NO
107UNIX_MATCH_GID = YES
108HOSTS = $SERVICEHOME/data/hosts/
109 36
110[client] 37[dht]
111HOME = $SERVICEHOME 38UNIXPATH = /tmp/test-service-dht-1
39PORT = 20000
112 40
113[TESTING] 41[nat]
114WEAKRANDOM = YES 42BEHIND_NAT = NO
115CONNECT_TIMEOUT = 30 s
116CONNECT_ATTEMPTS = 3
117MAX_OUTSTANDING_CONNECTIONS = 50
118DELETE_FILES = YES
119 43
120[ats] 44[fs]
121AUTOSTART = YES 45UNIXPATH = /tmp/test-service-fs-6
122PORT = 20012 46PORT = 20005
123HOSTNAME = localhost
124HOME = $SERVICEHOME
125BINARY = gnunet-service-ats
126ACCEPT_FROM = 127.0.0.1;
127ACCEPT_FROM6 = ::1;
128UNIXPATH = /tmp/test-service-ats-9
129UNIX_MATCH_UID = YES
130UNIX_MATCH_GID = YES
131WAN_QUOTA_IN = unlimited
132WAN_QUOTA_OUT = unlimited
133DUMP_MLP = NO
134DUMP_SOLUTION = NO
135DUMP_OVERWRITE = NO
136DUMP_MIN_PEERS = 0
137DUMP_MIN_ADDRS = 0
138ATS_MIN_INTERVAL = 15000
139ATS_EXEC_INTERVAL = 30000
140 47
141[transport] 48[transport]
142AUTOSTART = YES
143PORT = 20011
144HOSTNAME = localhost
145HOME = $SERVICEHOME
146BINARY = gnunet-service-transport
147NEIGHBOUR_LIMIT = 50
148ACCEPT_FROM = 127.0.0.1;
149ACCEPT_FROM6 = ::1;
150PLUGINS = tcp
151UNIXPATH = /tmp/test-service-transport-8 49UNIXPATH = /tmp/test-service-transport-8
152BLACKLIST_FILE = $SERVICEHOME/blacklist 50PORT = 20011
153UNIX_MATCH_UID = YES
154UNIX_MATCH_GID = YES
155 51
156[transport-tcp] 52[transport-tcp]
157USE_LOCALADDR = YES
158PORT = 20010 53PORT = 20010
159ADVERTISED_PORT = 20010 54ADVERTISED_PORT = 20010
160MAX_CONNECTIONS = 128
161TIMEOUT = 5 s
162 55
163[transport-udp] 56[transport-udp]
164USE_LOCALADDR = YES
165PORT = 20009 57PORT = 20009
166BROADCAST = YES
167BROADCAST_INTERVAL = 30000
168MAX_BPS = 1000000
169
170[transport-http]
171PORT = 20008
172MAX_CONNECTIONS = 128
173
174[transport-https]
175PORT = 20007
176CRYPTO_INIT = NORMAL
177KEY_FILE = https.key
178CERT_FILE = https.cert
179MAX_CONNECTIONS = 128
180
181[transport-wlan]
182INTERFACE = mon0
183TESTMODE = 0
184
185[datacache-mysql]
186DATABASE = gnunet
187CONFIG = ~/.my.cnf
188
189[datacache-postgres]
190CONFIG = connect_timeout=10; dbname=gnunet
191
192[template]
193AUTOSTART = NO
194PORT = 20006
195HOSTNAME = localhost
196HOME = $SERVICEHOME
197BINARY = gnunet-service-template
198ACCEPT_FROM = 127.0.0.1;
199ACCEPT_FROM6 = ::1;
200UNIXPATH = /tmp/test-service-template-7
201UNIX_MATCH_UID = YES
202UNIX_MATCH_GID = YES
203
204[fs]
205AUTOSTART = YES
206INDEXDB = $SERVICEHOME/idxinfo.lst
207TRUST = $SERVICEHOME/data/credit/
208IDENTITY_DIR = $SERVICEHOME/identities/
209STATE_DIR = $SERVICEHOME/persistence/
210UPDATE_DIR = $SERVICEHOME/updates/
211PORT = 20005
212HOSTNAME = localhost
213HOME = $SERVICEHOME
214BINARY = gnunet-service-fs
215ACCEPT_FROM = 127.0.0.1;
216ACCEPT_FROM6 = ::1;
217DELAY = YES
218CONTENT_CACHING = YES
219CONTENT_PUSHING = YES
220UNIXPATH = /tmp/test-service-fs-6
221UNIX_MATCH_UID = NO
222UNIX_MATCH_GID = YES
223MAX_PENDING_REQUESTS = 65536
224MIN_MIGRATION_DELAY = 100 ms
225EXPECTED_NEIGHBOUR_COUNT = 128
226
227[vpn]
228BINARY = gnunet-daemon-vpn
229IPV6ADDR = 1234::1
230IPV6PREFIX = 32
231IPV4ADDR = 10.11.10.1
232IPV4MASK = 255.255.0.0
233VIRTDNS = 10.11.10.2
234VIRTDNS6 = 1234::17
235IFNAME = vpn-gnunet
236
237[exit]
238BINARY = gnunet-daemon-exit
239IPV6ADDR = 1234:1::1
240IPV6PREFIX = 32
241IPV4ADDR = 10.10.1.1
242IPV4MASK = 255.255.0.0
243IFNAME = exit-gnunet
244ENABLE_UDP = NO
245ENABLE_TCP = NO
246
247[dns]
248AUTOSTART = YES
249PORT = 0
250HOSTNAME = localhost
251HOME = $SERVICEHOME
252BINARY = gnunet-service-dns
253ACCEPT_FROM = 127.0.0.1;
254ACCEPT_FROM6 = ::1;
255UNIXPATH = /tmp/test-service-dns-5
256PROVIDE_EXIT = NO
257
258[arm]
259PORT = 20004
260HOSTNAME = localhost
261HOME = $SERVICEHOME
262BINARY = gnunet-service-arm
263ACCEPT_FROM = 127.0.0.1;
264ACCEPT_FROM6 = ::1;
265DEFAULTSERVICES = topology hostlist fs
266UNIXPATH = /tmp/test-service-arm-4
267UNIX_MATCH_UID = YES
268UNIX_MATCH_GID = YES
269 58
270[hostlist] 59[hostlist]
271HTTPPORT = 8080
272HOME = $SERVICEHOME
273HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
274BINARY = gnunet-daemon-hostlist
275OPTIONS = -p 60OPTIONS = -p
276#SERVERS = http://v9.gnunet.org:58080/ 61SERVERs =
277HTTP-PROXY =
278
279[core]
280AUTOSTART = YES
281PORT = 20003
282HOSTNAME = localhost
283HOME = $SERVICEHOME
284BINARY = gnunet-service-core
285ACCEPT_FROM = 127.0.0.1;
286ACCEPT_FROM6 = ::1;
287UNIXPATH = /tmp/test-service-core-3
288UNIX_MATCH_UID = YES
289UNIX_MATCH_GID = YES
290 62
291[nat] 63[vpn]
292EXTERNAL_ADDRESS = 127.0.0.1 64UNIXPATH = /tmp/gnunet-service-vpn-15
293INTERNAL_ADDRESS = 127.0.0.1
294BINDTO = 127.0.0.1
295BEHIND_NAT = NO
296PUNCHED_NAT = NO
297ENABLE_UPNP = NO
298USE_LOCALADDR = YES
299USE_HOSTNAME = NO
300ENABLE_ICMP_CLIENT = NO
301ENABLE_ICMP_SERVER = NO
302DISABLEV6 = YES
303RETURN_LOCAL_ADDRESSES = NO
304 65
305[gnunet-nat-server] 66[peerinfo]
306HOSTNAME = gnunet.org 67UNIXPATH = /tmp/test-service-peerinfo-10
307PORT = 20002 68PORT = 20013
308 69
309[statistics] 70[statistics]
310AUTOSTART = YES
311PORT = 20001
312HOSTNAME = localhost
313HOME = $SERVICEHOME
314BINARY = gnunet-service-statistics
315ACCEPT_FROM = 127.0.0.1;
316ACCEPT_FROM6 = ::1;
317UNIXPATH = /tmp/test-service-statistics-2 71UNIXPATH = /tmp/test-service-statistics-2
318UNIX_MATCH_UID = NO 72PORT = 20001
319UNIX_MATCH_GID = YES
320
321[dht]
322AUTOSTART = YES
323PORT = 20000
324HOSTNAME = localhost
325HOME = $SERVICEHOME
326BINARY = gnunet-service-dht
327ACCEPT_FROM = 127.0.0.1;
328ACCEPT_FROM6 = ::1;
329BUCKET_SIZE = 4
330UNIXPATH = /tmp/test-service-dht-1
331UNIX_MATCH_UID = YES
332UNIX_MATCH_GID = YES
333
334[chat]
335UNIXPATH = /tmp/test-service-chat-b_server-1
336UNIX_MATCH_UID = YES
337UNIX_MATCH_GID = YES
338
339[dv]
340UNIXPATH = /tmp/test-service-dv-b_server-1
341UNIX_MATCH_UID = YES
342UNIX_MATCH_GID = YES
343
344[dhtcache]
345DATABASE = sqlite
346QUOTA = 1 MB
347 73
348[gns] 74[nse]
349AUTOSTART = NO 75UNIXPATH = /tmp/test-service-nse-12
76PORT = 20015
350 77
351[namestore] 78[transport-http]
352AUTOSTART = NO 79PORT = 20008
353 80
354[lockmanager] 81[transport-https]
355AUTOSTART = NO 82PORT = 20007
356[consensus]
357AUTOSTART = NO
358 83
359 84
diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
deleted file mode 100644
index b6c88c499..000000000
--- a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
+++ /dev/null
@@ -1,348 +0,0 @@
1[PATHS]
2SERVICEHOME = /tmp/c_bootstrap_server/
3
4[gnunetd]
5#HOSTKEY = $SERVICEHOME/.hostkey
6HOSTKEY = hostkeys/0000-hostkey
7
8[vpn]
9AUTOSTART = YES
10PORT = 0
11HOSTNAME = localhost
12HOME = $SERVICEHOME
13BINARY = gnunet-service-dns
14ACCEPT_FROM = 127.0.0.1;
15ACCEPT_FROM6 = ::1;
16UNIXPATH = /tmp/gnunet-service-vpn-15
17
18[resolver]
19AUTOSTART = YES
20PORT = 20017
21HOSTNAME = localhost
22HOME = $SERVICEHOME
23BINARY = gnunet-service-resolver
24ACCEPT_FROM = 127.0.0.1;
25ACCEPT_FROM6 = ::1;
26UNIXPATH = /tmp/test-service-resolver-14
27UNIX_MATCH_UID = NO
28UNIX_MATCH_GID = NO
29
30[mesh]
31AUTOSTART = YES
32PORT = 20016
33HOSTNAME = localhost
34HOME = $SERVICEHOME
35BINARY = gnunet-service-mesh
36ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1;
38UNIXPATH = /tmp/test-service-mesh-13
39UNIX_MATCH_UID = YES
40UNIX_MATCH_GID = YES
41
42[nse]
43AUTOSTART = YES
44PORT = 20015
45HOSTNAME = localhost
46HOME = $SERVICEHOME
47BINARY = gnunet-service-nse
48ACCEPT_FROM = 127.0.0.1;
49ACCEPT_FROM6 = ::1;
50UNIXPATH = /tmp/test-service-nse-12
51UNIX_MATCH_UID = YES
52UNIX_MATCH_GID = YES
53PROOFFILE = $SERVICEHOME/.nse-proof
54HISTOGRAM = $SERVICEHOME/nse-history.log
55WORKDELAY = 5 ms
56INTERVAL = 1 h
57WORKBITS = 1
58
59[topology]
60MINIMUM-FRIENDS = 0
61FRIENDS-ONLY = NO
62AUTOCONNECT = YES
63TARGET-CONNECTION-COUNT = 16
64FRIENDS = $SERVICEHOME/friends
65BINARY = gnunet-daemon-topology
66
67[datastore]
68AUTOSTART = YES
69UNIXPATH = /tmp/test-service-datastore-11
70UNIX_MATCH_UID = YES
71UNIX_MATCH_GID = YES
72PORT = 20014
73HOSTNAME = localhost
74HOME = $SERVICEHOME
75BINARY = gnunet-service-datastore
76ACCEPT_FROM = 127.0.0.1;
77ACCEPT_FROM6 = ::1;
78QUOTA = 100 MB
79BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
80DATABASE = sqlite
81
82[datastore-sqlite]
83FILENAME = $SERVICEHOME/datastore/sqlite.db
84
85[datastore-postgres]
86CONFIG = connect_timeout=10; dbname=gnunet
87
88[datastore-mysql]
89DATABASE = gnunet
90CONFIG = ~/.my.cnf
91
92[peerinfo]
93AUTOSTART = YES
94PORT = 20013
95HOSTNAME = localhost
96HOME = $SERVICEHOME
97BINARY = gnunet-service-peerinfo
98ACCEPT_FROM = 127.0.0.1;
99ACCEPT_FROM6 = ::1;
100UNIXPATH = /tmp/test-service-peerinfo-10
101UNIX_MATCH_UID = NO
102UNIX_MATCH_GID = YES
103HOSTS = $SERVICEHOME/data/hosts/
104
105[client]
106HOME = $SERVICEHOME
107
108[TESTING]
109WEAKRANDOM = YES
110CONNECT_TIMEOUT = 30 s
111CONNECT_ATTEMPTS = 3
112MAX_OUTSTANDING_CONNECTIONS = 50
113DELETE_FILES = YES
114
115[ats]
116AUTOSTART = YES
117PORT = 20012
118HOSTNAME = localhost
119HOME = $SERVICEHOME
120BINARY = gnunet-service-ats
121ACCEPT_FROM = 127.0.0.1;
122ACCEPT_FROM6 = ::1;
123UNIXPATH = /tmp/test-service-ats-9
124UNIX_MATCH_UID = YES
125UNIX_MATCH_GID = YES
126WAN_QUOTA_IN = unlimited
127WAN_QUOTA_OUT = unlimited
128DUMP_MLP = NO
129DUMP_SOLUTION = NO
130DUMP_OVERWRITE = NO
131DUMP_MIN_PEERS = 0
132DUMP_MIN_ADDRS = 0
133ATS_MIN_INTERVAL = 15000
134ATS_EXEC_INTERVAL = 30000
135
136[transport]
137#PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_bootstrap.out --tool=massif
138AUTOSTART = YES
139PORT = 20011
140HOSTNAME = localhost
141HOME = $SERVICEHOME
142BINARY = gnunet-service-transport
143NEIGHBOUR_LIMIT = 50
144ACCEPT_FROM = 127.0.0.1;
145ACCEPT_FROM6 = ::1;
146PLUGINS = tcp
147UNIXPATH = /tmp/test-service-transport-8
148BLACKLIST_FILE = $SERVICEHOME/blacklist
149UNIX_MATCH_UID = YES
150UNIX_MATCH_GID = YES
151
152[transport-tcp]
153USE_LOCALADDR = YES
154PORT = 20010
155ADVERTISED_PORT = 20010
156MAX_CONNECTIONS = 128
157TIMEOUT = 5 s
158
159[transport-udp]
160USE_LOCALADDR = YES
161PORT = 20009
162BROADCAST = YES
163BROADCAST_INTERVAL = 30000
164MAX_BPS = 1000000
165
166[transport-http]
167PORT = 20008
168MAX_CONNECTIONS = 128
169
170[transport-https]
171PORT = 20007
172CRYPTO_INIT = NORMAL
173KEY_FILE = https.key
174CERT_FILE = https.cert
175MAX_CONNECTIONS = 128
176
177[transport-wlan]
178INTERFACE = mon0
179TESTMODE = 0
180
181[datacache-mysql]
182DATABASE = gnunet
183CONFIG = ~/.my.cnf
184
185[datacache-postgres]
186CONFIG = connect_timeout=10; dbname=gnunet
187
188[template]
189AUTOSTART = NO
190PORT = 20006
191HOSTNAME = localhost
192HOME = $SERVICEHOME
193BINARY = gnunet-service-template
194ACCEPT_FROM = 127.0.0.1;
195ACCEPT_FROM6 = ::1;
196UNIXPATH = /tmp/test-service-template-7
197UNIX_MATCH_UID = YES
198UNIX_MATCH_GID = YES
199
200[fs]
201AUTOSTART = YES
202INDEXDB = $SERVICEHOME/idxinfo.lst
203TRUST = $SERVICEHOME/data/credit/
204IDENTITY_DIR = $SERVICEHOME/identities/
205STATE_DIR = $SERVICEHOME/persistence/
206UPDATE_DIR = $SERVICEHOME/updates/
207PORT = 20005
208HOSTNAME = localhost
209HOME = $SERVICEHOME
210BINARY = gnunet-service-fs
211ACCEPT_FROM = 127.0.0.1;
212ACCEPT_FROM6 = ::1;
213DELAY = YES
214CONTENT_CACHING = YES
215CONTENT_PUSHING = YES
216UNIXPATH = /tmp/test-service-fs-6
217UNIX_MATCH_UID = NO
218UNIX_MATCH_GID = YES
219MAX_PENDING_REQUESTS = 65536
220MIN_MIGRATION_DELAY = 100 ms
221EXPECTED_NEIGHBOUR_COUNT = 128
222
223[vpn]
224BINARY = gnunet-daemon-vpn
225IPV6ADDR = 1234::1
226IPV6PREFIX = 32
227IPV4ADDR = 10.11.10.1
228IPV4MASK = 255.255.0.0
229VIRTDNS = 10.11.10.2
230VIRTDNS6 = 1234::17
231IFNAME = vpn-gnunet
232
233[exit]
234BINARY = gnunet-daemon-exit
235IPV6ADDR = 1234:1::1
236IPV6PREFIX = 32
237IPV4ADDR = 10.10.1.1
238IPV4MASK = 255.255.0.0
239IFNAME = exit-gnunet
240ENABLE_UDP = NO
241ENABLE_TCP = NO
242
243[dns]
244AUTOSTART = YES
245PORT = 0
246HOSTNAME = localhost
247HOME = $SERVICEHOME
248BINARY = gnunet-service-dns
249ACCEPT_FROM = 127.0.0.1;
250ACCEPT_FROM6 = ::1;
251UNIXPATH = /tmp/test-service-dns-5
252PROVIDE_EXIT = NO
253
254[arm]
255PORT = 20004
256HOSTNAME = localhost
257HOME = $SERVICEHOME
258BINARY = gnunet-service-arm
259ACCEPT_FROM = 127.0.0.1;
260ACCEPT_FROM6 = ::1;
261DEFAULTSERVICES = topology hostlist fs dht gns
262UNIXPATH = /tmp/test-service-arm-4
263UNIX_MATCH_UID = YES
264UNIX_MATCH_GID = YES
265
266[hostlist]
267HTTPPORT = 8080
268HOME = $SERVICEHOME
269HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
270BINARY = gnunet-daemon-hostlist
271OPTIONS = -p
272#SERVERS = http://v9.gnunet.org:58080/
273HTTP-PROXY =
274
275[core]
276AUTOSTART = YES
277PORT = 20003
278HOSTNAME = localhost
279HOME = $SERVICEHOME
280BINARY = gnunet-service-core
281ACCEPT_FROM = 127.0.0.1;
282ACCEPT_FROM6 = ::1;
283UNIXPATH = /tmp/test-service-core-3
284UNIX_MATCH_UID = YES
285UNIX_MATCH_GID = YES
286
287[nat]
288EXTERNAL_ADDRESS = 127.0.0.1
289INTERNAL_ADDRESS = 127.0.0.1
290BINDTO = 127.0.0.1
291BEHIND_NAT = NO
292PUNCHED_NAT = NO
293ENABLE_UPNP = NO
294USE_LOCALADDR = YES
295USE_HOSTNAME = NO
296ENABLE_ICMP_CLIENT = NO
297ENABLE_ICMP_SERVER = NO
298DISABLEV6 = YES
299RETURN_LOCAL_ADDRESSES = NO
300HOSTNAME_DNS_FREQUENCY = 1200000
301IFC_SCAN_FREQUENCY = 3000000
302DYNDNS_FREQUENCY = 140000
303
304[gnunet-nat-server]
305HOSTNAME = gnunet.org
306PORT = 20002
307
308[statistics]
309AUTOSTART = YES
310PORT = 20001
311HOSTNAME = localhost
312HOME = $SERVICEHOME
313BINARY = gnunet-service-statistics
314ACCEPT_FROM = 127.0.0.1;
315ACCEPT_FROM6 = ::1;
316UNIXPATH = /tmp/test-service-statistics-2
317UNIX_MATCH_UID = NO
318UNIX_MATCH_GID = YES
319
320[dht]
321AUTOSTART = YES
322PORT = 20000
323HOSTNAME = localhost
324HOME = $SERVICEHOME
325BINARY = gnunet-service-dht
326ACCEPT_FROM = 127.0.0.1;
327ACCEPT_FROM6 = ::1;
328BUCKET_SIZE = 4
329UNIXPATH = /tmp/test-service-dht-1
330UNIX_MATCH_UID = YES
331UNIX_MATCH_GID = YES
332
333[dhtcache]
334DATABASE = sqlite
335QUOTA = 1 MB
336
337[gns]
338AUTOSTART = NO
339
340[namestore]
341AUTOSTART = NO
342
343[lockmanager]
344AUTOSTART = NO
345[consensus]
346AUTOSTART = NO
347
348
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 07b251806..eeee520ee 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -1,358 +1,66 @@
1[PATHS] 1@INCLUDE@ test_defaults.conf
2SERVICEHOME = /tmp/c_nat_client
3
4[gnunetd]
5#HOSTKEY = hostkeys/0002-hostkey
6
7[PEER]
8PRIVATE_KEY = hostkeys/c_nat_client
9
10[client]
11HOME = $SERVICEHOME
12
13[gns]
14AUTOSTART = NO
15
16[namestore]
17AUTOSTART = NO
18
19[vpn]
20AUTOSTART = YES
21PORT = 0
22HOSTNAME = localhost
23HOME = $SERVICEHOME
24BINARY = gnunet-service-dns
25ACCEPT_FROM = 127.0.0.1;
26ACCEPT_FROM6 = ::1;
27UNIXPATH = /tmp/gnunet-service-vpn-57
28
29
30[resolver]
31AUTOSTART = YES
32PORT = 20071
33HOSTNAME = localhost
34HOME = $SERVICEHOME
35BINARY = gnunet-service-resolver
36ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1;
38UNIXPATH = /tmp/test-service-resolver-56
39UNIX_MATCH_UID = NO
40UNIX_MATCH_GID = NO
41 2
42[mesh] 3[arm]
43AUTOSTART = YES 4UNIXPATH = /tmp/test-service-arm-46
44PORT = 20070 5PORT = 20058
45HOSTNAME = localhost
46HOME = $SERVICEHOME
47BINARY = gnunet-service-mesh
48ACCEPT_FROM = 127.0.0.1;
49ACCEPT_FROM6 = ::1;
50UNIXPATH = /tmp/test-service-mesh-55
51UNIX_MATCH_UID = YES
52UNIX_MATCH_GID = YES
53 6
54[nse] 7[core]
55AUTOSTART = YES 8UNIXPATH = /tmp/test-service-core-45
56PORT = 20069 9PORT = 20057
57HOSTNAME = localhost
58HOME = $SERVICEHOME
59BINARY = gnunet-service-nse
60ACCEPT_FROM = 127.0.0.1;
61ACCEPT_FROM6 = ::1;
62UNIXPATH = /tmp/test-service-nse-54
63UNIX_MATCH_UID = YES
64UNIX_MATCH_GID = YES
65PROOFFILE = $SERVICEHOME/.nse-proof
66HISTOGRAM = $SERVICEHOME/nse-history.log
67WORKDELAY = 5 ms
68INTERVAL = 1 h
69WORKBITS = 1
70 10
71[topology] 11[ats]
72MINIMUM-FRIENDS = 0 12UNIXPATH = /tmp/test-service-ats-51
73FRIENDS-ONLY = NO 13PORT = 20066
74AUTOCONNECT = YES
75TARGET-CONNECTION-COUNT = 16
76FRIENDS = $SERVICEHOME/friends
77BINARY = gnunet-daemon-topology
78 14
79[datastore] 15[datastore]
80AUTOSTART = YES
81UNIXPATH = /tmp/test-service-datastore-53 16UNIXPATH = /tmp/test-service-datastore-53
82UNIX_MATCH_UID = YES
83UNIX_MATCH_GID = YES
84PORT = 20068 17PORT = 20068
85HOSTNAME = localhost
86HOME = $SERVICEHOME
87BINARY = gnunet-service-datastore
88ACCEPT_FROM = 127.0.0.1;
89ACCEPT_FROM6 = ::1;
90QUOTA = 100 MB
91BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
92DATABASE = sqlite
93
94[datastore-sqlite]
95FILENAME = $SERVICEHOME/datastore/sqlite.db
96
97[datastore-postgres]
98CONFIG = connect_timeout=10; dbname=gnunet
99
100[datastore-mysql]
101DATABASE = gnunet
102CONFIG = ~/.my.cnf
103 18
104[peerinfo] 19[resolver]
105USE_INCLUDED_HELLOS = NO 20UNIXPATH = /tmp/test-service-resolver-56
106AUTOSTART = YES 21PORT = 20071
107PORT = 20067
108HOSTNAME = localhost
109HOME = $SERVICEHOME
110BINARY = gnunet-service-peerinfo
111ACCEPT_FROM = 127.0.0.1;
112ACCEPT_FROM6 = ::1;
113UNIXPATH = /tmp/test-service-peerinfo-52
114UNIX_MATCH_UID = NO
115UNIX_MATCH_GID = YES
116HOSTS = $SERVICEHOME/data/hosts/
117 22
118[TESTING] 23[dht]
119WEAKRANDOM = NO 24UNIXPATH = /tmp/test-service-dht-43
120CONNECT_TIMEOUT = 30 s 25PORT = 20054
121CONNECT_ATTEMPTS = 3
122MAX_OUTSTANDING_CONNECTIONS = 50
123DELETE_FILES = YES
124 26
125[ats] 27[fs]
126AUTOSTART = YES 28UNIXPATH = /tmp/test-service-fs-48
127PORT = 20066 29PORT = 20059
128HOSTNAME = localhost
129HOME = $SERVICEHOME
130BINARY = gnunet-service-ats
131ACCEPT_FROM = 127.0.0.1;
132ACCEPT_FROM6 = ::1;
133UNIXPATH = /tmp/test-service-ats-51
134UNIX_MATCH_UID = YES
135UNIX_MATCH_GID = YES
136WAN_QUOTA_IN = unlimited
137WAN_QUOTA_OUT = unlimited
138DUMP_MLP = NO
139DUMP_SOLUTION = NO
140DUMP_OVERWRITE = NO
141DUMP_MIN_PEERS = 0
142DUMP_MIN_ADDRS = 0
143ATS_MIN_INTERVAL = 15000
144ATS_EXEC_INTERVAL = 30000
145 30
146[transport] 31[transport]
147AUTOSTART = YES
148PORT = 20065
149HOSTNAME = localhost
150HOME = $SERVICEHOME
151BINARY = gnunet-service-transport
152NEIGHBOUR_LIMIT = 50
153ACCEPT_FROM = 127.0.0.1;
154ACCEPT_FROM6 = ::1;
155PLUGINS = tcp
156UNIXPATH = /tmp/test-service-transport-50 32UNIXPATH = /tmp/test-service-transport-50
157BLACKLIST_FILE = $SERVICEHOME/blacklist 33PORT = 20065
158UNIX_MATCH_UID = YES
159UNIX_MATCH_GID = YES
160 34
161[transport-tcp] 35[transport-tcp]
162PORT = 0 36PORT = 0
163ADVERTISED_PORT = 20064 37ADVERTISED_PORT = 20064
164MAX_CONNECTIONS = 128
165TIMEOUT = 5 s
166USE_LOCALADDR = YES
167 38
168[transport-udp] 39[transport-udp]
169PORT = 0 40PORT = 0
170BROADCAST = YES
171BROADCAST_INTERVAL = 30000
172MAX_BPS = 1000000
173USE_LOCALADDR = YES
174
175[transport-http]
176PORT = 0
177MAX_CONNECTIONS = 128
178
179[transport-https]
180PORT = 0
181CRYPTO_INIT = NORMAL
182KEY_FILE = https.key
183CERT_FILE = https.cert
184MAX_CONNECTIONS = 128
185
186[transport-wlan]
187INTERFACE = mon0
188TESTMODE = 0
189
190[datacache-mysql]
191DATABASE = gnunet
192CONFIG = ~/.my.cnf
193
194[datacache-postgres]
195CONFIG = connect_timeout=10; dbname=gnunet
196
197[template]
198AUTOSTART = NO
199PORT = 20060
200HOSTNAME = localhost
201HOME = $SERVICEHOME
202BINARY = gnunet-service-template
203ACCEPT_FROM = 127.0.0.1;
204ACCEPT_FROM6 = ::1;
205UNIXPATH = /tmp/test-service-template-49
206UNIX_MATCH_UID = YES
207UNIX_MATCH_GID = YES
208
209[fs]
210AUTOSTART = YES
211INDEXDB = $SERVICEHOME/idxinfo.lst
212TRUST = $SERVICEHOME/data/credit/
213IDENTITY_DIR = $SERVICEHOME/identities/
214STATE_DIR = $SERVICEHOME/persistence/
215UPDATE_DIR = $SERVICEHOME/updates/
216PORT = 20059
217HOSTNAME = localhost
218HOME = $SERVICEHOME
219BINARY = gnunet-service-fs
220ACCEPT_FROM = 127.0.0.1;
221ACCEPT_FROM6 = ::1;
222DELAY = YES
223CONTENT_CACHING = YES
224CONTENT_PUSHING = YES
225UNIXPATH = /tmp/test-service-fs-48
226UNIX_MATCH_UID = NO
227UNIX_MATCH_GID = YES
228MAX_PENDING_REQUESTS = 65536
229MIN_MIGRATION_DELAY = 100 ms
230EXPECTED_NEIGHBOUR_COUNT = 128
231
232[vpn]
233BINARY = gnunet-daemon-vpn
234IPV6ADDR = 1234::1
235IPV6PREFIX = 32
236IPV4ADDR = 10.11.10.1
237IPV4MASK = 255.255.0.0
238VIRTDNS = 10.11.10.2
239VIRTDNS6 = 1234::17
240IFNAME = vpn-gnunet
241
242[exit]
243BINARY = gnunet-daemon-exit
244IPV6ADDR = 1234:1::1
245IPV6PREFIX = 32
246IPV4ADDR = 10.10.1.1
247IPV4MASK = 255.255.0.0
248IFNAME = exit-gnunet
249ENABLE_UDP = NO
250ENABLE_TCP = NO
251
252[dns]
253AUTOSTART = YES
254PORT = 0
255HOSTNAME = localhost
256HOME = $SERVICEHOME
257BINARY = gnunet-service-dns
258ACCEPT_FROM = 127.0.0.1;
259ACCEPT_FROM6 = ::1;
260UNIXPATH = /tmp/test-service-dns-47
261PROVIDE_EXIT = NO
262
263[arm]
264PORT = 20058
265HOSTNAME = localhost
266HOME = $SERVICEHOME
267BINARY = gnunet-service-arm
268ACCEPT_FROM = 127.0.0.1;
269ACCEPT_FROM6 = ::1;
270DEFAULTSERVICES = topology hostlist fs
271UNIXPATH = /tmp/test-service-arm-46
272UNIX_MATCH_UID = YES
273UNIX_MATCH_GID = YES
274 41
275[hostlist] 42[hostlist]
276HTTPPORT = 8080
277HOME = $SERVICEHOME
278HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
279BINARY = gnunet-daemon-hostlist
280OPTIONS = -b
281SERVERS = http://localhost:8080/ 43SERVERS = http://localhost:8080/
282HTTP-PROXY =
283
284[core]
285AUTOSTART = YES
286PORT = 20057
287HOSTNAME = localhost
288HOME = $SERVICEHOME
289BINARY = gnunet-service-core
290ACCEPT_FROM = 127.0.0.1;
291ACCEPT_FROM6 = ::1;
292UNIXPATH = /tmp/test-service-core-45
293UNIX_MATCH_UID = YES
294UNIX_MATCH_GID = YES
295
296[nat]
297BEHIND_NAT = YES
298PUNCHED_NAT = NO
299ENABLE_UPNP = NO
300USE_LOCALADDR = YES
301USE_HOSTNAME = NO
302ENABLE_ICMP_CLIENT = NO
303ENABLE_ICMP_SERVER = NO
304DISABLEV6 = YES
305RETURN_LOCAL_ADDRESSES = NO
306EXTERNAL_ADDRESS = 127.0.0.1
307INTERNAL_ADDRESS = 127.0.0.1
308BINDTO = 127.0.0.1
309
310[gnunet-nat-server]
311HOSTNAME = gnunet.org
312PORT = 20056
313 44
314[statistics] 45[dv]
315AUTOSTART = YES 46UNIXPATH = /tmp/test-service-dv-b_nat_c-1
316PORT = 20055
317HOSTNAME = localhost
318HOME = $SERVICEHOME
319BINARY = gnunet-service-statistics
320ACCEPT_FROM = 127.0.0.1;
321ACCEPT_FROM6 = ::1;
322UNIXPATH = /tmp/test-service-statistics-44
323UNIX_MATCH_UID = NO
324UNIX_MATCH_GID = YES
325
326[dht]
327AUTOSTART = YES
328PORT = 20054
329HOSTNAME = localhost
330HOME = $SERVICEHOME
331BINARY = gnunet-service-dht
332ACCEPT_FROM = 127.0.0.1;
333ACCEPT_FROM6 = ::1;
334BUCKET_SIZE = 4
335UNIXPATH = /tmp/test-service-dht-43
336UNIX_MATCH_UID = YES
337UNIX_MATCH_GID = YES
338 47
339[dhtcache] 48[peerinfo]
340DATABASE = sqlite 49UNIXPATH = /tmp/test-service-peerinfo-52
341QUOTA = 1 MB 50PORT = 20067
342 51
343[chat] 52[PATHS]
344UNIXPATH = /tmp/test-service-chat-b_nat_c-1 53SERVICEHOME = /tmp/c_nat_client
345UNIX_MATCH_UID = YES
346UNIX_MATCH_GID = YES
347 54
348[dv] 55[PEER]
349UNIXPATH = /tmp/test-service-dv-b_nat_c-1 56PRIVATE_KEY = hostkeys/c_nat_client
350UNIX_MATCH_UID = YES
351UNIX_MATCH_GID = YES
352 57
353[lockmanager] 58[nse]
354AUTOSTART = NO 59UNIXPATH = /tmp/test-service-nse-54
355[consensus] 60PORT = 20069
356AUTOSTART = NO
357 61
62[transport-http]
63PORT = 0
358 64
65[transport-https]
66PORT = 0
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index be3d1b336..6f3c73c90 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -1,360 +1,118 @@
1@INCLUDE@ confs/test_defaults.conf
2
1[PATHS] 3[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client/ 4SERVICEHOME = /tmp/c_no_nat_client/
3 5
4[gnunetd]
5#HOSTKEY = $SERVICEHOME/.hostkey
6#HOSTKEY = hostkeys/0001-hostkey
7
8[PEER] 6[PEER]
9PRIVATE_KEY = hostkeys/c_no_nat_client 7PRIVATE_KEY = hostkeys/c_no_nat_client
10 8
11[gns] 9[arm]
12AUTOSTART = NO 10DEFAULTSERVICES = topology hostlist dht nse mesh fs
11UNIXPATH = /tmp/test-service-arm-18
12PORT = 20022
13 13
14[namestore] 14[namestore]
15AUTOSTART = NO
16
17[vpn]
18AUTOSTART = YES 15AUTOSTART = YES
19PORT = 0
20HOSTNAME = localhost
21HOME = $SERVICEHOME
22BINARY = gnunet-service-dns
23ACCEPT_FROM = 127.0.0.1;
24ACCEPT_FROM6 = ::1;
25UNIXPATH = /tmp/gnunet-service-vpn-29
26 16
27[resolver] 17[dns]
28AUTOSTART = YES 18UNIXPATH = /tmp/test-service-dns-19
29PORT = 20035
30HOSTNAME = localhost
31HOME = $SERVICEHOME
32BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1;
35UNIXPATH = /tmp/test-service-resolver-28
36UNIX_MATCH_UID = NO
37UNIX_MATCH_GID = NO
38 19
39[mesh] 20[consensus]
40AUTOSTART = YES 21AUTOSTART = YES
41PORT = 20034
42HOSTNAME = localhost
43HOME = $SERVICEHOME
44BINARY = gnunet-service-mesh
45ACCEPT_FROM = 127.0.0.1;
46ACCEPT_FROM6 = ::1;
47UNIXPATH = /tmp/test-service-mesh-27
48UNIX_MATCH_UID = YES
49UNIX_MATCH_GID = YES
50 22
51[nse] 23[lockmanager]
52AUTOSTART = YES 24AUTOSTART = YES
53PORT = 20033
54HOSTNAME = localhost
55HOME = $SERVICEHOME
56BINARY = gnunet-service-nse
57ACCEPT_FROM = 127.0.0.1;
58ACCEPT_FROM6 = ::1;
59UNIXPATH = /tmp/test-service-nse-26
60UNIX_MATCH_UID = YES
61UNIX_MATCH_GID = YES
62PROOFFILE = $SERVICEHOME/.nse-proof
63HISTOGRAM = $SERVICEHOME/nse-history.log
64WORKDELAY = 5 ms
65INTERVAL = 1 h
66WORKBITS = 1
67 25
68[topology] 26[core]
69MINIMUM-FRIENDS = 0 27UNIXPATH = /tmp/test-service-core-17
70FRIENDS-ONLY = NO 28PORT = 20021
71AUTOCONNECT = YES 29
72TARGET-CONNECTION-COUNT = 16 30[ats]
73FRIENDS = $SERVICEHOME/friends 31UNIXPATH = /tmp/test-service-ats-23
74BINARY = gnunet-daemon-topology 32WAN_QUOTA_IN = 64 KiB
33WAN_QUOTA_OUT = 64 KiB
34PORT = 20030
35
36[mesh]
37UNIXPATH = /tmp/test-service-mesh-27
38PORT = 20034
75 39
76[datastore] 40[datastore]
77AUTOSTART = YES
78UNIXPATH = /tmp/test-service-datastore-25 41UNIXPATH = /tmp/test-service-datastore-25
79UNIX_MATCH_UID = YES
80UNIX_MATCH_GID = YES
81PORT = 20032 42PORT = 20032
82HOSTNAME = localhost
83HOME = $SERVICEHOME
84BINARY = gnunet-service-datastore
85ACCEPT_FROM = 127.0.0.1;
86ACCEPT_FROM6 = ::1;
87QUOTA = 100 MB
88BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
89DATABASE = sqlite
90
91[datastore-sqlite]
92FILENAME = $SERVICEHOME/datastore/sqlite.db
93 43
94[datastore-postgres] 44[resolver]
95CONFIG = connect_timeout=10; dbname=gnunet 45UNIXPATH = /tmp/test-service-resolver-28
46PORT = 20035
96 47
97[datastore-mysql] 48[dht]
98DATABASE = gnunet 49UNIXPATH = /tmp/test-service-dht-15
99CONFIG = ~/.my.cnf 50PORT = 20018
100 51
101[peerinfo] 52[dhtcache]
102# Do not load HELLOs shipped with GNUnet 53DATABASE = heap
103USE_INCLUDED_HELLOS = NO 54QUOTA = 50 MB
104AUTOSTART = YES
105PORT = 20031
106HOSTNAME = localhost
107HOME = $SERVICEHOME
108BINARY = gnunet-service-peerinfo
109ACCEPT_FROM = 127.0.0.1;
110ACCEPT_FROM6 = ::1;
111UNIXPATH = /tmp/test-service-peerinfo-24
112UNIX_MATCH_UID = NO
113UNIX_MATCH_GID = YES
114HOSTS = $SERVICEHOME/data/hosts/
115 55
116[client] 56[nat]
117HOME = $SERVICEHOME 57BEHIND_NAT = NO
58DISABLEV6 = NO
118 59
119[TESTING] 60[gnunet-nat-server]
120WEAKRANDOM = NO 61PORT = 20020
121CONNECT_TIMEOUT = 30 s
122CONNECT_ATTEMPTS = 3
123MAX_OUTSTANDING_CONNECTIONS = 50
124DELETE_FILES = YES
125 62
126[ats] 63[fs]
127AUTOSTART = YES 64UNIXPATH = /tmp/test-service-fs-20
128PORT = 20030 65PORT = 20023
129HOSTNAME = localhost
130HOME = $SERVICEHOME
131BINARY = gnunet-service-ats
132ACCEPT_FROM = 127.0.0.1;
133ACCEPT_FROM6 = ::1;
134UNIXPATH = /tmp/test-service-ats-23
135UNIX_MATCH_UID = YES
136UNIX_MATCH_GID = YES
137WAN_QUOTA_IN = unlimited
138WAN_QUOTA_OUT = unlimited
139DUMP_MLP = NO
140DUMP_SOLUTION = NO
141DUMP_OVERWRITE = NO
142DUMP_MIN_PEERS = 0
143DUMP_MIN_ADDRS = 0
144ATS_MIN_INTERVAL = 15000
145ATS_EXEC_INTERVAL = 30000
146 66
147[transport] 67[transport]
148#PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_client.out --tool=massif 68PLUGINS = tcp udp
149AUTOSTART = YES
150PORT = 20029
151HOSTNAME = localhost
152HOME = $SERVICEHOME
153BINARY = gnunet-service-transport
154NEIGHBOUR_LIMIT = 50
155ACCEPT_FROM = 127.0.0.1;
156ACCEPT_FROM6 = ::1;
157PLUGINS = tcp
158UNIXPATH = /tmp/test-service-transport-22 69UNIXPATH = /tmp/test-service-transport-22
159BLACKLIST_FILE = $SERVICEHOME/blacklist 70UNIX_MATCH_UID = NO
160UNIX_MATCH_UID = YES 71PORT = 20029
161UNIX_MATCH_GID = YES
162 72
163[transport-tcp] 73[transport-tcp]
164USE_LOCALADDR = YES
165PORT = 20028 74PORT = 20028
166ADVERTISED_PORT = 20028 75ADVERTISED_PORT = 20028
167MAX_CONNECTIONS = 128
168TIMEOUT = 5 s
169 76
170[transport-udp] 77[transport-udp]
171USE_LOCALADDR = YES
172PORT = 20027 78PORT = 20027
173BROADCAST = YES 79BROADCAST_INTERVAL = 30 s
174BROADCAST_INTERVAL = 30000
175MAX_BPS = 1000000
176 80
177[transport-http] 81[hostlist]
178PORT = 20026 82SERVERS = http://localhost:8080/
179MAX_CONNECTIONS = 128
180 83
181[transport-https] 84[vpn]
182PORT = 20025 85BINARY = gnunet-service-vpn
183CRYPTO_INIT = NORMAL 86UNIXPATH = /tmp/gnunet-service-vpn-29
184KEY_FILE = https.key
185CERT_FILE = https.cert
186MAX_CONNECTIONS = 128
187 87
188[transport-wlan] 88[dv]
189INTERFACE = mon0 89UNIXPATH = /tmp/test-service-dv-b_no_nat_c-1
190TESTMODE = 0
191 90
192[datacache-mysql] 91[peerinfo]
193DATABASE = gnunet 92UNIXPATH = /tmp/test-service-peerinfo-24
194CONFIG = ~/.my.cnf 93USE_INCLUDED_HELLOS = YES
94PORT = 20031
195 95
196[datacache-postgres] 96[statistics]
197CONFIG = connect_timeout=10; dbname=gnunet 97UNIXPATH = /tmp/test-service-statistics-16
98PORT = 20019
198 99
199[template] 100[template]
200AUTOSTART = NO
201PORT = 20024 101PORT = 20024
202HOSTNAME = localhost
203HOME = $SERVICEHOME
204BINARY = gnunet-service-template
205ACCEPT_FROM = 127.0.0.1;
206ACCEPT_FROM6 = ::1;
207UNIXPATH = /tmp/test-service-template-21 102UNIXPATH = /tmp/test-service-template-21
208UNIX_MATCH_UID = YES
209UNIX_MATCH_GID = YES
210
211[fs]
212AUTOSTART = YES
213INDEXDB = $SERVICEHOME/idxinfo.lst
214TRUST = $SERVICEHOME/data/credit/
215IDENTITY_DIR = $SERVICEHOME/identities/
216STATE_DIR = $SERVICEHOME/persistence/
217UPDATE_DIR = $SERVICEHOME/updates/
218PORT = 20023
219HOSTNAME = localhost
220HOME = $SERVICEHOME
221BINARY = gnunet-service-fs
222ACCEPT_FROM = 127.0.0.1;
223ACCEPT_FROM6 = ::1;
224DELAY = YES
225CONTENT_CACHING = YES
226CONTENT_PUSHING = YES
227UNIXPATH = /tmp/test-service-fs-20
228UNIX_MATCH_UID = NO
229UNIX_MATCH_GID = YES
230MAX_PENDING_REQUESTS = 65536
231MIN_MIGRATION_DELAY = 100 ms
232EXPECTED_NEIGHBOUR_COUNT = 128
233
234[vpn]
235BINARY = gnunet-daemon-vpn
236IPV6ADDR = 1234::1
237IPV6PREFIX = 32
238IPV4ADDR = 10.11.10.1
239IPV4MASK = 255.255.0.0
240VIRTDNS = 10.11.10.2
241VIRTDNS6 = 1234::17
242IFNAME = vpn-gnunet
243
244[exit]
245BINARY = gnunet-daemon-exit
246IPV6ADDR = 1234:1::1
247IPV6PREFIX = 32
248IPV4ADDR = 10.10.1.1
249IPV4MASK = 255.255.0.0
250IFNAME = exit-gnunet
251ENABLE_UDP = NO
252ENABLE_TCP = NO
253
254[dns]
255AUTOSTART = YES
256PORT = 0
257HOSTNAME = localhost
258HOME = $SERVICEHOME
259BINARY = gnunet-service-dns
260ACCEPT_FROM = 127.0.0.1;
261ACCEPT_FROM6 = ::1;
262UNIXPATH = /tmp/test-service-dns-19
263PROVIDE_EXIT = NO
264 103
265[arm] 104[nse]
266PORT = 20022 105UNIXPATH = /tmp/test-service-nse-26
267HOSTNAME = localhost
268HOME = $SERVICEHOME
269BINARY = gnunet-service-arm
270ACCEPT_FROM = 127.0.0.1;
271ACCEPT_FROM6 = ::1;
272DEFAULTSERVICES = topology hostlist fs
273UNIXPATH = /tmp/test-service-arm-18
274UNIX_MATCH_UID = YES
275UNIX_MATCH_GID = YES
276
277[hostlist]
278HTTPPORT = 8080
279HOME = $SERVICEHOME
280HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
281BINARY = gnunet-daemon-hostlist
282OPTIONS = -b
283SERVERS = http://localhost:8080/
284HTTP-PROXY =
285
286[core]
287AUTOSTART = YES
288PORT = 20021
289HOSTNAME = localhost
290HOME = $SERVICEHOME
291BINARY = gnunet-service-core
292ACCEPT_FROM = 127.0.0.1;
293ACCEPT_FROM6 = ::1;
294UNIXPATH = /tmp/test-service-core-17
295UNIX_MATCH_UID = YES
296UNIX_MATCH_GID = YES
297
298[nat]
299EXTERNAL_ADDRESS = 127.0.0.1
300INTERNAL_ADDRESS = 127.0.0.1
301BINDTO = 127.0.0.1
302BEHIND_NAT = NO
303PUNCHED_NAT = NO
304ENABLE_UPNP = NO
305USE_LOCALADDR = YES
306USE_HOSTNAME = NO
307ENABLE_ICMP_CLIENT = NO
308ENABLE_ICMP_SERVER = NO
309DISABLEV6 = YES
310RETURN_LOCAL_ADDRESSES = NO
311
312[gnunet-nat-server]
313HOSTNAME = gnunet.org
314PORT = 20020
315
316[statistics]
317AUTOSTART = YES
318PORT = 20019
319HOSTNAME = localhost
320HOME = $SERVICEHOME
321BINARY = gnunet-service-statistics
322ACCEPT_FROM = 127.0.0.1;
323ACCEPT_FROM6 = ::1;
324UNIXPATH = /tmp/test-service-statistics-16
325UNIX_MATCH_UID = NO 106UNIX_MATCH_UID = NO
326UNIX_MATCH_GID = YES 107WORKBITS = 22
108PORT = 20033
327 109
328[dht] 110[gns]
329AUTOSTART = YES 111AUTOSTART = YES
330PORT = 20018
331HOSTNAME = localhost
332HOME = $SERVICEHOME
333BINARY = gnunet-service-dht
334ACCEPT_FROM = 127.0.0.1;
335ACCEPT_FROM6 = ::1;
336BUCKET_SIZE = 4
337UNIXPATH = /tmp/test-service-dht-15
338UNIX_MATCH_UID = YES
339UNIX_MATCH_GID = YES
340
341[dhtcache]
342DATABASE = sqlite
343QUOTA = 1 MB
344
345[chat]
346UNIXPATH = /tmp/test-service-chat-b_no_nat_c-1
347UNIX_MATCH_UID = YES
348UNIX_MATCH_GID = YES
349
350[dv]
351UNIXPATH = /tmp/test-service-dv-b_no_nat_c-1
352UNIX_MATCH_UID = YES
353UNIX_MATCH_GID = YES
354 112
355[lockmanager] 113[transport-http]
356AUTOSTART = NO 114PORT = 20026
357[consensus]
358AUTOSTART = NO
359 115
116[transport-https]
117PORT = 20025
360 118
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index d6353e4e9..9fa6c4f33 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,348 +1,95 @@
1[PATHS] 1@INCLUDE@ test_defaults.conf
2SERVICEHOME = /tmp/c_no_nat_client_2/
3 2
4[gnunetd] 3[arm]
5#HOSTKEY = $SERVICEHOME/.hostkey 4UNIXPATH = /tmp/test-service-arm-32
6# HOSTKEY = hostkeys/0002-hostkey 5PORT = 20040
7 6
8[PEER] 7[dns]
9PRIVATE_KEY = hostkeys/c_no_nat_client_2 8UNIXPATH = /tmp/test-service-dns-33
10
11 9
12[resolver] 10[lockmanager]
13AUTOSTART = YES 11AUTOSTART = YES
14PORT = 20053
15HOSTNAME = localhost
16HOME = $SERVICEHOME
17BINARY = gnunet-service-resolver
18ACCEPT_FROM = 127.0.0.1;
19ACCEPT_FROM6 = ::1;
20UNIXPATH = /tmp/test-service-resolver-42
21UNIX_MATCH_UID = NO
22UNIX_MATCH_GID = NO
23 12
24[mesh] 13[core]
25AUTOSTART = YES 14UNIXPATH = /tmp/test-service-core-31
26PORT = 20052 15PORT = 20039
27HOSTNAME = localhost
28HOME = $SERVICEHOME
29BINARY = gnunet-service-mesh
30ACCEPT_FROM = 127.0.0.1;
31ACCEPT_FROM6 = ::1;
32UNIXPATH = /tmp/test-service-mesh-41
33UNIX_MATCH_UID = YES
34UNIX_MATCH_GID = YES
35 16
36[nse] 17[ats]
37AUTOSTART = YES 18UNIXPATH = /tmp/test-service-ats-37
38PORT = 20051 19PORT = 20048
39HOSTNAME = localhost
40HOME = $SERVICEHOME
41BINARY = gnunet-service-nse
42ACCEPT_FROM = 127.0.0.1;
43ACCEPT_FROM6 = ::1;
44UNIXPATH = /tmp/test-service-nse-40
45UNIX_MATCH_UID = YES
46UNIX_MATCH_GID = YES
47PROOFFILE = $SERVICEHOME/.nse-proof
48HISTOGRAM = $SERVICEHOME/nse-history.log
49WORKDELAY = 5 ms
50INTERVAL = 1 h
51WORKBITS = 1
52 20
53[topology] 21[mesh]
54MINIMUM-FRIENDS = 0 22UNIXPATH = /tmp/test-service-mesh-41
55FRIENDS-ONLY = NO 23PORT = 20052
56AUTOCONNECT = YES
57TARGET-CONNECTION-COUNT = 16
58FRIENDS = $SERVICEHOME/friends
59BINARY = gnunet-daemon-topology
60 24
61[datastore] 25[datastore]
62AUTOSTART = YES
63UNIXPATH = /tmp/test-service-datastore-39 26UNIXPATH = /tmp/test-service-datastore-39
64UNIX_MATCH_UID = YES
65UNIX_MATCH_GID = YES
66PORT = 20050 27PORT = 20050
67HOSTNAME = localhost
68HOME = $SERVICEHOME
69BINARY = gnunet-service-datastore
70ACCEPT_FROM = 127.0.0.1;
71ACCEPT_FROM6 = ::1;
72QUOTA = 100 MB
73BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
74DATABASE = sqlite
75
76[datastore-sqlite]
77FILENAME = $SERVICEHOME/datastore/sqlite.db
78
79[datastore-postgres]
80CONFIG = connect_timeout=10; dbname=gnunet
81 28
82[datastore-mysql] 29[resolver]
83DATABASE = gnunet 30UNIXPATH = /tmp/test-service-resolver-42
84CONFIG = ~/.my.cnf 31PORT = 20053
85 32
86[peerinfo] 33[dht]
87USE_INCLUDED_HELLOS = NO 34UNIXPATH = /tmp/test-service-dht-29
88AUTOSTART = YES 35PORT = 20036
89PORT = 20049
90HOSTNAME = localhost
91HOME = $SERVICEHOME
92BINARY = gnunet-service-peerinfo
93ACCEPT_FROM = 127.0.0.1;
94ACCEPT_FROM6 = ::1;
95UNIXPATH = /tmp/test-service-peerinfo-38
96UNIX_MATCH_UID = NO
97UNIX_MATCH_GID = YES
98HOSTS = $SERVICEHOME/data/hosts/
99 36
100[client] 37[nat]
101HOME = $SERVICEHOME 38BEHIND_NAT = NO
102 39
103[TESTING] 40[gnunet-nat-server]
104WEAKRANDOM = NO 41PORT = 20038
105CONNECT_TIMEOUT = 30 s
106CONNECT_ATTEMPTS = 3
107MAX_OUTSTANDING_CONNECTIONS = 50
108DELETE_FILES = YES
109 42
110[ats] 43[fs]
111AUTOSTART = YES 44UNIXPATH = /tmp/test-service-fs-34
112PORT = 20048 45PORT = 20041
113HOSTNAME = localhost
114HOME = $SERVICEHOME
115BINARY = gnunet-service-ats
116ACCEPT_FROM = 127.0.0.1;
117ACCEPT_FROM6 = ::1;
118UNIXPATH = /tmp/test-service-ats-37
119UNIX_MATCH_UID = YES
120UNIX_MATCH_GID = YES
121WAN_QUOTA_IN = unlimited
122WAN_QUOTA_OUT = unlimited
123DUMP_MLP = NO
124DUMP_SOLUTION = NO
125DUMP_OVERWRITE = NO
126DUMP_MIN_PEERS = 0
127DUMP_MIN_ADDRS = 0
128ATS_MIN_INTERVAL = 15000
129ATS_EXEC_INTERVAL = 30000
130 46
131[transport] 47[transport]
132AUTOSTART = YES
133PORT = 20047
134HOSTNAME = localhost
135HOME = $SERVICEHOME
136BINARY = gnunet-service-transport
137NEIGHBOUR_LIMIT = 50
138ACCEPT_FROM = 127.0.0.1;
139ACCEPT_FROM6 = ::1;
140PLUGINS = tcp
141UNIXPATH = /tmp/test-service-transport-36 48UNIXPATH = /tmp/test-service-transport-36
142BLACKLIST_FILE = $SERVICEHOME/blacklist 49PORT = 20047
143UNIX_MATCH_UID = YES
144UNIX_MATCH_GID = YES
145 50
146[transport-tcp] 51[transport-tcp]
147PORT = 20046 52PORT = 20046
148ADVERTISED_PORT = 20046 53ADVERTISED_PORT = 20046
149MAX_CONNECTIONS = 128
150TIMEOUT = 5 s
151USE_LOCALADDR = YES
152 54
153[transport-udp] 55[transport-udp]
154PORT = 20045 56PORT = 20045
155BROADCAST = YES
156BROADCAST_INTERVAL = 30000
157MAX_BPS = 1000000
158USE_LOCALADDR = YES
159
160[transport-http]
161PORT = 20044
162MAX_CONNECTIONS = 128
163
164[transport-https]
165PORT = 20043
166CRYPTO_INIT = NORMAL
167KEY_FILE = https.key
168CERT_FILE = https.cert
169MAX_CONNECTIONS = 128
170
171[transport-wlan]
172INTERFACE = mon0
173TESTMODE = 0
174
175[datacache-mysql]
176DATABASE = gnunet
177CONFIG = ~/.my.cnf
178
179[datacache-postgres]
180CONFIG = connect_timeout=10; dbname=gnunet
181
182[template]
183AUTOSTART = NO
184PORT = 20042
185HOSTNAME = localhost
186HOME = $SERVICEHOME
187BINARY = gnunet-service-template
188ACCEPT_FROM = 127.0.0.1;
189ACCEPT_FROM6 = ::1;
190UNIXPATH = /tmp/test-service-template-35
191UNIX_MATCH_UID = YES
192UNIX_MATCH_GID = YES
193
194[fs]
195AUTOSTART = YES
196INDEXDB = $SERVICEHOME/idxinfo.lst
197TRUST = $SERVICEHOME/data/credit/
198IDENTITY_DIR = $SERVICEHOME/identities/
199STATE_DIR = $SERVICEHOME/persistence/
200UPDATE_DIR = $SERVICEHOME/updates/
201PORT = 20041
202HOSTNAME = localhost
203HOME = $SERVICEHOME
204BINARY = gnunet-service-fs
205ACCEPT_FROM = 127.0.0.1;
206ACCEPT_FROM6 = ::1;
207DELAY = YES
208CONTENT_CACHING = YES
209CONTENT_PUSHING = YES
210UNIXPATH = /tmp/test-service-fs-34
211UNIX_MATCH_UID = NO
212UNIX_MATCH_GID = YES
213MAX_PENDING_REQUESTS = 65536
214MIN_MIGRATION_DELAY = 100 ms
215EXPECTED_NEIGHBOUR_COUNT = 128
216
217[vpn]
218BINARY = gnunet-daemon-vpn
219IPV6ADDR = 1234::1
220IPV6PREFIX = 32
221IPV4ADDR = 10.11.10.1
222IPV4MASK = 255.255.0.0
223VIRTDNS = 10.11.10.2
224VIRTDNS6 = 1234::17
225IFNAME = vpn-gnunet
226
227[exit]
228BINARY = gnunet-daemon-exit
229IPV6ADDR = 1234:1::1
230IPV6PREFIX = 32
231IPV4ADDR = 10.10.1.1
232IPV4MASK = 255.255.0.0
233IFNAME = exit-gnunet
234ENABLE_UDP = NO
235ENABLE_TCP = NO
236
237[dns]
238AUTOSTART = YES
239PORT = 0
240HOSTNAME = localhost
241HOME = $SERVICEHOME
242BINARY = gnunet-service-dns
243ACCEPT_FROM = 127.0.0.1;
244ACCEPT_FROM6 = ::1;
245UNIXPATH = /tmp/test-service-dns-33
246PROVIDE_EXIT = NO
247
248[arm]
249PORT = 20040
250HOSTNAME = localhost
251HOME = $SERVICEHOME
252BINARY = gnunet-service-arm
253ACCEPT_FROM = 127.0.0.1;
254ACCEPT_FROM6 = ::1;
255DEFAULTSERVICES = topology hostlist fs
256UNIXPATH = /tmp/test-service-arm-32
257UNIX_MATCH_UID = YES
258UNIX_MATCH_GID = YES
259 57
260[hostlist] 58[hostlist]
261HTTPPORT = 8080
262HOME = $SERVICEHOME
263HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
264BINARY = gnunet-daemon-hostlist
265OPTIONS = -b
266SERVERS = http://localhost:8080/ 59SERVERS = http://localhost:8080/
267HTTP-PROXY =
268 60
269[core] 61[vpn]
270AUTOSTART = YES 62UNIXPATH = /tmp/gnunet-service-vpn.sock
271PORT = 20039
272HOSTNAME = localhost
273HOME = $SERVICEHOME
274BINARY = gnunet-service-core
275ACCEPT_FROM = 127.0.0.1;
276ACCEPT_FROM6 = ::1;
277UNIXPATH = /tmp/test-service-core-31
278UNIX_MATCH_UID = YES
279UNIX_MATCH_GID = YES
280 63
281[nat] 64[dv]
282BEHIND_NAT = NO 65UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2
283PUNCHED_NAT = NO
284ENABLE_UPNP = NO
285USE_LOCALADDR = YES
286USE_HOSTNAME = NO
287ENABLE_ICMP_CLIENT = NO
288ENABLE_ICMP_SERVER = NO
289DISABLEV6 = YES
290RETURN_LOCAL_ADDRESSES = NO
291EXTERNAL_ADDRESS = 127.0.0.1
292INTERNAL_ADDRESS = 127.0.0.1
293BINDTO = 127.0.0.1
294 66
295[gnunet-nat-server] 67[peerinfo]
296HOSTNAME = gnunet.org 68UNIXPATH = /tmp/test-service-peerinfo-38
297PORT = 20038 69PORT = 20049
298 70
299[statistics] 71[statistics]
300AUTOSTART = YES
301PORT = 20037
302HOSTNAME = localhost
303HOME = $SERVICEHOME
304BINARY = gnunet-service-statistics
305ACCEPT_FROM = 127.0.0.1;
306ACCEPT_FROM6 = ::1;
307UNIXPATH = /tmp/test-service-statistics-30 72UNIXPATH = /tmp/test-service-statistics-30
308UNIX_MATCH_UID = NO 73PORT = 20037
309UNIX_MATCH_GID = YES
310
311[dht]
312AUTOSTART = YES
313PORT = 20036
314HOSTNAME = localhost
315HOME = $SERVICEHOME
316BINARY = gnunet-service-dht
317ACCEPT_FROM = 127.0.0.1;
318ACCEPT_FROM6 = ::1;
319BUCKET_SIZE = 4
320UNIXPATH = /tmp/test-service-dht-29
321UNIX_MATCH_UID = YES
322UNIX_MATCH_GID = YES
323
324[dhtcache]
325DATABASE = sqlite
326QUOTA = 1 MB
327
328[chat]
329UNIXPATH = /tmp/test-service-chat-b_no_nat_c-2
330UNIX_MATCH_UID = YES
331UNIX_MATCH_GID = YES
332 74
333[dv] 75[PATHS]
334UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2 76SERVICEHOME = /tmp/c_no_nat_client_2/
335UNIX_MATCH_UID = YES 77DEFAULTCONFIG = c_no_nat_client_2.conf
336UNIX_MATCH_GID = YES
337 78
338[gns] 79[PEER]
339AUTOSTART = NO 80PRIVATE_KEY = hostkeys/c_no_nat_client_2
340 81
341[namestore] 82[template]
342AUTOSTART = NO 83PORT = 20042
84UNIXPATH = /tmp/test-service-template-35
343 85
86[nse]
87UNIXPATH = /tmp/test-service-nse-40
88PORT = 20051
344 89
345[consensus] 90[transport-http]
346AUTOSTART = NO 91PORT = 20044
347 92
93[transport-https]
94PORT = 20043
348 95
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf
index c0c4aa8a5..d720b7ecd 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -1,356 +1,94 @@
1[PATHS] 1[arm]
2SERVICEHOME = /tmp/c_no_nat_client/ 2DEFAULTSERVICES = topology hostlist fs core
3 3UNIXPATH = /tmp/test-service-arm-18
4[gnunetd] 4PORT = 20022
5#HOSTKEY = $SERVICEHOME/.hostkey
6HOSTKEY = hostkeys/0001-hostkey
7
8[gns]
9AUTOSTART = NO
10 5
11[namestore] 6[dns]
12AUTOSTART = NO 7UNIXPATH = /tmp/test-service-dns-19
13 8
14[vpn] 9[lockmanager]
15AUTOSTART = YES 10AUTOSTART = YES
16PORT = 0
17HOSTNAME = localhost
18HOME = $SERVICEHOME
19BINARY = gnunet-service-dns
20ACCEPT_FROM = 127.0.0.1;
21ACCEPT_FROM6 = ::1;
22UNIXPATH = /tmp/gnunet-service-vpn-29
23 11
24[resolver] 12[core]
25AUTOSTART = YES 13UNIXPATH = /tmp/test-service-core-17
26PORT = 20035 14PORT = 20021
27HOSTNAME = localhost 15
28HOME = $SERVICEHOME 16[ats]
29BINARY = gnunet-service-resolver 17UNIXPATH = /tmp/test-service-ats-23
30ACCEPT_FROM = 127.0.0.1; 18PORT = 20030
31ACCEPT_FROM6 = ::1;
32UNIXPATH = /tmp/test-service-resolver-28
33UNIX_MATCH_UID = NO
34UNIX_MATCH_GID = NO
35 19
36[mesh] 20[mesh]
37AUTOSTART = YES
38PORT = 20034
39HOSTNAME = localhost
40HOME = $SERVICEHOME
41BINARY = gnunet-service-mesh
42ACCEPT_FROM = 127.0.0.1;
43ACCEPT_FROM6 = ::1;
44UNIXPATH = /tmp/test-service-mesh-27 21UNIXPATH = /tmp/test-service-mesh-27
45UNIX_MATCH_UID = YES 22PORT = 20034
46UNIX_MATCH_GID = YES
47
48[nse]
49AUTOSTART = YES
50PORT = 20033
51HOSTNAME = localhost
52HOME = $SERVICEHOME
53BINARY = gnunet-service-nse
54ACCEPT_FROM = 127.0.0.1;
55ACCEPT_FROM6 = ::1;
56UNIXPATH = /tmp/test-service-nse-26
57UNIX_MATCH_UID = YES
58UNIX_MATCH_GID = YES
59PROOFFILE = $SERVICEHOME/.nse-proof
60HISTOGRAM = $SERVICEHOME/nse-history.log
61WORKDELAY = 5 ms
62INTERVAL = 1 h
63WORKBITS = 1
64
65[topology]
66MINIMUM-FRIENDS = 0
67FRIENDS-ONLY = NO
68AUTOCONNECT = YES
69TARGET-CONNECTION-COUNT = 16
70FRIENDS = $SERVICEHOME/friends
71BINARY = gnunet-daemon-topology
72 23
73[datastore] 24[datastore]
74AUTOSTART = YES
75UNIXPATH = /tmp/test-service-datastore-25 25UNIXPATH = /tmp/test-service-datastore-25
76UNIX_MATCH_UID = YES
77UNIX_MATCH_GID = YES
78PORT = 20032 26PORT = 20032
79HOSTNAME = localhost
80HOME = $SERVICEHOME
81BINARY = gnunet-service-datastore
82ACCEPT_FROM = 127.0.0.1;
83ACCEPT_FROM6 = ::1;
84QUOTA = 100 MB
85BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
86DATABASE = sqlite
87
88[datastore-sqlite]
89FILENAME = $SERVICEHOME/datastore/sqlite.db
90 27
91[datastore-postgres] 28[resolver]
92CONFIG = connect_timeout=10; dbname=gnunet 29UNIXPATH = /tmp/test-service-resolver-28
93 30PORT = 20035
94[datastore-mysql]
95DATABASE = gnunet
96CONFIG = ~/.my.cnf
97 31
98[peerinfo] 32[dht]
99AUTOSTART = YES 33UNIXPATH = /tmp/test-service-dht-15
100PORT = 20031 34PORT = 20018
101HOSTNAME = localhost
102HOME = $SERVICEHOME
103BINARY = gnunet-service-peerinfo
104ACCEPT_FROM = 127.0.0.1;
105ACCEPT_FROM6 = ::1;
106UNIXPATH = /tmp/test-service-peerinfo-24
107UNIX_MATCH_UID = NO
108UNIX_MATCH_GID = YES
109HOSTS = $SERVICEHOME/data/hosts/
110 35
111[client] 36[nat]
112HOME = $SERVICEHOME 37BEHIND_NAT = NO
113 38
114[TESTING] 39[gnunet-nat-server]
115WEAKRANDOM = NO 40PORT = 20020
116CONNECT_TIMEOUT = 30 s
117CONNECT_ATTEMPTS = 3
118MAX_OUTSTANDING_CONNECTIONS = 50
119DELETE_FILES = YES
120 41
121[ats] 42[fs]
122AUTOSTART = YES 43UNIXPATH = /tmp/test-service-fs-20
123PORT = 20030 44PORT = 20023
124HOSTNAME = localhost
125HOME = $SERVICEHOME
126BINARY = gnunet-service-ats
127ACCEPT_FROM = 127.0.0.1;
128ACCEPT_FROM6 = ::1;
129UNIXPATH = /tmp/test-service-ats-23
130UNIX_MATCH_UID = YES
131UNIX_MATCH_GID = YES
132WAN_QUOTA_IN = unlimited
133WAN_QUOTA_OUT = unlimited
134DUMP_MLP = NO
135DUMP_SOLUTION = NO
136DUMP_OVERWRITE = NO
137DUMP_MIN_PEERS = 0
138DUMP_MIN_ADDRS = 0
139ATS_MIN_INTERVAL = 15000
140ATS_EXEC_INTERVAL = 30000
141 45
142[transport] 46[transport]
143PREFIX = valgrind --leak-check=full
144AUTOSTART = YES
145PORT = 20029
146HOSTNAME = localhost
147HOME = $SERVICEHOME
148BINARY = gnunet-service-transport
149NEIGHBOUR_LIMIT = 50
150ACCEPT_FROM = 127.0.0.1;
151ACCEPT_FROM6 = ::1;
152PLUGINS = http 47PLUGINS = http
153UNIXPATH = /tmp/test-service-transport-22 48UNIXPATH = /tmp/test-service-transport-22
154BLACKLIST_FILE = $SERVICEHOME/blacklist 49PORT = 20029
155UNIX_MATCH_UID = YES
156UNIX_MATCH_GID = YES
157 50
158[transport-tcp] 51[transport-tcp]
159USE_LOCALADDR = YES
160PORT = 20028 52PORT = 20028
161ADVERTISED_PORT = 20028 53ADVERTISED_PORT = 20028
162MAX_CONNECTIONS = 128
163TIMEOUT = 5 s
164 54
165[transport-udp] 55[transport-udp]
166USE_LOCALADDR = YES
167PORT = 20027 56PORT = 20027
168BROADCAST = YES
169BROADCAST_INTERVAL = 30000
170MAX_BPS = 1000000
171
172[transport-http]
173PORT = 20026
174MAX_CONNECTIONS = 128
175
176[transport-https]
177PORT = 20025
178CRYPTO_INIT = NORMAL
179KEY_FILE = https.key
180CERT_FILE = https.cert
181MAX_CONNECTIONS = 128
182
183[transport-wlan]
184INTERFACE = mon0
185TESTMODE = 0
186
187[datacache-mysql]
188DATABASE = gnunet
189CONFIG = ~/.my.cnf
190
191[datacache-postgres]
192CONFIG = connect_timeout=10; dbname=gnunet
193
194[template]
195AUTOSTART = NO
196PORT = 20024
197HOSTNAME = localhost
198HOME = $SERVICEHOME
199BINARY = gnunet-service-template
200ACCEPT_FROM = 127.0.0.1;
201ACCEPT_FROM6 = ::1;
202UNIXPATH = /tmp/test-service-template-21
203UNIX_MATCH_UID = YES
204UNIX_MATCH_GID = YES
205
206[fs]
207AUTOSTART = YES
208INDEXDB = $SERVICEHOME/idxinfo.lst
209TRUST = $SERVICEHOME/data/credit/
210IDENTITY_DIR = $SERVICEHOME/identities/
211STATE_DIR = $SERVICEHOME/persistence/
212UPDATE_DIR = $SERVICEHOME/updates/
213PORT = 20023
214HOSTNAME = localhost
215HOME = $SERVICEHOME
216BINARY = gnunet-service-fs
217ACCEPT_FROM = 127.0.0.1;
218ACCEPT_FROM6 = ::1;
219DELAY = YES
220CONTENT_CACHING = YES
221CONTENT_PUSHING = YES
222UNIXPATH = /tmp/test-service-fs-20
223UNIX_MATCH_UID = NO
224UNIX_MATCH_GID = YES
225MAX_PENDING_REQUESTS = 65536
226MIN_MIGRATION_DELAY = 100 ms
227EXPECTED_NEIGHBOUR_COUNT = 128
228
229[vpn]
230BINARY = gnunet-daemon-vpn
231IPV6ADDR = 1234::1
232IPV6PREFIX = 32
233IPV4ADDR = 10.11.10.1
234IPV4MASK = 255.255.0.0
235VIRTDNS = 10.11.10.2
236VIRTDNS6 = 1234::17
237IFNAME = vpn-gnunet
238
239[exit]
240BINARY = gnunet-daemon-exit
241IPV6ADDR = 1234:1::1
242IPV6PREFIX = 32
243IPV4ADDR = 10.10.1.1
244IPV4MASK = 255.255.0.0
245IFNAME = exit-gnunet
246ENABLE_UDP = NO
247ENABLE_TCP = NO
248
249[dns]
250AUTOSTART = YES
251PORT = 0
252HOSTNAME = localhost
253HOME = $SERVICEHOME
254BINARY = gnunet-service-dns
255ACCEPT_FROM = 127.0.0.1;
256ACCEPT_FROM6 = ::1;
257UNIXPATH = /tmp/test-service-dns-19
258PROVIDE_EXIT = NO
259
260[arm]
261PORT = 20022
262HOSTNAME = localhost
263HOME = $SERVICEHOME
264BINARY = gnunet-service-arm
265ACCEPT_FROM = 127.0.0.1;
266ACCEPT_FROM6 = ::1;
267DEFAULTSERVICES = topology hostlist fs core
268UNIXPATH = /tmp/test-service-arm-18
269UNIX_MATCH_UID = YES
270UNIX_MATCH_GID = YES
271 57
272[hostlist] 58[hostlist]
273HTTPPORT = 8080
274HOME = $SERVICEHOME
275HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
276BINARY = gnunet-daemon-hostlist
277OPTIONS = -b
278SERVERS = http://localhost:8080/ 59SERVERS = http://localhost:8080/
279HTTP-PROXY =
280 60
281[core] 61[vpn]
282AUTOSTART = YES 62UNIXPATH = /tmp/gnunet-service-vpn-29
283PORT = 20021
284HOSTNAME = localhost
285HOME = $SERVICEHOME
286BINARY = gnunet-service-core
287ACCEPT_FROM = 127.0.0.1;
288ACCEPT_FROM6 = ::1;
289UNIXPATH = /tmp/test-service-core-17
290UNIX_MATCH_UID = YES
291UNIX_MATCH_GID = YES
292 63
293[nat] 64[dv]
294EXTERNAL_ADDRESS = 127.0.0.1 65UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-1
295INTERNAL_ADDRESS = 127.0.0.1
296BINDTO = 127.0.0.1
297BEHIND_NAT = NO
298PUNCHED_NAT = NO
299ENABLE_UPNP = NO
300USE_LOCALADDR = YES
301USE_HOSTNAME = NO
302ENABLE_ICMP_CLIENT = NO
303ENABLE_ICMP_SERVER = NO
304DISABLEV6 = YES
305RETURN_LOCAL_ADDRESSES = NO
306HOSTNAME_DNS_FREQUENCY = 1200000
307IFC_SCAN_FREQUENCY = 3000000
308DYNDNS_FREQUENCY = 140000
309 66
310[gnunet-nat-server] 67[peerinfo]
311HOSTNAME = gnunet.org 68UNIXPATH = /tmp/test-service-peerinfo-24
312PORT = 20020 69USE_INCLUDED_HELLOS = YES
70PORT = 20031
313 71
314[statistics] 72[statistics]
315AUTOSTART = YES
316PORT = 20019
317HOSTNAME = localhost
318HOME = $SERVICEHOME
319BINARY = gnunet-service-statistics
320ACCEPT_FROM = 127.0.0.1;
321ACCEPT_FROM6 = ::1;
322UNIXPATH = /tmp/test-service-statistics-16 73UNIXPATH = /tmp/test-service-statistics-16
323UNIX_MATCH_UID = NO 74PORT = 20019
324UNIX_MATCH_GID = YES
325 75
326[dht] 76[PATHS]
327AUTOSTART = YES 77SERVICEHOME = /tmp/c_no_nat_client/
328PORT = 20018 78DEFAULTCONFIG = c_no_nat_client_http.conf
329HOSTNAME = localhost
330HOME = $SERVICEHOME
331BINARY = gnunet-service-dht
332ACCEPT_FROM = 127.0.0.1;
333ACCEPT_FROM6 = ::1;
334BUCKET_SIZE = 4
335UNIXPATH = /tmp/test-service-dht-15
336UNIX_MATCH_UID = YES
337UNIX_MATCH_GID = YES
338 79
339[chat] 80[template]
340UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-1 81PORT = 20024
341UNIX_MATCH_UID = YES 82UNIXPATH = /tmp/test-service-template-21
342UNIX_MATCH_GID = YES
343 83
344[dv] 84[nse]
345UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-1 85UNIXPATH = /tmp/test-service-nse-26
346UNIX_MATCH_UID = YES 86PORT = 20033
347UNIX_MATCH_GID = YES
348 87
349[dhtcache] 88[transport-http]
350DATABASE = sqlite 89PORT = 20026
351QUOTA = 1 MB
352 90
353[consensus] 91[transport-https]
354AUTOSTART = NO 92PORT = 20025
355 93
356 94
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf
index 935b0b374..761d6c0c9 100644
--- a/src/integration-tests/confs/c_no_nat_client_http_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf
@@ -1,347 +1,94 @@
1[PATHS] 1@INCLUDE@ test_defaults.conf
2SERVICEHOME = /tmp/c_no_nat_client_2/
3 2
4[gnunetd] 3[arm]
5#HOSTKEY = $SERVICEHOME/.hostkey 4DEFAULTSERVICES = topology hostlist fs core
6HOSTKEY = hostkeys/0002-hostkey 5UNIXPATH = /tmp/test-service-arm-32
7 6PORT = 20040
8[gns]
9AUTOSTART = NO
10 7
11[namestore] 8[dns]
12AUTOSTART = NO 9UNIXPATH = /tmp/test-service-dns-33
13 10
14[resolver] 11[lockmanager]
15AUTOSTART = YES 12AUTOSTART = YES
16PORT = 20053
17HOSTNAME = localhost
18HOME = $SERVICEHOME
19BINARY = gnunet-service-resolver
20ACCEPT_FROM = 127.0.0.1;
21ACCEPT_FROM6 = ::1;
22UNIXPATH = /tmp/test-service-resolver-42
23UNIX_MATCH_UID = NO
24UNIX_MATCH_GID = NO
25 13
26[mesh] 14[core]
27AUTOSTART = YES 15UNIXPATH = /tmp/test-service-core-31
28PORT = 20052 16PORT = 20039
29HOSTNAME = localhost
30HOME = $SERVICEHOME
31BINARY = gnunet-service-mesh
32ACCEPT_FROM = 127.0.0.1;
33ACCEPT_FROM6 = ::1;
34UNIXPATH = /tmp/test-service-mesh-41
35UNIX_MATCH_UID = YES
36UNIX_MATCH_GID = YES
37 17
38[nse] 18[ats]
39AUTOSTART = YES 19UNIXPATH = /tmp/test-service-ats-37
40PORT = 20051 20PORT = 20048
41HOSTNAME = localhost
42HOME = $SERVICEHOME
43BINARY = gnunet-service-nse
44ACCEPT_FROM = 127.0.0.1;
45ACCEPT_FROM6 = ::1;
46UNIXPATH = /tmp/test-service-nse-40
47UNIX_MATCH_UID = YES
48UNIX_MATCH_GID = YES
49PROOFFILE = $SERVICEHOME/.nse-proof
50HISTOGRAM = $SERVICEHOME/nse-history.log
51WORKDELAY = 5 ms
52INTERVAL = 1 h
53WORKBITS = 1
54 21
55[topology] 22[mesh]
56MINIMUM-FRIENDS = 0 23UNIXPATH = /tmp/test-service-mesh-41
57FRIENDS-ONLY = NO 24PORT = 20052
58AUTOCONNECT = YES
59TARGET-CONNECTION-COUNT = 16
60FRIENDS = $SERVICEHOME/friends
61BINARY = gnunet-daemon-topology
62 25
63[datastore] 26[datastore]
64AUTOSTART = YES
65UNIXPATH = /tmp/test-service-datastore-39 27UNIXPATH = /tmp/test-service-datastore-39
66UNIX_MATCH_UID = YES
67UNIX_MATCH_GID = YES
68PORT = 20050 28PORT = 20050
69HOSTNAME = localhost
70HOME = $SERVICEHOME
71BINARY = gnunet-service-datastore
72ACCEPT_FROM = 127.0.0.1;
73ACCEPT_FROM6 = ::1;
74QUOTA = 100 MB
75BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
76DATABASE = sqlite
77
78[datastore-sqlite]
79FILENAME = $SERVICEHOME/datastore/sqlite.db
80 29
81[datastore-postgres] 30[resolver]
82CONFIG = connect_timeout=10; dbname=gnunet 31UNIXPATH = /tmp/test-service-resolver-42
83 32PORT = 20053
84[datastore-mysql]
85DATABASE = gnunet
86CONFIG = ~/.my.cnf
87 33
88[peerinfo] 34[dht]
89AUTOSTART = YES 35UNIXPATH = /tmp/test-service-dht-29
90PORT = 20049 36PORT = 20036
91HOSTNAME = localhost
92HOME = $SERVICEHOME
93BINARY = gnunet-service-peerinfo
94ACCEPT_FROM = 127.0.0.1;
95ACCEPT_FROM6 = ::1;
96UNIXPATH = /tmp/test-service-peerinfo-38
97UNIX_MATCH_UID = NO
98UNIX_MATCH_GID = YES
99HOSTS = $SERVICEHOME/data/hosts/
100 37
101[client] 38[nat]
102HOME = $SERVICEHOME 39BEHIND_NAT = NO
103 40
104[TESTING] 41[gnunet-nat-server]
105WEAKRANDOM = NO 42PORT = 20038
106CONNECT_TIMEOUT = 30 s
107CONNECT_ATTEMPTS = 3
108MAX_OUTSTANDING_CONNECTIONS = 50
109DELETE_FILES = YES
110 43
111[ats] 44[fs]
112AUTOSTART = YES 45UNIXPATH = /tmp/test-service-fs-34
113PORT = 20048 46PORT = 20041
114HOSTNAME = localhost
115HOME = $SERVICEHOME
116BINARY = gnunet-service-ats
117ACCEPT_FROM = 127.0.0.1;
118ACCEPT_FROM6 = ::1;
119UNIXPATH = /tmp/test-service-ats-37
120UNIX_MATCH_UID = YES
121UNIX_MATCH_GID = YES
122WAN_QUOTA_IN = unlimited
123WAN_QUOTA_OUT = unlimited
124DUMP_MLP = NO
125DUMP_SOLUTION = NO
126DUMP_OVERWRITE = NO
127DUMP_MIN_PEERS = 0
128DUMP_MIN_ADDRS = 0
129ATS_MIN_INTERVAL = 15000
130ATS_EXEC_INTERVAL = 30000
131 47
132[transport] 48[transport]
133PREFIX = valgrind --leak-check=full
134#PREFIX = gdb --args
135AUTOSTART = YES
136PORT = 20047
137HOSTNAME = localhost
138HOME = $SERVICEHOME
139BINARY = gnunet-service-transport
140NEIGHBOUR_LIMIT = 50
141ACCEPT_FROM = 127.0.0.1;
142ACCEPT_FROM6 = ::1;
143PLUGINS = http 49PLUGINS = http
144UNIXPATH = /tmp/test-service-transport-36 50UNIXPATH = /tmp/test-service-transport-36
145BLACKLIST_FILE = $SERVICEHOME/blacklist 51PORT = 20047
146UNIX_MATCH_UID = YES
147UNIX_MATCH_GID = YES
148 52
149[transport-tcp] 53[transport-tcp]
150PORT = 20046 54PORT = 20046
151ADVERTISED_PORT = 20046 55ADVERTISED_PORT = 20046
152MAX_CONNECTIONS = 128
153TIMEOUT = 5 s
154USE_LOCALADDR = YES
155 56
156[transport-udp] 57[transport-udp]
157PORT = 20045 58PORT = 20045
158BROADCAST = YES
159BROADCAST_INTERVAL = 30000
160MAX_BPS = 1000000
161USE_LOCALADDR = YES
162
163[transport-http]
164PORT = 20044
165MAX_CONNECTIONS = 128
166
167[transport-https]
168PORT = 20043
169CRYPTO_INIT = NORMAL
170KEY_FILE = https.key
171CERT_FILE = https.cert
172MAX_CONNECTIONS = 128
173
174[transport-wlan]
175INTERFACE = mon0
176TESTMODE = 0
177
178[datacache-mysql]
179DATABASE = gnunet
180CONFIG = ~/.my.cnf
181
182[datacache-postgres]
183CONFIG = connect_timeout=10; dbname=gnunet
184
185[template]
186AUTOSTART = NO
187PORT = 20042
188HOSTNAME = localhost
189HOME = $SERVICEHOME
190BINARY = gnunet-service-template
191ACCEPT_FROM = 127.0.0.1;
192ACCEPT_FROM6 = ::1;
193UNIXPATH = /tmp/test-service-template-35
194UNIX_MATCH_UID = YES
195UNIX_MATCH_GID = YES
196
197[fs]
198AUTOSTART = YES
199INDEXDB = $SERVICEHOME/idxinfo.lst
200TRUST = $SERVICEHOME/data/credit/
201IDENTITY_DIR = $SERVICEHOME/identities/
202STATE_DIR = $SERVICEHOME/persistence/
203UPDATE_DIR = $SERVICEHOME/updates/
204PORT = 20041
205HOSTNAME = localhost
206HOME = $SERVICEHOME
207BINARY = gnunet-service-fs
208ACCEPT_FROM = 127.0.0.1;
209ACCEPT_FROM6 = ::1;
210DELAY = YES
211CONTENT_CACHING = YES
212CONTENT_PUSHING = YES
213UNIXPATH = /tmp/test-service-fs-34
214UNIX_MATCH_UID = NO
215UNIX_MATCH_GID = YES
216MAX_PENDING_REQUESTS = 65536
217MIN_MIGRATION_DELAY = 100 ms
218EXPECTED_NEIGHBOUR_COUNT = 128
219
220[vpn]
221BINARY = gnunet-daemon-vpn
222IPV6ADDR = 1234::1
223IPV6PREFIX = 32
224IPV4ADDR = 10.11.10.1
225IPV4MASK = 255.255.0.0
226VIRTDNS = 10.11.10.2
227VIRTDNS6 = 1234::17
228IFNAME = vpn-gnunet
229
230[exit]
231BINARY = gnunet-daemon-exit
232IPV6ADDR = 1234:1::1
233IPV6PREFIX = 32
234IPV4ADDR = 10.10.1.1
235IPV4MASK = 255.255.0.0
236IFNAME = exit-gnunet
237ENABLE_UDP = NO
238ENABLE_TCP = NO
239
240[dns]
241AUTOSTART = YES
242PORT = 0
243HOSTNAME = localhost
244HOME = $SERVICEHOME
245BINARY = gnunet-service-dns
246ACCEPT_FROM = 127.0.0.1;
247ACCEPT_FROM6 = ::1;
248UNIXPATH = /tmp/test-service-dns-33
249PROVIDE_EXIT = NO
250
251[arm]
252PORT = 20040
253HOSTNAME = localhost
254HOME = $SERVICEHOME
255BINARY = gnunet-service-arm
256ACCEPT_FROM = 127.0.0.1;
257ACCEPT_FROM6 = ::1;
258DEFAULTSERVICES = topology hostlist fs core
259UNIXPATH = /tmp/test-service-arm-32
260UNIX_MATCH_UID = YES
261UNIX_MATCH_GID = YES
262 59
263[hostlist] 60[hostlist]
264HTTPPORT = 8080
265HOME = $SERVICEHOME
266HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
267BINARY = gnunet-daemon-hostlist
268OPTIONS = -b
269SERVERS = http://localhost:8080/ 61SERVERS = http://localhost:8080/
270HTTP-PROXY =
271 62
272[core] 63[vpn]
273AUTOSTART = YES 64UNIXPATH = /tmp/gnunet-service-vpn.sock
274PORT = 20039
275HOSTNAME = localhost
276HOME = $SERVICEHOME
277BINARY = gnunet-service-core
278ACCEPT_FROM = 127.0.0.1;
279ACCEPT_FROM6 = ::1;
280UNIXPATH = /tmp/test-service-core-31
281UNIX_MATCH_UID = YES
282UNIX_MATCH_GID = YES
283 65
284[nat] 66[dv]
285BEHIND_NAT = NO 67UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-2
286PUNCHED_NAT = NO
287ENABLE_UPNP = NO
288USE_LOCALADDR = YES
289USE_HOSTNAME = NO
290ENABLE_ICMP_CLIENT = NO
291ENABLE_ICMP_SERVER = NO
292DISABLEV6 = YES
293RETURN_LOCAL_ADDRESSES = NO
294HOSTNAME_DNS_FREQUENCY = 1200000
295IFC_SCAN_FREQUENCY = 3000000
296DYNDNS_FREQUENCY = 140000
297EXTERNAL_ADDRESS = 127.0.0.1
298INTERNAL_ADDRESS = 127.0.0.1
299BINDTO = 127.0.0.1
300 68
301[gnunet-nat-server] 69[peerinfo]
302HOSTNAME = gnunet.org 70UNIXPATH = /tmp/test-service-peerinfo-38
303PORT = 20038 71USE_INCLUDED_HELLOS = YES
72PORT = 20049
304 73
305[statistics] 74[statistics]
306AUTOSTART = YES
307PORT = 20037
308HOSTNAME = localhost
309HOME = $SERVICEHOME
310BINARY = gnunet-service-statistics
311ACCEPT_FROM = 127.0.0.1;
312ACCEPT_FROM6 = ::1;
313UNIXPATH = /tmp/test-service-statistics-30 75UNIXPATH = /tmp/test-service-statistics-30
314UNIX_MATCH_UID = NO 76PORT = 20037
315UNIX_MATCH_GID = YES
316
317[dht]
318AUTOSTART = YES
319PORT = 20036
320HOSTNAME = localhost
321HOME = $SERVICEHOME
322BINARY = gnunet-service-dht
323ACCEPT_FROM = 127.0.0.1;
324ACCEPT_FROM6 = ::1;
325BUCKET_SIZE = 4
326UNIXPATH = /tmp/test-service-dht-29
327UNIX_MATCH_UID = YES
328UNIX_MATCH_GID = YES
329
330[dhtcache]
331DATABASE = sqlite
332QUOTA = 1 MB
333 77
334[chat] 78[PATHS]
335UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-2 79SERVICEHOME = /tmp/c_no_nat_client_2/
336UNIX_MATCH_UID = YES 80DEFAULTCONFIG = c_no_nat_client_http_2.conf
337UNIX_MATCH_GID = YES
338 81
339[dv] 82[template]
340UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-2 83PORT = 20042
341UNIX_MATCH_UID = YES 84UNIXPATH = /tmp/test-service-template-35
342UNIX_MATCH_GID = YES
343 85
344[consensus] 86[nse]
345AUTOSTART = NO 87UNIXPATH = /tmp/test-service-nse-40
88PORT = 20051
346 89
90[transport-http]
91PORT = 20044
347 92
93[transport-https]
94PORT = 20043
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf
index 56f55dd5f..1ae4673f8 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -1,359 +1,104 @@
1[PATHS] 1@INCLUDE@ test_defaults.conf
2SERVICEHOME = /tmp/c_no_nat_client/
3 2
4[gnunetd] 3[arm]
5#HOSTKEY = $SERVICEHOME/.hostkey 4DEFAULTSERVICES = topology hostlist fs core
6HOSTKEY = hostkeys/0001-hostkey 5UNIXPATH = /tmp/test-service-arm-18
7 6PORT = 20022
8[gns]
9AUTOSTART = NO
10 7
11[namestore] 8[dns]
12AUTOSTART = NO 9UNIXPATH = /tmp/test-service-dns-19
13 10
14[vpn] 11[lockmanager]
15AUTOSTART = YES 12AUTOSTART = YES
16PORT = 0
17HOSTNAME = localhost
18HOME = $SERVICEHOME
19BINARY = gnunet-service-dns
20ACCEPT_FROM = 127.0.0.1;
21ACCEPT_FROM6 = ::1;
22UNIXPATH = /tmp/gnunet-service-vpn-29
23 13
24[resolver] 14[core]
25AUTOSTART = YES 15UNIXPATH = /tmp/test-service-core-17
26PORT = 20035 16PORT = 20021
27HOSTNAME = localhost 17
28HOME = $SERVICEHOME 18[ats]
29BINARY = gnunet-service-resolver 19UNIXPATH = /tmp/test-service-ats-23
30ACCEPT_FROM = 127.0.0.1; 20PORT = 20030
31ACCEPT_FROM6 = ::1;
32UNIXPATH = /tmp/test-service-resolver-28
33UNIX_MATCH_UID = NO
34UNIX_MATCH_GID = NO
35 21
36[mesh] 22[mesh]
37AUTOSTART = YES
38PORT = 20034
39HOSTNAME = localhost
40HOME = $SERVICEHOME
41BINARY = gnunet-service-mesh
42ACCEPT_FROM = 127.0.0.1;
43ACCEPT_FROM6 = ::1;
44UNIXPATH = /tmp/test-service-mesh-27 23UNIXPATH = /tmp/test-service-mesh-27
45UNIX_MATCH_UID = YES 24PORT = 20034
46UNIX_MATCH_GID = YES
47
48[nse]
49AUTOSTART = YES
50PORT = 20033
51HOSTNAME = localhost
52HOME = $SERVICEHOME
53BINARY = gnunet-service-nse
54ACCEPT_FROM = 127.0.0.1;
55ACCEPT_FROM6 = ::1;
56UNIXPATH = /tmp/test-service-nse-26
57UNIX_MATCH_UID = YES
58UNIX_MATCH_GID = YES
59PROOFFILE = $SERVICEHOME/.nse-proof
60HISTOGRAM = $SERVICEHOME/nse-history.log
61WORKDELAY = 5 ms
62INTERVAL = 1 h
63WORKBITS = 1
64
65[topology]
66MINIMUM-FRIENDS = 0
67FRIENDS-ONLY = NO
68AUTOCONNECT = YES
69TARGET-CONNECTION-COUNT = 16
70FRIENDS = $SERVICEHOME/friends
71BINARY = gnunet-daemon-topology
72 25
73[datastore] 26[datastore]
74AUTOSTART = YES
75UNIXPATH = /tmp/test-service-datastore-25 27UNIXPATH = /tmp/test-service-datastore-25
76UNIX_MATCH_UID = YES
77UNIX_MATCH_GID = YES
78PORT = 20032 28PORT = 20032
79HOSTNAME = localhost
80HOME = $SERVICEHOME
81BINARY = gnunet-service-datastore
82ACCEPT_FROM = 127.0.0.1;
83ACCEPT_FROM6 = ::1;
84QUOTA = 100 MB
85BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
86DATABASE = sqlite
87
88[datastore-sqlite]
89FILENAME = $SERVICEHOME/datastore/sqlite.db
90 29
91[datastore-postgres] 30[resolver]
92CONFIG = connect_timeout=10; dbname=gnunet 31UNIXPATH = /tmp/test-service-resolver-28
93 32PORT = 20035
94[datastore-mysql]
95DATABASE = gnunet
96CONFIG = ~/.my.cnf
97 33
98[peerinfo] 34[dht]
99AUTOSTART = YES 35UNIXPATH = /tmp/test-service-dht-15
100PORT = 20031 36PORT = 20018
101HOSTNAME = localhost
102HOME = $SERVICEHOME
103BINARY = gnunet-service-peerinfo
104ACCEPT_FROM = 127.0.0.1;
105ACCEPT_FROM6 = ::1;
106UNIXPATH = /tmp/test-service-peerinfo-24
107UNIX_MATCH_UID = NO
108UNIX_MATCH_GID = YES
109HOSTS = $SERVICEHOME/data/hosts/
110 37
111[client] 38[nat]
112HOME = $SERVICEHOME 39BEHIND_NAT = NO
113 40
114[TESTING] 41[gnunet-nat-server]
115WEAKRANDOM = NO 42PORT = 20020
116CONNECT_TIMEOUT = 30 s
117CONNECT_ATTEMPTS = 3
118MAX_OUTSTANDING_CONNECTIONS = 50
119DELETE_FILES = YES
120 43
121[ats] 44[fs]
122AUTOSTART = YES 45UNIXPATH = /tmp/test-service-fs-20
123PORT = 20030 46PORT = 20023
124HOSTNAME = localhost
125HOME = $SERVICEHOME
126BINARY = gnunet-service-ats
127ACCEPT_FROM = 127.0.0.1;
128ACCEPT_FROM6 = ::1;
129UNIXPATH = /tmp/test-service-ats-23
130UNIX_MATCH_UID = YES
131UNIX_MATCH_GID = YES
132WAN_QUOTA_IN = unlimited
133WAN_QUOTA_OUT = unlimited
134DUMP_MLP = NO
135DUMP_SOLUTION = NO
136DUMP_OVERWRITE = NO
137DUMP_MIN_PEERS = 0
138DUMP_MIN_ADDRS = 0
139ATS_MIN_INTERVAL = 15000
140ATS_EXEC_INTERVAL = 30000
141 47
142[transport] 48[transport]
143PREFIX = valgrind --leak-check=full
144AUTOSTART = YES
145PORT = 20029
146HOSTNAME = localhost
147HOME = $SERVICEHOME
148BINARY = gnunet-service-transport
149NEIGHBOUR_LIMIT = 50
150ACCEPT_FROM = 127.0.0.1;
151ACCEPT_FROM6 = ::1;
152PLUGINS = unix tcp udp http 49PLUGINS = unix tcp udp http
153UNIXPATH = /tmp/test-service-transport-22 50UNIXPATH = /tmp/test-service-transport-22
154BLACKLIST_FILE = $SERVICEHOME/blacklist 51PORT = 20029
155UNIX_MATCH_UID = YES
156UNIX_MATCH_GID = YES
157 52
158[transport-unix] 53[transport-unix]
159PORT = 22087 54PORT = 22087
160 55
161[transport-tcp] 56[transport-tcp]
162USE_LOCALADDR = YES
163PORT = 20028 57PORT = 20028
164ADVERTISED_PORT = 20028 58ADVERTISED_PORT = 20028
165MAX_CONNECTIONS = 128
166TIMEOUT = 5 s
167 59
168[transport-udp] 60[transport-udp]
169USE_LOCALADDR = YES
170PORT = 20027 61PORT = 20027
171BROADCAST = YES
172BROADCAST_INTERVAL = 30000
173MAX_BPS = 1000000
174 62
175[transport-http] 63[hostlist]
176PORT = 0 64SERVERS = http://localhost:8080/
177MAX_CONNECTIONS = 128
178 65
179[transport-https] 66[vpn]
180PORT = 20025 67UNIXPATH = /tmp/gnunet-service-vpn-29
181CRYPTO_INIT = NORMAL 68
182KEY_FILE = https.key 69[dv]
183CERT_FILE = https.cert 70UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-1
184MAX_CONNECTIONS = 128
185 71
186[transport-wlan] 72[peerinfo]
187INTERFACE = mon0 73UNIXPATH = /tmp/test-service-peerinfo-24
188TESTMODE = 0 74USE_INCLUDED_HELLOS = YES
75PORT = 20031
189 76
190[datacache-mysql] 77[statistics]
191DATABASE = gnunet 78UNIXPATH = /tmp/test-service-statistics-16
192CONFIG = ~/.my.cnf 79PORT = 20019
193 80
194[datacache-postgres] 81[PATHS]
195CONFIG = connect_timeout=10; dbname=gnunet 82SERVICEHOME = /tmp/c_no_nat_client/
83DEFAULTCONFIG = c_no_nat_client_unix.conf
196 84
197[template] 85[template]
198AUTOSTART = NO
199PORT = 20024 86PORT = 20024
200HOSTNAME = localhost
201HOME = $SERVICEHOME
202BINARY = gnunet-service-template
203ACCEPT_FROM = 127.0.0.1;
204ACCEPT_FROM6 = ::1;
205UNIXPATH = /tmp/test-service-template-21 87UNIXPATH = /tmp/test-service-template-21
206UNIX_MATCH_UID = YES
207UNIX_MATCH_GID = YES
208
209[fs]
210AUTOSTART = YES
211INDEXDB = $SERVICEHOME/idxinfo.lst
212TRUST = $SERVICEHOME/data/credit/
213IDENTITY_DIR = $SERVICEHOME/identities/
214STATE_DIR = $SERVICEHOME/persistence/
215UPDATE_DIR = $SERVICEHOME/updates/
216PORT = 20023
217HOSTNAME = localhost
218HOME = $SERVICEHOME
219BINARY = gnunet-service-fs
220ACCEPT_FROM = 127.0.0.1;
221ACCEPT_FROM6 = ::1;
222DELAY = YES
223CONTENT_CACHING = YES
224CONTENT_PUSHING = YES
225UNIXPATH = /tmp/test-service-fs-20
226UNIX_MATCH_UID = NO
227UNIX_MATCH_GID = YES
228MAX_PENDING_REQUESTS = 65536
229MIN_MIGRATION_DELAY = 100 ms
230EXPECTED_NEIGHBOUR_COUNT = 128
231 88
232[vpn] 89[nse]
233BINARY = gnunet-daemon-vpn 90UNIXPATH = /tmp/test-service-nse-26
234IPV6ADDR = 1234::1 91PORT = 20033
235IPV6PREFIX = 32
236IPV4ADDR = 10.11.10.1
237IPV4MASK = 255.255.0.0
238VIRTDNS = 10.11.10.2
239VIRTDNS6 = 1234::17
240IFNAME = vpn-gnunet
241 92
242[exit] 93[gnunetd]
243BINARY = gnunet-daemon-exit 94HOSTKEY = hostkeys/0001-hostkey
244IPV6ADDR = 1234:1::1
245IPV6PREFIX = 32
246IPV4ADDR = 10.10.1.1
247IPV4MASK = 255.255.0.0
248IFNAME = exit-gnunet
249ENABLE_UDP = NO
250ENABLE_TCP = NO
251 95
252[dns] 96[transport-http]
253AUTOSTART = YES
254PORT = 0 97PORT = 0
255HOSTNAME = localhost
256HOME = $SERVICEHOME
257BINARY = gnunet-service-dns
258ACCEPT_FROM = 127.0.0.1;
259ACCEPT_FROM6 = ::1;
260UNIXPATH = /tmp/test-service-dns-19
261PROVIDE_EXIT = NO
262
263[arm]
264PORT = 20022
265HOSTNAME = localhost
266HOME = $SERVICEHOME
267BINARY = gnunet-service-arm
268ACCEPT_FROM = 127.0.0.1;
269ACCEPT_FROM6 = ::1;
270DEFAULTSERVICES = topology hostlist fs core
271UNIXPATH = /tmp/test-service-arm-18
272UNIX_MATCH_UID = YES
273UNIX_MATCH_GID = YES
274
275[hostlist]
276HTTPPORT = 8080
277HOME = $SERVICEHOME
278HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
279BINARY = gnunet-daemon-hostlist
280OPTIONS = -b
281SERVERS = http://localhost:8080/
282HTTP-PROXY =
283
284[core]
285AUTOSTART = YES
286PORT = 20021
287HOSTNAME = localhost
288HOME = $SERVICEHOME
289BINARY = gnunet-service-core
290ACCEPT_FROM = 127.0.0.1;
291ACCEPT_FROM6 = ::1;
292UNIXPATH = /tmp/test-service-core-17
293UNIX_MATCH_UID = YES
294UNIX_MATCH_GID = YES
295
296[nat]
297EXTERNAL_ADDRESS = 127.0.0.1
298INTERNAL_ADDRESS = 127.0.0.1
299BINDTO = 127.0.0.1
300BEHIND_NAT = NO
301PUNCHED_NAT = NO
302ENABLE_UPNP = NO
303USE_LOCALADDR = YES
304USE_HOSTNAME = NO
305ENABLE_ICMP_CLIENT = NO
306ENABLE_ICMP_SERVER = NO
307DISABLEV6 = YES
308RETURN_LOCAL_ADDRESSES = NO
309HOSTNAME_DNS_FREQUENCY = 1200000
310IFC_SCAN_FREQUENCY = 3000000
311DYNDNS_FREQUENCY = 140000
312
313[gnunet-nat-server]
314HOSTNAME = gnunet.org
315PORT = 20020
316
317[statistics]
318AUTOSTART = YES
319PORT = 20019
320HOSTNAME = localhost
321HOME = $SERVICEHOME
322BINARY = gnunet-service-statistics
323ACCEPT_FROM = 127.0.0.1;
324ACCEPT_FROM6 = ::1;
325UNIXPATH = /tmp/test-service-statistics-16
326UNIX_MATCH_UID = NO
327UNIX_MATCH_GID = YES
328 98
329[dht] 99[transport-https]
330AUTOSTART = YES 100PORT = 20025
331PORT = 20018
332HOSTNAME = localhost
333HOME = $SERVICEHOME
334BINARY = gnunet-service-dht
335ACCEPT_FROM = 127.0.0.1;
336ACCEPT_FROM6 = ::1;
337BUCKET_SIZE = 4
338UNIXPATH = /tmp/test-service-dht-15
339UNIX_MATCH_UID = YES
340UNIX_MATCH_GID = YES
341 101
342[chat] 102[chat]
343UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-1 103UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-1
344UNIX_MATCH_UID = YES
345UNIX_MATCH_GID = YES
346
347[dv]
348UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-1
349UNIX_MATCH_UID = YES
350UNIX_MATCH_GID = YES
351
352[dhtcache]
353DATABASE = sqlite
354QUOTA = 1 MB
355
356[consensus]
357AUTOSTART = NO
358
359 104
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
index 463bebbaa..d29f67876 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
@@ -1,350 +1,95 @@
1[PATHS] 1@INCLUDE@ test_defaults.conf
2SERVICEHOME = /tmp/c_no_nat_client_2/
3 2
4[gnunetd] 3[arm]
5#HOSTKEY = $SERVICEHOME/.hostkey 4DEFAULTSERVICES = topology hostlist fs core
6HOSTKEY = hostkeys/0002-hostkey 5UNIXPATH = /tmp/test-service-arm-32
7 6PORT = 20040
8[gns]
9AUTOSTART = NO
10 7
11[namestore] 8[dns]
12AUTOSTART = NO 9UNIXPATH = /tmp/test-service-dns-33
13 10
14[resolver] 11[lockmanager]
15AUTOSTART = YES 12AUTOSTART = YES
16PORT = 20053
17HOSTNAME = localhost
18HOME = $SERVICEHOME
19BINARY = gnunet-service-resolver
20ACCEPT_FROM = 127.0.0.1;
21ACCEPT_FROM6 = ::1;
22UNIXPATH = /tmp/test-service-resolver-42
23UNIX_MATCH_UID = NO
24UNIX_MATCH_GID = NO
25 13
26[mesh] 14[core]
27AUTOSTART = YES 15UNIXPATH = /tmp/test-service-core-31
28PORT = 20052 16PORT = 20039
29HOSTNAME = localhost
30HOME = $SERVICEHOME
31BINARY = gnunet-service-mesh
32ACCEPT_FROM = 127.0.0.1;
33ACCEPT_FROM6 = ::1;
34UNIXPATH = /tmp/test-service-mesh-41
35UNIX_MATCH_UID = YES
36UNIX_MATCH_GID = YES
37 17
38[nse] 18[ats]
39AUTOSTART = YES 19UNIXPATH = /tmp/test-service-ats-37
40PORT = 20051 20PORT = 20048
41HOSTNAME = localhost
42HOME = $SERVICEHOME
43BINARY = gnunet-service-nse
44ACCEPT_FROM = 127.0.0.1;
45ACCEPT_FROM6 = ::1;
46UNIXPATH = /tmp/test-service-nse-40
47UNIX_MATCH_UID = YES
48UNIX_MATCH_GID = YES
49PROOFFILE = $SERVICEHOME/.nse-proof
50HISTOGRAM = $SERVICEHOME/nse-history.log
51WORKDELAY = 5 ms
52INTERVAL = 1 h
53WORKBITS = 1
54 21
55[topology] 22[mesh]
56MINIMUM-FRIENDS = 0 23UNIXPATH = /tmp/test-service-mesh-41
57FRIENDS-ONLY = NO 24PORT = 20052
58AUTOCONNECT = YES
59TARGET-CONNECTION-COUNT = 16
60FRIENDS = $SERVICEHOME/friends
61BINARY = gnunet-daemon-topology
62 25
63[datastore] 26[datastore]
64AUTOSTART = YES
65UNIXPATH = /tmp/test-service-datastore-39 27UNIXPATH = /tmp/test-service-datastore-39
66UNIX_MATCH_UID = YES
67UNIX_MATCH_GID = YES
68PORT = 20050 28PORT = 20050
69HOSTNAME = localhost
70HOME = $SERVICEHOME
71BINARY = gnunet-service-datastore
72ACCEPT_FROM = 127.0.0.1;
73ACCEPT_FROM6 = ::1;
74QUOTA = 100 MB
75BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
76DATABASE = sqlite
77
78[datastore-sqlite]
79FILENAME = $SERVICEHOME/datastore/sqlite.db
80 29
81[datastore-postgres] 30[resolver]
82CONFIG = connect_timeout=10; dbname=gnunet 31UNIXPATH = /tmp/test-service-resolver-42
83 32PORT = 20053
84[datastore-mysql]
85DATABASE = gnunet
86CONFIG = ~/.my.cnf
87 33
88[peerinfo] 34[dht]
89AUTOSTART = YES 35UNIXPATH = /tmp/test-service-dht-29
90PORT = 20049 36PORT = 20036
91HOSTNAME = localhost
92HOME = $SERVICEHOME
93BINARY = gnunet-service-peerinfo
94ACCEPT_FROM = 127.0.0.1;
95ACCEPT_FROM6 = ::1;
96UNIXPATH = /tmp/test-service-peerinfo-38
97UNIX_MATCH_UID = NO
98UNIX_MATCH_GID = YES
99HOSTS = $SERVICEHOME/data/hosts/
100 37
101[client] 38[nat]
102HOME = $SERVICEHOME 39BEHIND_NAT = NO
103 40
104[TESTING] 41[gnunet-nat-server]
105WEAKRANDOM = NO 42PORT = 20038
106CONNECT_TIMEOUT = 30 s
107CONNECT_ATTEMPTS = 3
108MAX_OUTSTANDING_CONNECTIONS = 50
109DELETE_FILES = YES
110 43
111[ats] 44[fs]
112AUTOSTART = YES 45UNIXPATH = /tmp/test-service-fs-34
113PORT = 20048 46PORT = 20041
114HOSTNAME = localhost
115HOME = $SERVICEHOME
116BINARY = gnunet-service-ats
117ACCEPT_FROM = 127.0.0.1;
118ACCEPT_FROM6 = ::1;
119UNIXPATH = /tmp/test-service-ats-37
120UNIX_MATCH_UID = YES
121UNIX_MATCH_GID = YES
122WAN_QUOTA_IN = unlimited
123WAN_QUOTA_OUT = unlimited
124DUMP_MLP = NO
125DUMP_SOLUTION = NO
126DUMP_OVERWRITE = NO
127DUMP_MIN_PEERS = 0
128DUMP_MIN_ADDRS = 0
129ATS_MIN_INTERVAL = 15000
130ATS_EXEC_INTERVAL = 30000
131 47
132[transport] 48[transport]
133PREFIX = valgrind --leak-check=full
134#PREFIX = gdb --args
135AUTOSTART = YES
136PORT = 20047
137HOSTNAME = localhost
138HOME = $SERVICEHOME
139BINARY = gnunet-service-transport
140NEIGHBOUR_LIMIT = 50
141ACCEPT_FROM = 127.0.0.1;
142ACCEPT_FROM6 = ::1;
143PLUGINS = unix tcp udp http 49PLUGINS = unix tcp udp http
144UNIXPATH = /tmp/test-service-transport-36 50UNIXPATH = /tmp/test-service-transport-36
145BLACKLIST_FILE = $SERVICEHOME/blacklist 51PORT = 20047
146UNIX_MATCH_UID = YES
147UNIX_MATCH_GID = YES
148
149[transport-unix]
150PORT = 22086
151 52
152[transport-tcp] 53[transport-tcp]
153PORT = 20046 54PORT = 20046
154ADVERTISED_PORT = 20046 55ADVERTISED_PORT = 20046
155MAX_CONNECTIONS = 128
156TIMEOUT = 5 s
157USE_LOCALADDR = YES
158 56
159[transport-udp] 57[transport-udp]
160PORT = 20045 58PORT = 20045
161BROADCAST = YES
162BROADCAST_INTERVAL = 30000
163MAX_BPS = 1000000
164USE_LOCALADDR = YES
165
166[transport-http]
167PORT = 20044
168MAX_CONNECTIONS = 128
169
170[transport-https]
171PORT = 20043
172CRYPTO_INIT = NORMAL
173KEY_FILE = https.key
174CERT_FILE = https.cert
175MAX_CONNECTIONS = 128
176
177[transport-wlan]
178INTERFACE = mon0
179TESTMODE = 0
180
181[datacache-mysql]
182DATABASE = gnunet
183CONFIG = ~/.my.cnf
184
185[datacache-postgres]
186CONFIG = connect_timeout=10; dbname=gnunet
187
188[template]
189AUTOSTART = NO
190PORT = 20042
191HOSTNAME = localhost
192HOME = $SERVICEHOME
193BINARY = gnunet-service-template
194ACCEPT_FROM = 127.0.0.1;
195ACCEPT_FROM6 = ::1;
196UNIXPATH = /tmp/test-service-template-35
197UNIX_MATCH_UID = YES
198UNIX_MATCH_GID = YES
199
200[fs]
201AUTOSTART = YES
202INDEXDB = $SERVICEHOME/idxinfo.lst
203TRUST = $SERVICEHOME/data/credit/
204IDENTITY_DIR = $SERVICEHOME/identities/
205STATE_DIR = $SERVICEHOME/persistence/
206UPDATE_DIR = $SERVICEHOME/updates/
207PORT = 20041
208HOSTNAME = localhost
209HOME = $SERVICEHOME
210BINARY = gnunet-service-fs
211ACCEPT_FROM = 127.0.0.1;
212ACCEPT_FROM6 = ::1;
213DELAY = YES
214CONTENT_CACHING = YES
215CONTENT_PUSHING = YES
216UNIXPATH = /tmp/test-service-fs-34
217UNIX_MATCH_UID = NO
218UNIX_MATCH_GID = YES
219MAX_PENDING_REQUESTS = 65536
220MIN_MIGRATION_DELAY = 100 ms
221EXPECTED_NEIGHBOUR_COUNT = 128
222
223[vpn]
224BINARY = gnunet-daemon-vpn
225IPV6ADDR = 1234::1
226IPV6PREFIX = 32
227IPV4ADDR = 10.11.10.1
228IPV4MASK = 255.255.0.0
229VIRTDNS = 10.11.10.2
230VIRTDNS6 = 1234::17
231IFNAME = vpn-gnunet
232
233[exit]
234BINARY = gnunet-daemon-exit
235IPV6ADDR = 1234:1::1
236IPV6PREFIX = 32
237IPV4ADDR = 10.10.1.1
238IPV4MASK = 255.255.0.0
239IFNAME = exit-gnunet
240ENABLE_UDP = NO
241ENABLE_TCP = NO
242
243[dns]
244AUTOSTART = YES
245PORT = 0
246HOSTNAME = localhost
247HOME = $SERVICEHOME
248BINARY = gnunet-service-dns
249ACCEPT_FROM = 127.0.0.1;
250ACCEPT_FROM6 = ::1;
251UNIXPATH = /tmp/test-service-dns-33
252PROVIDE_EXIT = NO
253
254[arm]
255PORT = 20040
256HOSTNAME = localhost
257HOME = $SERVICEHOME
258BINARY = gnunet-service-arm
259ACCEPT_FROM = 127.0.0.1;
260ACCEPT_FROM6 = ::1;
261DEFAULTSERVICES = topology hostlist fs core
262UNIXPATH = /tmp/test-service-arm-32
263UNIX_MATCH_UID = YES
264UNIX_MATCH_GID = YES
265 59
266[hostlist] 60[hostlist]
267HTTPPORT = 8080
268HOME = $SERVICEHOME
269HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
270BINARY = gnunet-daemon-hostlist
271OPTIONS = -b
272SERVERS = http://localhost:8080/ 61SERVERS = http://localhost:8080/
273HTTP-PROXY =
274 62
275[core] 63[vpn]
276AUTOSTART = YES 64UNIXPATH = /tmp/gnunet-service-vpn.sock
277PORT = 20039
278HOSTNAME = localhost
279HOME = $SERVICEHOME
280BINARY = gnunet-service-core
281ACCEPT_FROM = 127.0.0.1;
282ACCEPT_FROM6 = ::1;
283UNIXPATH = /tmp/test-service-core-31
284UNIX_MATCH_UID = YES
285UNIX_MATCH_GID = YES
286 65
287[nat] 66[dv]
288BEHIND_NAT = NO 67UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-2
289PUNCHED_NAT = NO
290ENABLE_UPNP = NO
291USE_LOCALADDR = YES
292USE_HOSTNAME = NO
293ENABLE_ICMP_CLIENT = NO
294ENABLE_ICMP_SERVER = NO
295DISABLEV6 = YES
296RETURN_LOCAL_ADDRESSES = NO
297HOSTNAME_DNS_FREQUENCY = 1200000
298IFC_SCAN_FREQUENCY = 3000000
299DYNDNS_FREQUENCY = 140000
300EXTERNAL_ADDRESS = 127.0.0.1
301INTERNAL_ADDRESS = 127.0.0.1
302BINDTO = 127.0.0.1
303 68
304[gnunet-nat-server] 69[peerinfo]
305HOSTNAME = gnunet.org 70UNIXPATH = /tmp/test-service-peerinfo-38
306PORT = 20038 71USE_INCLUDED_HELLOS = YES
72PORT = 20049
307 73
308[statistics] 74[statistics]
309AUTOSTART = YES
310PORT = 20037
311HOSTNAME = localhost
312HOME = $SERVICEHOME
313BINARY = gnunet-service-statistics
314ACCEPT_FROM = 127.0.0.1;
315ACCEPT_FROM6 = ::1;
316UNIXPATH = /tmp/test-service-statistics-30 75UNIXPATH = /tmp/test-service-statistics-30
317UNIX_MATCH_UID = NO 76PORT = 20037
318UNIX_MATCH_GID = YES
319
320[dht]
321AUTOSTART = YES
322PORT = 20036
323HOSTNAME = localhost
324HOME = $SERVICEHOME
325BINARY = gnunet-service-dht
326ACCEPT_FROM = 127.0.0.1;
327ACCEPT_FROM6 = ::1;
328BUCKET_SIZE = 4
329UNIXPATH = /tmp/test-service-dht-29
330UNIX_MATCH_UID = YES
331UNIX_MATCH_GID = YES
332 77
333[chat] 78[PATHS]
334UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-2 79SERVICEHOME = /tmp/c_no_nat_client_2/
335UNIX_MATCH_UID = YES 80DEFAULTCONFIG = c_no_nat_client_unix_2.conf
336UNIX_MATCH_GID = YES
337 81
338[dv] 82[template]
339UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-2 83PORT = 20042
340UNIX_MATCH_UID = YES 84UNIXPATH = /tmp/test-service-template-35
341UNIX_MATCH_GID = YES
342 85
343[dhtcache] 86[nse]
344DATABASE = sqlite 87UNIXPATH = /tmp/test-service-nse-40
345QUOTA = 1 MB 88PORT = 20051
346 89
347[consensus] 90[transport-http]
348AUTOSTART = NO 91PORT = 20044
349 92
93[transport-https]
94PORT = 20043
350 95
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index ec8098cff..7fcf956cd 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -1,354 +1,62 @@
1[PATHS] 1@INCLUDE@ test_defaults.conf
2SERVICEHOME = /tmp/c_normal_client
3
4[gnunetd]
5HOSTKEY = hostkeys/0002-hostkey
6
7[client]
8HOME = $SERVICEHOME
9
10[gns]
11AUTOSTART = NO
12 2
13[namestore] 3[arm]
14AUTOSTART = NO 4UNIXPATH = /tmp/test-service-arm-46
15 5PORT = 20058
16[vpn]
17AUTOSTART = YES
18PORT = 0
19HOSTNAME = localhost
20HOME = $SERVICEHOME
21BINARY = gnunet-service-dns
22ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1;
24UNIXPATH = /tmp/gnunet-service-vpn-57
25
26
27[resolver]
28AUTOSTART = YES
29PORT = 20071
30HOSTNAME = localhost
31HOME = $SERVICEHOME
32BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1;
35UNIXPATH = /tmp/test-service-resolver-56
36UNIX_MATCH_UID = NO
37UNIX_MATCH_GID = NO
38
39[mesh]
40AUTOSTART = YES
41PORT = 20070
42HOSTNAME = localhost
43HOME = $SERVICEHOME
44BINARY = gnunet-service-mesh
45ACCEPT_FROM = 127.0.0.1;
46ACCEPT_FROM6 = ::1;
47UNIXPATH = /tmp/test-service-mesh-55
48UNIX_MATCH_UID = YES
49UNIX_MATCH_GID = YES
50 6
51[nse] 7[core]
52AUTOSTART = YES 8UNIXPATH = /tmp/test-service-core-45
53PORT = 20069 9PORT = 20057
54HOSTNAME = localhost
55HOME = $SERVICEHOME
56BINARY = gnunet-service-nse
57ACCEPT_FROM = 127.0.0.1;
58ACCEPT_FROM6 = ::1;
59UNIXPATH = /tmp/test-service-nse-54
60UNIX_MATCH_UID = YES
61UNIX_MATCH_GID = YES
62PROOFFILE = $SERVICEHOME/.nse-proof
63HISTOGRAM = $SERVICEHOME/nse-history.log
64WORKDELAY = 5 ms
65INTERVAL = 1 h
66WORKBITS = 1
67 10
68[topology] 11[ats]
69MINIMUM-FRIENDS = 0 12UNIXPATH = /tmp/test-service-ats-51
70FRIENDS-ONLY = NO 13PORT = 20066
71AUTOCONNECT = YES
72TARGET-CONNECTION-COUNT = 16
73FRIENDS = $SERVICEHOME/friends
74BINARY = gnunet-daemon-topology
75 14
76[datastore] 15[datastore]
77AUTOSTART = YES
78UNIXPATH = /tmp/test-service-datastore-53 16UNIXPATH = /tmp/test-service-datastore-53
79UNIX_MATCH_UID = YES
80UNIX_MATCH_GID = YES
81PORT = 20068 17PORT = 20068
82HOSTNAME = localhost
83HOME = $SERVICEHOME
84BINARY = gnunet-service-datastore
85ACCEPT_FROM = 127.0.0.1;
86ACCEPT_FROM6 = ::1;
87QUOTA = 100 MB
88BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
89DATABASE = sqlite
90
91[datastore-sqlite]
92FILENAME = $SERVICEHOME/datastore/sqlite.db
93
94[datastore-postgres]
95CONFIG = connect_timeout=10; dbname=gnunet
96
97[datastore-mysql]
98DATABASE = gnunet
99CONFIG = ~/.my.cnf
100 18
101[peerinfo] 19[resolver]
102AUTOSTART = YES 20UNIXPATH = /tmp/test-service-resolver-56
103PORT = 20067 21PORT = 20071
104HOSTNAME = localhost
105HOME = $SERVICEHOME
106BINARY = gnunet-service-peerinfo
107ACCEPT_FROM = 127.0.0.1;
108ACCEPT_FROM6 = ::1;
109UNIXPATH = /tmp/test-service-peerinfo-52
110UNIX_MATCH_UID = NO
111UNIX_MATCH_GID = YES
112HOSTS = $SERVICEHOME/data/hosts/
113 22
114[TESTING] 23[dht]
115WEAKRANDOM = NO 24UNIXPATH = /tmp/test-service-dht-43
116CONNECT_TIMEOUT = 30 s 25PORT = 20054
117CONNECT_ATTEMPTS = 3
118MAX_OUTSTANDING_CONNECTIONS = 50
119DELETE_FILES = YES
120 26
121[ats] 27[fs]
122AUTOSTART = YES 28UNIXPATH = /tmp/test-service-fs-48
123PORT = 20066 29PORT = 20059
124HOSTNAME = localhost
125HOME = $SERVICEHOME
126BINARY = gnunet-service-ats
127ACCEPT_FROM = 127.0.0.1;
128ACCEPT_FROM6 = ::1;
129UNIXPATH = /tmp/test-service-ats-51
130UNIX_MATCH_UID = YES
131UNIX_MATCH_GID = YES
132WAN_QUOTA_IN = unlimited
133WAN_QUOTA_OUT = unlimited
134DUMP_MLP = NO
135DUMP_SOLUTION = NO
136DUMP_OVERWRITE = NO
137DUMP_MIN_PEERS = 0
138DUMP_MIN_ADDRS = 0
139ATS_MIN_INTERVAL = 15000
140ATS_EXEC_INTERVAL = 30000
141 30
142[transport] 31[transport]
143AUTOSTART = YES
144PORT = 20065
145HOSTNAME = localhost
146HOME = $SERVICEHOME
147BINARY = gnunet-service-transport
148NEIGHBOUR_LIMIT = 50
149ACCEPT_FROM = 127.0.0.1;
150ACCEPT_FROM6 = ::1;
151PLUGINS = tcp
152UNIXPATH = /tmp/test-service-transport-50 32UNIXPATH = /tmp/test-service-transport-50
153BLACKLIST_FILE = $SERVICEHOME/blacklist 33PORT = 20065
154UNIX_MATCH_UID = YES
155UNIX_MATCH_GID = YES
156 34
157[transport-tcp] 35[transport-tcp]
158PORT = 0 36PORT = 0
159ADVERTISED_PORT = 20064 37ADVERTISED_PORT = 20064
160MAX_CONNECTIONS = 128
161TIMEOUT = 5 s
162USE_LOCALADDR = YES
163 38
164[transport-udp] 39[transport-udp]
165PORT = 0 40PORT = 0
166BROADCAST = YES
167BROADCAST_INTERVAL = 30000
168MAX_BPS = 1000000
169USE_LOCALADDR = YES
170
171[transport-http]
172PORT = 0
173MAX_CONNECTIONS = 128
174 41
175[transport-https] 42[peerinfo]
176PORT = 0 43UNIXPATH = /tmp/test-service-peerinfo-52
177CRYPTO_INIT = NORMAL 44USE_INCLUDED_HELLOS = YES
178KEY_FILE = https.key 45PORT = 20067
179CERT_FILE = https.cert
180MAX_CONNECTIONS = 128
181
182[transport-wlan]
183INTERFACE = mon0
184TESTMODE = 0
185
186[datacache-mysql]
187DATABASE = gnunet
188CONFIG = ~/.my.cnf
189
190[datacache-postgres]
191CONFIG = connect_timeout=10; dbname=gnunet
192
193[template]
194AUTOSTART = NO
195PORT = 20060
196HOSTNAME = localhost
197HOME = $SERVICEHOME
198BINARY = gnunet-service-template
199ACCEPT_FROM = 127.0.0.1;
200ACCEPT_FROM6 = ::1;
201UNIXPATH = /tmp/test-service-template-49
202UNIX_MATCH_UID = YES
203UNIX_MATCH_GID = YES
204 46
205[fs] 47[PATHS]
206AUTOSTART = YES 48SERVICEHOME = /tmp/c_normal_client
207INDEXDB = $SERVICEHOME/idxinfo.lst
208TRUST = $SERVICEHOME/data/credit/
209IDENTITY_DIR = $SERVICEHOME/identities/
210STATE_DIR = $SERVICEHOME/persistence/
211UPDATE_DIR = $SERVICEHOME/updates/
212PORT = 20059
213HOSTNAME = localhost
214HOME = $SERVICEHOME
215BINARY = gnunet-service-fs
216ACCEPT_FROM = 127.0.0.1;
217ACCEPT_FROM6 = ::1;
218DELAY = YES
219CONTENT_CACHING = YES
220CONTENT_PUSHING = YES
221UNIXPATH = /tmp/test-service-fs-48
222UNIX_MATCH_UID = NO
223UNIX_MATCH_GID = YES
224MAX_PENDING_REQUESTS = 65536
225MIN_MIGRATION_DELAY = 100 ms
226EXPECTED_NEIGHBOUR_COUNT = 128
227 49
228[vpn] 50[nse]
229BINARY = gnunet-daemon-vpn 51UNIXPATH = /tmp/test-service-nse-54
230IPV6ADDR = 1234::1 52PORT = 20069
231IPV6PREFIX = 32
232IPV4ADDR = 10.11.10.1
233IPV4MASK = 255.255.0.0
234VIRTDNS = 10.11.10.2
235VIRTDNS6 = 1234::17
236IFNAME = vpn-gnunet
237 53
238[exit] 54[gnunetd]
239BINARY = gnunet-daemon-exit 55HOSTKEY = hostkeys/0002-hostkey
240IPV6ADDR = 1234:1::1
241IPV6PREFIX = 32
242IPV4ADDR = 10.10.1.1
243IPV4MASK = 255.255.0.0
244IFNAME = exit-gnunet
245ENABLE_UDP = NO
246ENABLE_TCP = NO
247 56
248[dns] 57[transport-http]
249AUTOSTART = YES
250PORT = 0 58PORT = 0
251HOSTNAME = localhost
252HOME = $SERVICEHOME
253BINARY = gnunet-service-dns
254ACCEPT_FROM = 127.0.0.1;
255ACCEPT_FROM6 = ::1;
256UNIXPATH = /tmp/test-service-dns-47
257PROVIDE_EXIT = NO
258
259[arm]
260PORT = 20058
261HOSTNAME = localhost
262HOME = $SERVICEHOME
263BINARY = gnunet-service-arm
264ACCEPT_FROM = 127.0.0.1;
265ACCEPT_FROM6 = ::1;
266DEFAULTSERVICES = topology hostlist fs
267UNIXPATH = /tmp/test-service-arm-46
268UNIX_MATCH_UID = YES
269UNIX_MATCH_GID = YES
270
271[hostlist]
272HTTPPORT = 8080
273HOME = $SERVICEHOME
274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
275BINARY = gnunet-daemon-hostlist
276OPTIONS = -b
277SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
278HTTP-PROXY =
279
280[core]
281AUTOSTART = YES
282PORT = 20057
283HOSTNAME = localhost
284HOME = $SERVICEHOME
285BINARY = gnunet-service-core
286ACCEPT_FROM = 127.0.0.1;
287ACCEPT_FROM6 = ::1;
288UNIXPATH = /tmp/test-service-core-45
289UNIX_MATCH_UID = YES
290UNIX_MATCH_GID = YES
291
292[nat]
293BEHIND_NAT = YES
294PUNCHED_NAT = NO
295ENABLE_UPNP = NO
296USE_LOCALADDR = YES
297USE_HOSTNAME = NO
298ENABLE_ICMP_CLIENT = NO
299ENABLE_ICMP_SERVER = NO
300DISABLEV6 = YES
301RETURN_LOCAL_ADDRESSES = NO
302HOSTNAME_DNS_FREQUENCY = 1200000
303IFC_SCAN_FREQUENCY = 3000000
304DYNDNS_FREQUENCY = 140000
305EXTERNAL_ADDRESS = 127.0.0.1
306INTERNAL_ADDRESS = 127.0.0.1
307BINDTO = 127.0.0.1
308
309[gnunet-nat-server]
310HOSTNAME = gnunet.org
311PORT = 20056
312
313[statistics]
314AUTOSTART = YES
315PORT = 20055
316HOSTNAME = localhost
317HOME = $SERVICEHOME
318BINARY = gnunet-service-statistics
319ACCEPT_FROM = 127.0.0.1;
320ACCEPT_FROM6 = ::1;
321UNIXPATH = /tmp/test-service-statistics-44
322UNIX_MATCH_UID = NO
323UNIX_MATCH_GID = YES
324
325[dht]
326AUTOSTART = YES
327PORT = 20054
328HOSTNAME = localhost
329HOME = $SERVICEHOME
330BINARY = gnunet-service-dht
331ACCEPT_FROM = 127.0.0.1;
332ACCEPT_FROM6 = ::1;
333BUCKET_SIZE = 4
334UNIXPATH = /tmp/test-service-dht-43
335UNIX_MATCH_UID = YES
336UNIX_MATCH_GID = YES
337
338[chat]
339UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp-1
340UNIX_MATCH_UID = YES
341UNIX_MATCH_GID = YES
342
343[dv]
344UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp-1
345UNIX_MATCH_UID = YES
346UNIX_MATCH_GID = YES
347
348[dhtcache]
349DATABASE = sqlite
350QUOTA = 1 MB
351[consensus]
352AUTOSTART = NO
353 59
60[transport-https]
61PORT = 0
354 62
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
index 415056f5e..6db51d57c 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -1,354 +1,63 @@
1[PATHS] 1@INCLUDE@ test_defaults.conf
2SERVICEHOME = /tmp/c_normal_client
3
4[gnunetd]
5HOSTKEY = hostkeys/0002-hostkey
6
7[client]
8HOME = $SERVICEHOME
9 2
10[gns] 3[arm]
11AUTOSTART = NO 4UNIXPATH = /tmp/test-service-arm-46
12 5PORT = 20058
13[namestore]
14AUTOSTART = NO
15
16[vpn]
17AUTOSTART = YES
18PORT = 0
19HOSTNAME = localhost
20HOME = $SERVICEHOME
21BINARY = gnunet-service-dns
22ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1;
24UNIXPATH = /tmp/gnunet-service-vpn-57
25
26
27[resolver]
28AUTOSTART = YES
29PORT = 20071
30HOSTNAME = localhost
31HOME = $SERVICEHOME
32BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1;
35UNIXPATH = /tmp/test-service-resolver-56
36UNIX_MATCH_UID = NO
37UNIX_MATCH_GID = NO
38 6
39[mesh] 7[lockmanager]
40AUTOSTART = YES 8AUTOSTART = YES
41PORT = 20070
42HOSTNAME = localhost
43HOME = $SERVICEHOME
44BINARY = gnunet-service-mesh
45ACCEPT_FROM = 127.0.0.1;
46ACCEPT_FROM6 = ::1;
47UNIXPATH = /tmp/test-service-mesh-55
48UNIX_MATCH_UID = YES
49UNIX_MATCH_GID = YES
50 9
51[nse] 10[core]
52AUTOSTART = YES 11UNIXPATH = /tmp/test-service-core-45
53PORT = 20069 12PORT = 20057
54HOSTNAME = localhost
55HOME = $SERVICEHOME
56BINARY = gnunet-service-nse
57ACCEPT_FROM = 127.0.0.1;
58ACCEPT_FROM6 = ::1;
59UNIXPATH = /tmp/test-service-nse-54
60UNIX_MATCH_UID = YES
61UNIX_MATCH_GID = YES
62PROOFFILE = $SERVICEHOME/.nse-proof
63HISTOGRAM = $SERVICEHOME/nse-history.log
64WORKDELAY = 5 ms
65INTERVAL = 1 h
66WORKBITS = 1
67 13
68[topology] 14[ats]
69MINIMUM-FRIENDS = 0 15UNIXPATH = /tmp/test-service-ats-51
70FRIENDS-ONLY = NO 16PORT = 20066
71AUTOCONNECT = YES
72TARGET-CONNECTION-COUNT = 16
73FRIENDS = $SERVICEHOME/friends
74BINARY = gnunet-daemon-topology
75 17
76[datastore] 18[datastore]
77AUTOSTART = YES
78UNIXPATH = /tmp/test-service-datastore-53 19UNIXPATH = /tmp/test-service-datastore-53
79UNIX_MATCH_UID = YES
80UNIX_MATCH_GID = YES
81PORT = 20068 20PORT = 20068
82HOSTNAME = localhost
83HOME = $SERVICEHOME
84BINARY = gnunet-service-datastore
85ACCEPT_FROM = 127.0.0.1;
86ACCEPT_FROM6 = ::1;
87QUOTA = 100 MB
88BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
89DATABASE = sqlite
90
91[datastore-sqlite]
92FILENAME = $SERVICEHOME/datastore/sqlite.db
93 21
94[datastore-postgres] 22[resolver]
95CONFIG = connect_timeout=10; dbname=gnunet 23UNIXPATH = /tmp/test-service-resolver-56
96 24PORT = 20071
97[datastore-mysql]
98DATABASE = gnunet
99CONFIG = ~/.my.cnf
100
101[peerinfo]
102AUTOSTART = YES
103PORT = 20067
104HOSTNAME = localhost
105HOME = $SERVICEHOME
106BINARY = gnunet-service-peerinfo
107ACCEPT_FROM = 127.0.0.1;
108ACCEPT_FROM6 = ::1;
109UNIXPATH = /tmp/test-service-peerinfo-52
110UNIX_MATCH_UID = NO
111UNIX_MATCH_GID = YES
112HOSTS = $SERVICEHOME/data/hosts/
113 25
114[TESTING] 26[dht]
115WEAKRANDOM = NO 27UNIXPATH = /tmp/test-service-dht-43
116CONNECT_TIMEOUT = 30 s 28PORT = 20054
117CONNECT_ATTEMPTS = 3
118MAX_OUTSTANDING_CONNECTIONS = 50
119DELETE_FILES = YES
120 29
121[ats] 30[fs]
122AUTOSTART = YES 31UNIXPATH = /tmp/test-service-fs-48
123PORT = 20066 32PORT = 20059
124HOSTNAME = localhost
125HOME = $SERVICEHOME
126BINARY = gnunet-service-ats
127ACCEPT_FROM = 127.0.0.1;
128ACCEPT_FROM6 = ::1;
129UNIXPATH = /tmp/test-service-ats-51
130UNIX_MATCH_UID = YES
131UNIX_MATCH_GID = YES
132WAN_QUOTA_IN = unlimited
133WAN_QUOTA_OUT = unlimited
134DUMP_MLP = NO
135DUMP_SOLUTION = NO
136DUMP_OVERWRITE = NO
137DUMP_MIN_PEERS = 0
138DUMP_MIN_ADDRS = 0
139ATS_MIN_INTERVAL = 15000
140ATS_EXEC_INTERVAL = 30000
141 33
142[transport] 34[transport]
143AUTOSTART = YES
144PORT = 20065
145HOSTNAME = localhost
146HOME = $SERVICEHOME
147BINARY = gnunet-service-transport
148NEIGHBOUR_LIMIT = 50
149ACCEPT_FROM = 127.0.0.1;
150ACCEPT_FROM6 = ::1;
151PLUGINS = tcp udp 35PLUGINS = tcp udp
152UNIXPATH = /tmp/test-service-transport-50 36UNIXPATH = /tmp/test-service-transport-50
153BLACKLIST_FILE = $SERVICEHOME/blacklist 37PORT = 20065
154UNIX_MATCH_UID = YES
155UNIX_MATCH_GID = YES
156 38
157[transport-tcp] 39[transport-tcp]
158PORT = 0 40PORT = 0
159ADVERTISED_PORT = 20064 41ADVERTISED_PORT = 20064
160MAX_CONNECTIONS = 128
161TIMEOUT = 5 s
162USE_LOCALADDR = YES
163 42
164[transport-udp] 43[transport-udp]
165PORT = 0 44PORT = 0
166BROADCAST = YES
167BROADCAST_INTERVAL = 30000
168MAX_BPS = 1000000
169USE_LOCALADDR = YES
170
171[transport-http]
172PORT = 0
173MAX_CONNECTIONS = 128
174
175[transport-https]
176PORT = 0
177CRYPTO_INIT = NORMAL
178KEY_FILE = https.key
179CERT_FILE = https.cert
180MAX_CONNECTIONS = 128
181 45
182[transport-wlan] 46[peerinfo]
183INTERFACE = mon0 47UNIXPATH = /tmp/test-service-peerinfo-52
184TESTMODE = 0 48USE_INCLUDED_HELLOS = YES
185 49PORT = 20067
186[datacache-mysql]
187DATABASE = gnunet
188CONFIG = ~/.my.cnf
189
190[datacache-postgres]
191CONFIG = connect_timeout=10; dbname=gnunet
192
193[template]
194AUTOSTART = NO
195PORT = 20060
196HOSTNAME = localhost
197HOME = $SERVICEHOME
198BINARY = gnunet-service-template
199ACCEPT_FROM = 127.0.0.1;
200ACCEPT_FROM6 = ::1;
201UNIXPATH = /tmp/test-service-template-49
202UNIX_MATCH_UID = YES
203UNIX_MATCH_GID = YES
204
205[fs]
206AUTOSTART = YES
207INDEXDB = $SERVICEHOME/idxinfo.lst
208TRUST = $SERVICEHOME/data/credit/
209IDENTITY_DIR = $SERVICEHOME/identities/
210STATE_DIR = $SERVICEHOME/persistence/
211UPDATE_DIR = $SERVICEHOME/updates/
212PORT = 20059
213HOSTNAME = localhost
214HOME = $SERVICEHOME
215BINARY = gnunet-service-fs
216ACCEPT_FROM = 127.0.0.1;
217ACCEPT_FROM6 = ::1;
218DELAY = YES
219CONTENT_CACHING = YES
220CONTENT_PUSHING = YES
221UNIXPATH = /tmp/test-service-fs-48
222UNIX_MATCH_UID = NO
223UNIX_MATCH_GID = YES
224MAX_PENDING_REQUESTS = 65536
225MIN_MIGRATION_DELAY = 100 ms
226EXPECTED_NEIGHBOUR_COUNT = 128
227 50
228[vpn] 51[PATHS]
229BINARY = gnunet-daemon-vpn 52SERVICEHOME = /tmp/c_normal_client
230IPV6ADDR = 1234::1
231IPV6PREFIX = 32
232IPV4ADDR = 10.11.10.1
233IPV4MASK = 255.255.0.0
234VIRTDNS = 10.11.10.2
235VIRTDNS6 = 1234::17
236IFNAME = vpn-gnunet
237 53
238[exit] 54[nse]
239BINARY = gnunet-daemon-exit 55UNIXPATH = /tmp/test-service-nse-54
240IPV6ADDR = 1234:1::1 56PORT = 20069
241IPV6PREFIX = 32
242IPV4ADDR = 10.10.1.1
243IPV4MASK = 255.255.0.0
244IFNAME = exit-gnunet
245ENABLE_UDP = NO
246ENABLE_TCP = NO
247 57
248[dns] 58[transport-http]
249AUTOSTART = YES
250PORT = 0 59PORT = 0
251HOSTNAME = localhost
252HOME = $SERVICEHOME
253BINARY = gnunet-service-dns
254ACCEPT_FROM = 127.0.0.1;
255ACCEPT_FROM6 = ::1;
256UNIXPATH = /tmp/test-service-dns-47
257PROVIDE_EXIT = NO
258
259[arm]
260PORT = 20058
261HOSTNAME = localhost
262HOME = $SERVICEHOME
263BINARY = gnunet-service-arm
264ACCEPT_FROM = 127.0.0.1;
265ACCEPT_FROM6 = ::1;
266DEFAULTSERVICES = topology hostlist fs
267UNIXPATH = /tmp/test-service-arm-46
268UNIX_MATCH_UID = YES
269UNIX_MATCH_GID = YES
270
271[hostlist]
272HTTPPORT = 8080
273HOME = $SERVICEHOME
274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
275BINARY = gnunet-daemon-hostlist
276OPTIONS = -b
277SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
278HTTP-PROXY =
279
280[core]
281AUTOSTART = YES
282PORT = 20057
283HOSTNAME = localhost
284HOME = $SERVICEHOME
285BINARY = gnunet-service-core
286ACCEPT_FROM = 127.0.0.1;
287ACCEPT_FROM6 = ::1;
288UNIXPATH = /tmp/test-service-core-45
289UNIX_MATCH_UID = YES
290UNIX_MATCH_GID = YES
291
292[nat]
293BEHIND_NAT = YES
294PUNCHED_NAT = NO
295ENABLE_UPNP = NO
296USE_LOCALADDR = YES
297USE_HOSTNAME = NO
298ENABLE_ICMP_CLIENT = NO
299ENABLE_ICMP_SERVER = NO
300DISABLEV6 = YES
301RETURN_LOCAL_ADDRESSES = NO
302HOSTNAME_DNS_FREQUENCY = 1200000
303IFC_SCAN_FREQUENCY = 3000000
304DYNDNS_FREQUENCY = 140000
305EXTERNAL_ADDRESS = 127.0.0.1
306INTERNAL_ADDRESS = 127.0.0.1
307BINDTO = 127.0.0.1
308
309[gnunet-nat-server]
310HOSTNAME = gnunet.org
311PORT = 20056
312
313[statistics]
314AUTOSTART = YES
315PORT = 20055
316HOSTNAME = localhost
317HOME = $SERVICEHOME
318BINARY = gnunet-service-statistics
319ACCEPT_FROM = 127.0.0.1;
320ACCEPT_FROM6 = ::1;
321UNIXPATH = /tmp/test-service-statistics-44
322UNIX_MATCH_UID = NO
323UNIX_MATCH_GID = YES
324
325[dht]
326AUTOSTART = YES
327PORT = 20054
328HOSTNAME = localhost
329HOME = $SERVICEHOME
330BINARY = gnunet-service-dht
331ACCEPT_FROM = 127.0.0.1;
332ACCEPT_FROM6 = ::1;
333BUCKET_SIZE = 4
334UNIXPATH = /tmp/test-service-dht-43
335UNIX_MATCH_UID = YES
336UNIX_MATCH_GID = YES
337
338[chat]
339UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp-1
340UNIX_MATCH_UID = YES
341UNIX_MATCH_GID = YES
342
343[dv]
344UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp-1
345UNIX_MATCH_UID = YES
346UNIX_MATCH_GID = YES
347
348[dhtcache]
349DATABASE = sqlite
350QUOTA = 1 MB
351[consensus]
352AUTOSTART = NO
353 60
61[transport-https]
62PORT = 0
354 63
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
index 6edd8cc7e..82c5abb84 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
@@ -1,354 +1,66 @@
1[PATHS] 1@INCLUDE@ test_defaults.conf
2SERVICEHOME = /tmp/c_normal_client
3
4[gnunetd]
5HOSTKEY = hostkeys/0002-hostkey
6
7[client]
8HOME = $SERVICEHOME
9 2
10[gns] 3[arm]
11AUTOSTART = NO 4UNIXPATH = /tmp/test-service-arm-46
12 5PORT = 20058
13[namestore]
14AUTOSTART = NO
15
16[vpn]
17AUTOSTART = YES
18PORT = 0
19HOSTNAME = localhost
20HOME = $SERVICEHOME
21BINARY = gnunet-service-dns
22ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1;
24UNIXPATH = /tmp/gnunet-service-vpn-57
25
26
27[resolver]
28AUTOSTART = YES
29PORT = 20071
30HOSTNAME = localhost
31HOME = $SERVICEHOME
32BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1;
35UNIXPATH = /tmp/test-service-resolver-56
36UNIX_MATCH_UID = NO
37UNIX_MATCH_GID = NO
38 6
39[mesh] 7[lockmanager]
40AUTOSTART = YES 8AUTOSTART = YES
41PORT = 20070
42HOSTNAME = localhost
43HOME = $SERVICEHOME
44BINARY = gnunet-service-mesh
45ACCEPT_FROM = 127.0.0.1;
46ACCEPT_FROM6 = ::1;
47UNIXPATH = /tmp/test-service-mesh-55
48UNIX_MATCH_UID = YES
49UNIX_MATCH_GID = YES
50 9
51[nse] 10[core]
52AUTOSTART = YES 11UNIXPATH = /tmp/test-service-core-45
53PORT = 20069 12PORT = 20057
54HOSTNAME = localhost
55HOME = $SERVICEHOME
56BINARY = gnunet-service-nse
57ACCEPT_FROM = 127.0.0.1;
58ACCEPT_FROM6 = ::1;
59UNIXPATH = /tmp/test-service-nse-54
60UNIX_MATCH_UID = YES
61UNIX_MATCH_GID = YES
62PROOFFILE = $SERVICEHOME/.nse-proof
63HISTOGRAM = $SERVICEHOME/nse-history.log
64WORKDELAY = 5 ms
65INTERVAL = 1 h
66WORKBITS = 1
67 13
68[topology] 14[ats]
69MINIMUM-FRIENDS = 0 15UNIXPATH = /tmp/test-service-ats-51
70FRIENDS-ONLY = NO 16PORT = 20066
71AUTOCONNECT = YES
72TARGET-CONNECTION-COUNT = 16
73FRIENDS = $SERVICEHOME/friends
74BINARY = gnunet-daemon-topology
75 17
76[datastore] 18[datastore]
77AUTOSTART = YES
78UNIXPATH = /tmp/test-service-datastore-53 19UNIXPATH = /tmp/test-service-datastore-53
79UNIX_MATCH_UID = YES
80UNIX_MATCH_GID = YES
81PORT = 20068 20PORT = 20068
82HOSTNAME = localhost
83HOME = $SERVICEHOME
84BINARY = gnunet-service-datastore
85ACCEPT_FROM = 127.0.0.1;
86ACCEPT_FROM6 = ::1;
87QUOTA = 100 MB
88BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
89DATABASE = sqlite
90
91[datastore-sqlite]
92FILENAME = $SERVICEHOME/datastore/sqlite.db
93
94[datastore-postgres]
95CONFIG = connect_timeout=10; dbname=gnunet
96 21
97[datastore-mysql] 22[resolver]
98DATABASE = gnunet 23UNIXPATH = /tmp/test-service-resolver-56
99CONFIG = ~/.my.cnf 24PORT = 20071
100
101[peerinfo]
102AUTOSTART = YES
103PORT = 20067
104HOSTNAME = localhost
105HOME = $SERVICEHOME
106BINARY = gnunet-service-peerinfo
107ACCEPT_FROM = 127.0.0.1;
108ACCEPT_FROM6 = ::1;
109UNIXPATH = /tmp/test-service-peerinfo-52
110UNIX_MATCH_UID = NO
111UNIX_MATCH_GID = YES
112HOSTS = $SERVICEHOME/data/hosts/
113 25
114[TESTING] 26[dht]
115WEAKRANDOM = NO 27UNIXPATH = /tmp/test-service-dht-43
116CONNECT_TIMEOUT = 30 s 28PORT = 20054
117CONNECT_ATTEMPTS = 3
118MAX_OUTSTANDING_CONNECTIONS = 50
119DELETE_FILES = YES
120 29
121[ats] 30[fs]
122AUTOSTART = YES 31UNIXPATH = /tmp/test-service-fs-48
123PORT = 20066 32PORT = 20059
124HOSTNAME = localhost
125HOME = $SERVICEHOME
126BINARY = gnunet-service-ats
127ACCEPT_FROM = 127.0.0.1;
128ACCEPT_FROM6 = ::1;
129UNIXPATH = /tmp/test-service-ats-51
130UNIX_MATCH_UID = YES
131UNIX_MATCH_GID = YES
132WAN_QUOTA_IN = unlimited
133WAN_QUOTA_OUT = unlimited
134DUMP_MLP = NO
135DUMP_SOLUTION = NO
136DUMP_OVERWRITE = NO
137DUMP_MIN_PEERS = 0
138DUMP_MIN_ADDRS = 0
139ATS_MIN_INTERVAL = 15000
140ATS_EXEC_INTERVAL = 30000
141 33
142[transport] 34[transport]
143AUTOSTART = YES
144PORT = 20065
145HOSTNAME = localhost
146HOME = $SERVICEHOME
147BINARY = gnunet-service-transport
148NEIGHBOUR_LIMIT = 50
149ACCEPT_FROM = 127.0.0.1;
150ACCEPT_FROM6 = ::1;
151PLUGINS = tcp udp http 35PLUGINS = tcp udp http
152UNIXPATH = /tmp/test-service-transport-50 36UNIXPATH = /tmp/test-service-transport-50
153BLACKLIST_FILE = $SERVICEHOME/blacklist 37PORT = 20065
154UNIX_MATCH_UID = YES
155UNIX_MATCH_GID = YES
156 38
157[transport-tcp] 39[transport-tcp]
158PORT = 0 40PORT = 0
159ADVERTISED_PORT = 20064 41ADVERTISED_PORT = 20064
160MAX_CONNECTIONS = 128
161TIMEOUT = 5 s
162USE_LOCALADDR = YES
163 42
164[transport-udp] 43[transport-udp]
165PORT = 0 44PORT = 0
166BROADCAST = YES
167BROADCAST_INTERVAL = 30000
168MAX_BPS = 1000000
169USE_LOCALADDR = YES
170 45
171[transport-http] 46[dv]
172PORT = 0 47UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp_http
173MAX_CONNECTIONS = 128
174
175[transport-https]
176PORT = 0
177CRYPTO_INIT = NORMAL
178KEY_FILE = https.key
179CERT_FILE = https.cert
180MAX_CONNECTIONS = 128
181
182[transport-wlan]
183INTERFACE = mon0
184TESTMODE = 0
185
186[datacache-mysql]
187DATABASE = gnunet
188CONFIG = ~/.my.cnf
189
190[datacache-postgres]
191CONFIG = connect_timeout=10; dbname=gnunet
192
193[template]
194AUTOSTART = NO
195PORT = 20060
196HOSTNAME = localhost
197HOME = $SERVICEHOME
198BINARY = gnunet-service-template
199ACCEPT_FROM = 127.0.0.1;
200ACCEPT_FROM6 = ::1;
201UNIXPATH = /tmp/test-service-template-49
202UNIX_MATCH_UID = YES
203UNIX_MATCH_GID = YES
204 48
205[fs] 49[peerinfo]
206AUTOSTART = YES 50UNIXPATH = /tmp/test-service-peerinfo-52
207INDEXDB = $SERVICEHOME/idxinfo.lst 51USE_INCLUDED_HELLOS = YES
208TRUST = $SERVICEHOME/data/credit/ 52PORT = 20067
209IDENTITY_DIR = $SERVICEHOME/identities/
210STATE_DIR = $SERVICEHOME/persistence/
211UPDATE_DIR = $SERVICEHOME/updates/
212PORT = 20059
213HOSTNAME = localhost
214HOME = $SERVICEHOME
215BINARY = gnunet-service-fs
216ACCEPT_FROM = 127.0.0.1;
217ACCEPT_FROM6 = ::1;
218DELAY = YES
219CONTENT_CACHING = YES
220CONTENT_PUSHING = YES
221UNIXPATH = /tmp/test-service-fs-48
222UNIX_MATCH_UID = NO
223UNIX_MATCH_GID = YES
224MAX_PENDING_REQUESTS = 65536
225MIN_MIGRATION_DELAY = 100 ms
226EXPECTED_NEIGHBOUR_COUNT = 128
227 53
228[vpn] 54[PATHS]
229BINARY = gnunet-daemon-vpn 55SERVICEHOME = /tmp/c_normal_client
230IPV6ADDR = 1234::1
231IPV6PREFIX = 32
232IPV4ADDR = 10.11.10.1
233IPV4MASK = 255.255.0.0
234VIRTDNS = 10.11.10.2
235VIRTDNS6 = 1234::17
236IFNAME = vpn-gnunet
237 56
238[exit] 57[nse]
239BINARY = gnunet-daemon-exit 58UNIXPATH = /tmp/test-service-nse-54
240IPV6ADDR = 1234:1::1 59PORT = 20069
241IPV6PREFIX = 32
242IPV4ADDR = 10.10.1.1
243IPV4MASK = 255.255.0.0
244IFNAME = exit-gnunet
245ENABLE_UDP = NO
246ENABLE_TCP = NO
247 60
248[dns] 61[transport-http]
249AUTOSTART = YES
250PORT = 0 62PORT = 0
251HOSTNAME = localhost
252HOME = $SERVICEHOME
253BINARY = gnunet-service-dns
254ACCEPT_FROM = 127.0.0.1;
255ACCEPT_FROM6 = ::1;
256UNIXPATH = /tmp/test-service-dns-47
257PROVIDE_EXIT = NO
258
259[arm]
260PORT = 20058
261HOSTNAME = localhost
262HOME = $SERVICEHOME
263BINARY = gnunet-service-arm
264ACCEPT_FROM = 127.0.0.1;
265ACCEPT_FROM6 = ::1;
266DEFAULTSERVICES = topology hostlist fs
267UNIXPATH = /tmp/test-service-arm-46
268UNIX_MATCH_UID = YES
269UNIX_MATCH_GID = YES
270
271[hostlist]
272HTTPPORT = 8080
273HOME = $SERVICEHOME
274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
275BINARY = gnunet-daemon-hostlist
276OPTIONS = -b
277SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
278HTTP-PROXY =
279
280[core]
281AUTOSTART = YES
282PORT = 20057
283HOSTNAME = localhost
284HOME = $SERVICEHOME
285BINARY = gnunet-service-core
286ACCEPT_FROM = 127.0.0.1;
287ACCEPT_FROM6 = ::1;
288UNIXPATH = /tmp/test-service-core-45
289UNIX_MATCH_UID = YES
290UNIX_MATCH_GID = YES
291
292[nat]
293BEHIND_NAT = YES
294PUNCHED_NAT = NO
295ENABLE_UPNP = NO
296USE_LOCALADDR = YES
297USE_HOSTNAME = NO
298ENABLE_ICMP_CLIENT = NO
299ENABLE_ICMP_SERVER = NO
300DISABLEV6 = YES
301RETURN_LOCAL_ADDRESSES = NO
302HOSTNAME_DNS_FREQUENCY = 1200000
303IFC_SCAN_FREQUENCY = 3000000
304DYNDNS_FREQUENCY = 140000
305EXTERNAL_ADDRESS = 127.0.0.1
306INTERNAL_ADDRESS = 127.0.0.1
307BINDTO = 127.0.0.1
308
309[gnunet-nat-server]
310HOSTNAME = gnunet.org
311PORT = 20056
312
313[statistics]
314AUTOSTART = YES
315PORT = 20055
316HOSTNAME = localhost
317HOME = $SERVICEHOME
318BINARY = gnunet-service-statistics
319ACCEPT_FROM = 127.0.0.1;
320ACCEPT_FROM6 = ::1;
321UNIXPATH = /tmp/test-service-statistics-44
322UNIX_MATCH_UID = NO
323UNIX_MATCH_GID = YES
324
325[dht]
326AUTOSTART = YES
327PORT = 20054
328HOSTNAME = localhost
329HOME = $SERVICEHOME
330BINARY = gnunet-service-dht
331ACCEPT_FROM = 127.0.0.1;
332ACCEPT_FROM6 = ::1;
333BUCKET_SIZE = 4
334UNIXPATH = /tmp/test-service-dht-43
335UNIX_MATCH_UID = YES
336UNIX_MATCH_GID = YES
337
338[chat]
339UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp_http
340UNIX_MATCH_UID = YES
341UNIX_MATCH_GID = YES
342
343[dv]
344UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp_http
345UNIX_MATCH_UID = YES
346UNIX_MATCH_GID = YES
347
348[dhtcache]
349DATABASE = sqlite
350QUOTA = 1 MB
351[consensus]
352AUTOSTART = NO
353 63
64[transport-https]
65PORT = 0
354 66
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
new file mode 100644
index 000000000..7da40e583
--- /dev/null
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -0,0 +1,93 @@
1[arm]
2DEFAULTSERVICES = topology hostlist fs
3
4[namestore]
5AUTOSTART = NO
6
7[dns]
8UNIXPATH = /tmp/test-service-dns-47
9PORT = 0
10ACCEPT_FROM = 127.0.0.1;
11ACCEPT_FROM6 = ::1;
12PROVIDE_EXIT = NO
13
14[consensus]
15AUTOSTART = NO
16
17[lockmanager]
18AUTOSTART = NO
19
20[ats]
21WAN_QUOTA_IN = unlimited
22WAN_QUOTA_OUT = unlimited
23ATS_MIN_INTERVAL = 15000
24ATS_EXEC_INTERVAL = 30000
25
26[mesh]
27UNIXPATH = /tmp/test-service-mesh-55
28PORT = 20070
29
30[datastore]
31UNIX_MATCH_UID = YES
32QUOTA = 100 MB
33BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
34
35[dhtcache]
36DATABASE = sqlite
37QUOTA = 1 MB
38
39[TESTING]
40WEAKRANDOM = NO
41
42[nat]
43BEHIND_NAT = YES
44DISABLEV6 = YES
45EXTERNAL_ADDRESS = 127.0.0.1
46INTERNAL_ADDRESS = 127.0.0.1
47BINDTO = 127.0.0.1
48
49[fs]
50INDEXDB = $SERVICEHOME/idxinfo.lst
51IDENTITY_DIR = $SERVICEHOME/identities/
52STATE_DIR = $SERVICEHOME/persistence/
53UPDATE_DIR = $SERVICEHOME/updates/
54TRUST = $SERVICEHOME/data/credit/
55
56[transport]
57PLUGINS = tcp
58
59[transport-tcp]
60USE_LOCALADDR = YES
61
62[transport-udp]
63BROADCAST_INTERVAL = 30000
64USE_LOCALADDR = YES
65
66[hostlist]
67SERVERS =
68
69[vpn]
70UNIXPATH = /tmp/gnunet-service-vpn-57
71PORT = 0
72
73[peerinfo]
74USE_INCLUDED_HELLOS = NO
75
76[statistics]
77UNIXPATH = /tmp/test-service-statistics-44
78PORT = 20055
79
80[template]
81AUTOSTART = NO
82
83[nse]
84WORKBITS = 1
85
86[gns]
87AUTOSTART = NO
88
89[datacache-mysql]
90DATABASE = gnunet
91CONFIG = ~/.my.cnf
92
93
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 09:29:59 +0000