aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests/confs
diff options
context:
space:
mode:
Diffstat (limited to 'src/integration-tests/confs')
-rw-r--r--src/integration-tests/confs/c_bootstrap_server.conf22
-rw-r--r--src/integration-tests/confs/c_bootstrap_server_w_massif.conf20
-rw-r--r--src/integration-tests/confs/c_nat_client.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client_2.conf19
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http_2.conf19
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix_2.conf19
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp.conf20
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp.conf22
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp_http.conf22
12 files changed, 3 insertions, 240 deletions
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index e96c31cf4..70c50ec53 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_bootstrap_server/ 2SERVICEHOME = /tmp/c_bootstrap_server/
3DEFAULTCONFIG = confs/c_bootstrap_server.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
11PORT = 0 10PORT = 0
12HOSTNAME = localhost 11HOSTNAME = localhost
13HOME = $SERVICEHOME 12HOME = $SERVICEHOME
14CONFIG = $DEFAULTCONFIG
15BINARY = gnunet-service-dns 13BINARY = gnunet-service-dns
16ACCEPT_FROM = 127.0.0.1; 14ACCEPT_FROM = 127.0.0.1;
17ACCEPT_FROM6 = ::1; 15ACCEPT_FROM6 = ::1;
@@ -22,7 +20,6 @@ AUTOSTART = YES
22PORT = 20017 20PORT = 20017
23HOSTNAME = localhost 21HOSTNAME = localhost
24HOME = $SERVICEHOME 22HOME = $SERVICEHOME
25CONFIG = $DEFAULTCONFIG
26BINARY = gnunet-service-resolver 23BINARY = gnunet-service-resolver
27ACCEPT_FROM = 127.0.0.1; 24ACCEPT_FROM = 127.0.0.1;
28ACCEPT_FROM6 = ::1; 25ACCEPT_FROM6 = ::1;
@@ -35,7 +32,6 @@ AUTOSTART = YES
35PORT = 20016 32PORT = 20016
36HOSTNAME = localhost 33HOSTNAME = localhost
37HOME = $SERVICEHOME 34HOME = $SERVICEHOME
38CONFIG = $DEFAULTCONFIG
39BINARY = gnunet-service-mesh 35BINARY = gnunet-service-mesh
40ACCEPT_FROM = 127.0.0.1; 36ACCEPT_FROM = 127.0.0.1;
41ACCEPT_FROM6 = ::1; 37ACCEPT_FROM6 = ::1;
@@ -48,7 +44,6 @@ AUTOSTART = YES
48PORT = 20015 44PORT = 20015
49HOSTNAME = localhost 45HOSTNAME = localhost
50HOME = $SERVICEHOME 46HOME = $SERVICEHOME
51CONFIG = $DEFAULTCONFIG
52BINARY = gnunet-service-nse 47BINARY = gnunet-service-nse
53ACCEPT_FROM = 127.0.0.1; 48ACCEPT_FROM = 127.0.0.1;
54ACCEPT_FROM6 = ::1; 49ACCEPT_FROM6 = ::1;
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO
67AUTOCONNECT = YES 62AUTOCONNECT = YES
68TARGET-CONNECTION-COUNT = 16 63TARGET-CONNECTION-COUNT = 16
69FRIENDS = $SERVICEHOME/friends 64FRIENDS = $SERVICEHOME/friends
70CONFIG = $DEFAULTCONFIG
71BINARY = gnunet-daemon-topology 65BINARY = gnunet-daemon-topology
72 66
73[datastore] 67[datastore]
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES
78PORT = 20014 72PORT = 20014
79HOSTNAME = localhost 73HOSTNAME = localhost
80HOME = $SERVICEHOME 74HOME = $SERVICEHOME
81CONFIG = $DEFAULTCONFIG
82BINARY = gnunet-service-datastore 75BINARY = gnunet-service-datastore
83ACCEPT_FROM = 127.0.0.1; 76ACCEPT_FROM = 127.0.0.1;
84ACCEPT_FROM6 = ::1; 77ACCEPT_FROM6 = ::1;
@@ -101,7 +94,6 @@ AUTOSTART = YES
101PORT = 20013 94PORT = 20013
102HOSTNAME = localhost 95HOSTNAME = localhost
103HOME = $SERVICEHOME 96HOME = $SERVICEHOME
104CONFIG = $DEFAULTCONFIG
105BINARY = gnunet-service-peerinfo 97BINARY = gnunet-service-peerinfo
106ACCEPT_FROM = 127.0.0.1; 98ACCEPT_FROM = 127.0.0.1;
107ACCEPT_FROM6 = ::1; 99ACCEPT_FROM6 = ::1;
@@ -125,7 +117,6 @@ AUTOSTART = YES
125PORT = 20012 117PORT = 20012
126HOSTNAME = localhost 118HOSTNAME = localhost
127HOME = $SERVICEHOME 119HOME = $SERVICEHOME
128CONFIG = $DEFAULTCONFIG
129BINARY = gnunet-service-ats 120BINARY = gnunet-service-ats
130ACCEPT_FROM = 127.0.0.1; 121ACCEPT_FROM = 127.0.0.1;
131ACCEPT_FROM6 = ::1; 122ACCEPT_FROM6 = ::1;
@@ -147,7 +138,6 @@ AUTOSTART = YES
147PORT = 20011 138PORT = 20011
148HOSTNAME = localhost 139HOSTNAME = localhost
149HOME = $SERVICEHOME 140HOME = $SERVICEHOME
150CONFIG = $DEFAULTCONFIG
151BINARY = gnunet-service-transport 141BINARY = gnunet-service-transport
152NEIGHBOUR_LIMIT = 50 142NEIGHBOUR_LIMIT = 50
153ACCEPT_FROM = 127.0.0.1; 143ACCEPT_FROM = 127.0.0.1;
@@ -199,7 +189,6 @@ AUTOSTART = NO
199PORT = 20006 189PORT = 20006
200HOSTNAME = localhost 190HOSTNAME = localhost
201HOME = $SERVICEHOME 191HOME = $SERVICEHOME
202CONFIG = $DEFAULTCONFIG
203BINARY = gnunet-service-template 192BINARY = gnunet-service-template
204ACCEPT_FROM = 127.0.0.1; 193ACCEPT_FROM = 127.0.0.1;
205ACCEPT_FROM6 = ::1; 194ACCEPT_FROM6 = ::1;
@@ -217,7 +206,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
217PORT = 20005 206PORT = 20005
218HOSTNAME = localhost 207HOSTNAME = localhost
219HOME = $SERVICEHOME 208HOME = $SERVICEHOME
220CONFIG = $DEFAULTCONFIG
221BINARY = gnunet-service-fs 209BINARY = gnunet-service-fs
222ACCEPT_FROM = 127.0.0.1; 210ACCEPT_FROM = 127.0.0.1;
223ACCEPT_FROM6 = ::1; 211ACCEPT_FROM6 = ::1;
@@ -232,7 +220,6 @@ MIN_MIGRATION_DELAY = 100 ms
232EXPECTED_NEIGHBOUR_COUNT = 128 220EXPECTED_NEIGHBOUR_COUNT = 128
233 221
234[vpn] 222[vpn]
235CONFIG = $DEFAULTCONFIG
236BINARY = gnunet-daemon-vpn 223BINARY = gnunet-daemon-vpn
237IPV6ADDR = 1234::1 224IPV6ADDR = 1234::1
238IPV6PREFIX = 32 225IPV6PREFIX = 32
@@ -243,7 +230,6 @@ VIRTDNS6 = 1234::17
243IFNAME = vpn-gnunet 230IFNAME = vpn-gnunet
244 231
245[exit] 232[exit]
246CONFIG = $DEFAULTCONFIG
247BINARY = gnunet-daemon-exit 233BINARY = gnunet-daemon-exit
248IPV6ADDR = 1234:1::1 234IPV6ADDR = 1234:1::1
249IPV6PREFIX = 32 235IPV6PREFIX = 32
@@ -258,7 +244,6 @@ AUTOSTART = YES
258PORT = 0 244PORT = 0
259HOSTNAME = localhost 245HOSTNAME = localhost
260HOME = $SERVICEHOME 246HOME = $SERVICEHOME
261CONFIG = $DEFAULTCONFIG
262BINARY = gnunet-service-dns 247BINARY = gnunet-service-dns
263ACCEPT_FROM = 127.0.0.1; 248ACCEPT_FROM = 127.0.0.1;
264ACCEPT_FROM6 = ::1; 249ACCEPT_FROM6 = ::1;
@@ -269,7 +254,6 @@ PROVIDE_EXIT = NO
269PORT = 20004 254PORT = 20004
270HOSTNAME = localhost 255HOSTNAME = localhost
271HOME = $SERVICEHOME 256HOME = $SERVICEHOME
272CONFIG = $DEFAULTCONFIG
273BINARY = gnunet-service-arm 257BINARY = gnunet-service-arm
274ACCEPT_FROM = 127.0.0.1; 258ACCEPT_FROM = 127.0.0.1;
275ACCEPT_FROM6 = ::1; 259ACCEPT_FROM6 = ::1;
@@ -282,7 +266,6 @@ UNIX_MATCH_GID = YES
282HTTPPORT = 8080 266HTTPPORT = 8080
283HOME = $SERVICEHOME 267HOME = $SERVICEHOME
284HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 268HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
285CONFIG = $DEFAULTCONFIG
286BINARY = gnunet-daemon-hostlist 269BINARY = gnunet-daemon-hostlist
287OPTIONS = -p 270OPTIONS = -p
288#SERVERS = http://v9.gnunet.org:58080/ 271#SERVERS = http://v9.gnunet.org:58080/
@@ -293,7 +276,6 @@ AUTOSTART = YES
293PORT = 20003 276PORT = 20003
294HOSTNAME = localhost 277HOSTNAME = localhost
295HOME = $SERVICEHOME 278HOME = $SERVICEHOME
296CONFIG = $DEFAULTCONFIG
297BINARY = gnunet-service-core 279BINARY = gnunet-service-core
298ACCEPT_FROM = 127.0.0.1; 280ACCEPT_FROM = 127.0.0.1;
299ACCEPT_FROM6 = ::1; 281ACCEPT_FROM6 = ::1;
@@ -327,7 +309,6 @@ AUTOSTART = YES
327PORT = 20001 309PORT = 20001
328HOSTNAME = localhost 310HOSTNAME = localhost
329HOME = $SERVICEHOME 311HOME = $SERVICEHOME
330CONFIG = $DEFAULTCONFIG
331BINARY = gnunet-service-statistics 312BINARY = gnunet-service-statistics
332ACCEPT_FROM = 127.0.0.1; 313ACCEPT_FROM = 127.0.0.1;
333ACCEPT_FROM6 = ::1; 314ACCEPT_FROM6 = ::1;
@@ -340,7 +321,6 @@ AUTOSTART = YES
340PORT = 20000 321PORT = 20000
341HOSTNAME = localhost 322HOSTNAME = localhost
342HOME = $SERVICEHOME 323HOME = $SERVICEHOME
343CONFIG = $DEFAULTCONFIG
344BINARY = gnunet-service-dht 324BINARY = gnunet-service-dht
345ACCEPT_FROM = 127.0.0.1; 325ACCEPT_FROM = 127.0.0.1;
346ACCEPT_FROM6 = ::1; 326ACCEPT_FROM6 = ::1;
@@ -370,4 +350,4 @@ AUTOSTART = NO
370AUTOSTART = NO 350AUTOSTART = NO
371 351
372[lockmanager] 352[lockmanager]
373AUTOSTART = NO \ No newline at end of file 353AUTOSTART = NO
diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
index 5081553c9..77dcd7427 100644
--- a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
+++ b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_bootstrap_server/ 2SERVICEHOME = /tmp/c_bootstrap_server/
3DEFAULTCONFIG = confs/c_bootstrap_server_w_massif.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
11PORT = 0 10PORT = 0
12HOSTNAME = localhost 11HOSTNAME = localhost
13HOME = $SERVICEHOME 12HOME = $SERVICEHOME
14CONFIG = $DEFAULTCONFIG
15BINARY = gnunet-service-dns 13BINARY = gnunet-service-dns
16ACCEPT_FROM = 127.0.0.1; 14ACCEPT_FROM = 127.0.0.1;
17ACCEPT_FROM6 = ::1; 15ACCEPT_FROM6 = ::1;
@@ -22,7 +20,6 @@ AUTOSTART = YES
22PORT = 20017 20PORT = 20017
23HOSTNAME = localhost 21HOSTNAME = localhost
24HOME = $SERVICEHOME 22HOME = $SERVICEHOME
25CONFIG = $DEFAULTCONFIG
26BINARY = gnunet-service-resolver 23BINARY = gnunet-service-resolver
27ACCEPT_FROM = 127.0.0.1; 24ACCEPT_FROM = 127.0.0.1;
28ACCEPT_FROM6 = ::1; 25ACCEPT_FROM6 = ::1;
@@ -35,7 +32,6 @@ AUTOSTART = YES
35PORT = 20016 32PORT = 20016
36HOSTNAME = localhost 33HOSTNAME = localhost
37HOME = $SERVICEHOME 34HOME = $SERVICEHOME
38CONFIG = $DEFAULTCONFIG
39BINARY = gnunet-service-mesh 35BINARY = gnunet-service-mesh
40ACCEPT_FROM = 127.0.0.1; 36ACCEPT_FROM = 127.0.0.1;
41ACCEPT_FROM6 = ::1; 37ACCEPT_FROM6 = ::1;
@@ -48,7 +44,6 @@ AUTOSTART = YES
48PORT = 20015 44PORT = 20015
49HOSTNAME = localhost 45HOSTNAME = localhost
50HOME = $SERVICEHOME 46HOME = $SERVICEHOME
51CONFIG = $DEFAULTCONFIG
52BINARY = gnunet-service-nse 47BINARY = gnunet-service-nse
53ACCEPT_FROM = 127.0.0.1; 48ACCEPT_FROM = 127.0.0.1;
54ACCEPT_FROM6 = ::1; 49ACCEPT_FROM6 = ::1;
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO
67AUTOCONNECT = YES 62AUTOCONNECT = YES
68TARGET-CONNECTION-COUNT = 16 63TARGET-CONNECTION-COUNT = 16
69FRIENDS = $SERVICEHOME/friends 64FRIENDS = $SERVICEHOME/friends
70CONFIG = $DEFAULTCONFIG
71BINARY = gnunet-daemon-topology 65BINARY = gnunet-daemon-topology
72 66
73[datastore] 67[datastore]
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES
78PORT = 20014 72PORT = 20014
79HOSTNAME = localhost 73HOSTNAME = localhost
80HOME = $SERVICEHOME 74HOME = $SERVICEHOME
81CONFIG = $DEFAULTCONFIG
82BINARY = gnunet-service-datastore 75BINARY = gnunet-service-datastore
83ACCEPT_FROM = 127.0.0.1; 76ACCEPT_FROM = 127.0.0.1;
84ACCEPT_FROM6 = ::1; 77ACCEPT_FROM6 = ::1;
@@ -101,7 +94,6 @@ AUTOSTART = YES
101PORT = 20013 94PORT = 20013
102HOSTNAME = localhost 95HOSTNAME = localhost
103HOME = $SERVICEHOME 96HOME = $SERVICEHOME
104CONFIG = $DEFAULTCONFIG
105BINARY = gnunet-service-peerinfo 97BINARY = gnunet-service-peerinfo
106ACCEPT_FROM = 127.0.0.1; 98ACCEPT_FROM = 127.0.0.1;
107ACCEPT_FROM6 = ::1; 99ACCEPT_FROM6 = ::1;
@@ -125,7 +117,6 @@ AUTOSTART = YES
125PORT = 20012 117PORT = 20012
126HOSTNAME = localhost 118HOSTNAME = localhost
127HOME = $SERVICEHOME 119HOME = $SERVICEHOME
128CONFIG = $DEFAULTCONFIG
129BINARY = gnunet-service-ats 120BINARY = gnunet-service-ats
130ACCEPT_FROM = 127.0.0.1; 121ACCEPT_FROM = 127.0.0.1;
131ACCEPT_FROM6 = ::1; 122ACCEPT_FROM6 = ::1;
@@ -148,7 +139,6 @@ AUTOSTART = YES
148PORT = 20011 139PORT = 20011
149HOSTNAME = localhost 140HOSTNAME = localhost
150HOME = $SERVICEHOME 141HOME = $SERVICEHOME
151CONFIG = $DEFAULTCONFIG
152BINARY = gnunet-service-transport 142BINARY = gnunet-service-transport
153NEIGHBOUR_LIMIT = 50 143NEIGHBOUR_LIMIT = 50
154ACCEPT_FROM = 127.0.0.1; 144ACCEPT_FROM = 127.0.0.1;
@@ -200,7 +190,6 @@ AUTOSTART = NO
200PORT = 20006 190PORT = 20006
201HOSTNAME = localhost 191HOSTNAME = localhost
202HOME = $SERVICEHOME 192HOME = $SERVICEHOME
203CONFIG = $DEFAULTCONFIG
204BINARY = gnunet-service-template 193BINARY = gnunet-service-template
205ACCEPT_FROM = 127.0.0.1; 194ACCEPT_FROM = 127.0.0.1;
206ACCEPT_FROM6 = ::1; 195ACCEPT_FROM6 = ::1;
@@ -218,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
218PORT = 20005 207PORT = 20005
219HOSTNAME = localhost 208HOSTNAME = localhost
220HOME = $SERVICEHOME 209HOME = $SERVICEHOME
221CONFIG = $DEFAULTCONFIG
222BINARY = gnunet-service-fs 210BINARY = gnunet-service-fs
223ACCEPT_FROM = 127.0.0.1; 211ACCEPT_FROM = 127.0.0.1;
224ACCEPT_FROM6 = ::1; 212ACCEPT_FROM6 = ::1;
@@ -233,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms
233EXPECTED_NEIGHBOUR_COUNT = 128 221EXPECTED_NEIGHBOUR_COUNT = 128
234 222
235[vpn] 223[vpn]
236CONFIG = $DEFAULTCONFIG
237BINARY = gnunet-daemon-vpn 224BINARY = gnunet-daemon-vpn
238IPV6ADDR = 1234::1 225IPV6ADDR = 1234::1
239IPV6PREFIX = 32 226IPV6PREFIX = 32
@@ -244,7 +231,6 @@ VIRTDNS6 = 1234::17
244IFNAME = vpn-gnunet 231IFNAME = vpn-gnunet
245 232
246[exit] 233[exit]
247CONFIG = $DEFAULTCONFIG
248BINARY = gnunet-daemon-exit 234BINARY = gnunet-daemon-exit
249IPV6ADDR = 1234:1::1 235IPV6ADDR = 1234:1::1
250IPV6PREFIX = 32 236IPV6PREFIX = 32
@@ -259,7 +245,6 @@ AUTOSTART = YES
259PORT = 0 245PORT = 0
260HOSTNAME = localhost 246HOSTNAME = localhost
261HOME = $SERVICEHOME 247HOME = $SERVICEHOME
262CONFIG = $DEFAULTCONFIG
263BINARY = gnunet-service-dns 248BINARY = gnunet-service-dns
264ACCEPT_FROM = 127.0.0.1; 249ACCEPT_FROM = 127.0.0.1;
265ACCEPT_FROM6 = ::1; 250ACCEPT_FROM6 = ::1;
@@ -270,7 +255,6 @@ PROVIDE_EXIT = NO
270PORT = 20004 255PORT = 20004
271HOSTNAME = localhost 256HOSTNAME = localhost
272HOME = $SERVICEHOME 257HOME = $SERVICEHOME
273CONFIG = $DEFAULTCONFIG
274BINARY = gnunet-service-arm 258BINARY = gnunet-service-arm
275ACCEPT_FROM = 127.0.0.1; 259ACCEPT_FROM = 127.0.0.1;
276ACCEPT_FROM6 = ::1; 260ACCEPT_FROM6 = ::1;
@@ -283,7 +267,6 @@ UNIX_MATCH_GID = YES
283HTTPPORT = 8080 267HTTPPORT = 8080
284HOME = $SERVICEHOME 268HOME = $SERVICEHOME
285HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 269HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
286CONFIG = $DEFAULTCONFIG
287BINARY = gnunet-daemon-hostlist 270BINARY = gnunet-daemon-hostlist
288OPTIONS = -p 271OPTIONS = -p
289#SERVERS = http://v9.gnunet.org:58080/ 272#SERVERS = http://v9.gnunet.org:58080/
@@ -294,7 +277,6 @@ AUTOSTART = YES
294PORT = 20003 277PORT = 20003
295HOSTNAME = localhost 278HOSTNAME = localhost
296HOME = $SERVICEHOME 279HOME = $SERVICEHOME
297CONFIG = $DEFAULTCONFIG
298BINARY = gnunet-service-core 280BINARY = gnunet-service-core
299ACCEPT_FROM = 127.0.0.1; 281ACCEPT_FROM = 127.0.0.1;
300ACCEPT_FROM6 = ::1; 282ACCEPT_FROM6 = ::1;
@@ -328,7 +310,6 @@ AUTOSTART = YES
328PORT = 20001 310PORT = 20001
329HOSTNAME = localhost 311HOSTNAME = localhost
330HOME = $SERVICEHOME 312HOME = $SERVICEHOME
331CONFIG = $DEFAULTCONFIG
332BINARY = gnunet-service-statistics 313BINARY = gnunet-service-statistics
333ACCEPT_FROM = 127.0.0.1; 314ACCEPT_FROM = 127.0.0.1;
334ACCEPT_FROM6 = ::1; 315ACCEPT_FROM6 = ::1;
@@ -341,7 +322,6 @@ AUTOSTART = YES
341PORT = 20000 322PORT = 20000
342HOSTNAME = localhost 323HOSTNAME = localhost
343HOME = $SERVICEHOME 324HOME = $SERVICEHOME
344CONFIG = $DEFAULTCONFIG
345BINARY = gnunet-service-dht 325BINARY = gnunet-service-dht
346ACCEPT_FROM = 127.0.0.1; 326ACCEPT_FROM = 127.0.0.1;
347ACCEPT_FROM6 = ::1; 327ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 9e12bb9fa..ffba6d560 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_nat_client 2SERVICEHOME = /tmp/c_nat_client
3DEFAULTCONFIG = confs/c_nat_client.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = hostkeys/0002-hostkey 5HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
19PORT = 0 18PORT = 0
20HOSTNAME = localhost 19HOSTNAME = localhost
21HOME = $SERVICEHOME 20HOME = $SERVICEHOME
22CONFIG = $DEFAULTCONFIG
23BINARY = gnunet-service-dns 21BINARY = gnunet-service-dns
24ACCEPT_FROM = 127.0.0.1; 22ACCEPT_FROM = 127.0.0.1;
25ACCEPT_FROM6 = ::1; 23ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
31PORT = 20071 29PORT = 20071
32HOSTNAME = localhost 30HOSTNAME = localhost
33HOME = $SERVICEHOME 31HOME = $SERVICEHOME
34CONFIG = $DEFAULTCONFIG
35BINARY = gnunet-service-resolver 32BINARY = gnunet-service-resolver
36ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1; 34ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
44PORT = 20070 41PORT = 20070
45HOSTNAME = localhost 42HOSTNAME = localhost
46HOME = $SERVICEHOME 43HOME = $SERVICEHOME
47CONFIG = $DEFAULTCONFIG
48BINARY = gnunet-service-mesh 44BINARY = gnunet-service-mesh
49ACCEPT_FROM = 127.0.0.1; 45ACCEPT_FROM = 127.0.0.1;
50ACCEPT_FROM6 = ::1; 46ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
57PORT = 20069 53PORT = 20069
58HOSTNAME = localhost 54HOSTNAME = localhost
59HOME = $SERVICEHOME 55HOME = $SERVICEHOME
60CONFIG = $DEFAULTCONFIG
61BINARY = gnunet-service-nse 56BINARY = gnunet-service-nse
62ACCEPT_FROM = 127.0.0.1; 57ACCEPT_FROM = 127.0.0.1;
63ACCEPT_FROM6 = ::1; 58ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
76AUTOCONNECT = YES 71AUTOCONNECT = YES
77TARGET-CONNECTION-COUNT = 16 72TARGET-CONNECTION-COUNT = 16
78FRIENDS = $SERVICEHOME/friends 73FRIENDS = $SERVICEHOME/friends
79CONFIG = $DEFAULTCONFIG
80BINARY = gnunet-daemon-topology 74BINARY = gnunet-daemon-topology
81 75
82[datastore] 76[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
87PORT = 20068 81PORT = 20068
88HOSTNAME = localhost 82HOSTNAME = localhost
89HOME = $SERVICEHOME 83HOME = $SERVICEHOME
90CONFIG = $DEFAULTCONFIG
91BINARY = gnunet-service-datastore 84BINARY = gnunet-service-datastore
92ACCEPT_FROM = 127.0.0.1; 85ACCEPT_FROM = 127.0.0.1;
93ACCEPT_FROM6 = ::1; 86ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
110PORT = 20067 103PORT = 20067
111HOSTNAME = localhost 104HOSTNAME = localhost
112HOME = $SERVICEHOME 105HOME = $SERVICEHOME
113CONFIG = $DEFAULTCONFIG
114BINARY = gnunet-service-peerinfo 106BINARY = gnunet-service-peerinfo
115ACCEPT_FROM = 127.0.0.1; 107ACCEPT_FROM = 127.0.0.1;
116ACCEPT_FROM6 = ::1; 108ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20066 123PORT = 20066
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
153PORT = 20065 144PORT = 20065
154HOSTNAME = localhost 145HOSTNAME = localhost
155HOME = $SERVICEHOME 146HOME = $SERVICEHOME
156CONFIG = $DEFAULTCONFIG
157BINARY = gnunet-service-transport 147BINARY = gnunet-service-transport
158NEIGHBOUR_LIMIT = 50 148NEIGHBOUR_LIMIT = 50
159ACCEPT_FROM = 127.0.0.1; 149ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
205PORT = 20060 195PORT = 20060
206HOSTNAME = localhost 196HOSTNAME = localhost
207HOME = $SERVICEHOME 197HOME = $SERVICEHOME
208CONFIG = $DEFAULTCONFIG
209BINARY = gnunet-service-template 198BINARY = gnunet-service-template
210ACCEPT_FROM = 127.0.0.1; 199ACCEPT_FROM = 127.0.0.1;
211ACCEPT_FROM6 = ::1; 200ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
223PORT = 20059 212PORT = 20059
224HOSTNAME = localhost 213HOSTNAME = localhost
225HOME = $SERVICEHOME 214HOME = $SERVICEHOME
226CONFIG = $DEFAULTCONFIG
227BINARY = gnunet-service-fs 215BINARY = gnunet-service-fs
228ACCEPT_FROM = 127.0.0.1; 216ACCEPT_FROM = 127.0.0.1;
229ACCEPT_FROM6 = ::1; 217ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
238EXPECTED_NEIGHBOUR_COUNT = 128 226EXPECTED_NEIGHBOUR_COUNT = 128
239 227
240[vpn] 228[vpn]
241CONFIG = $DEFAULTCONFIG
242BINARY = gnunet-daemon-vpn 229BINARY = gnunet-daemon-vpn
243IPV6ADDR = 1234::1 230IPV6ADDR = 1234::1
244IPV6PREFIX = 32 231IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
249IFNAME = vpn-gnunet 236IFNAME = vpn-gnunet
250 237
251[exit] 238[exit]
252CONFIG = $DEFAULTCONFIG
253BINARY = gnunet-daemon-exit 239BINARY = gnunet-daemon-exit
254IPV6ADDR = 1234:1::1 240IPV6ADDR = 1234:1::1
255IPV6PREFIX = 32 241IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
264PORT = 0 250PORT = 0
265HOSTNAME = localhost 251HOSTNAME = localhost
266HOME = $SERVICEHOME 252HOME = $SERVICEHOME
267CONFIG = $DEFAULTCONFIG
268BINARY = gnunet-service-dns 253BINARY = gnunet-service-dns
269ACCEPT_FROM = 127.0.0.1; 254ACCEPT_FROM = 127.0.0.1;
270ACCEPT_FROM6 = ::1; 255ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
275PORT = 20058 260PORT = 20058
276HOSTNAME = localhost 261HOSTNAME = localhost
277HOME = $SERVICEHOME 262HOME = $SERVICEHOME
278CONFIG = $DEFAULTCONFIG
279BINARY = gnunet-service-arm 263BINARY = gnunet-service-arm
280ACCEPT_FROM = 127.0.0.1; 264ACCEPT_FROM = 127.0.0.1;
281ACCEPT_FROM6 = ::1; 265ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
288HTTPPORT = 8080 272HTTPPORT = 8080
289HOME = $SERVICEHOME 273HOME = $SERVICEHOME
290HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
291CONFIG = $DEFAULTCONFIG
292BINARY = gnunet-daemon-hostlist 275BINARY = gnunet-daemon-hostlist
293OPTIONS = -b 276OPTIONS = -b
294SERVERS = http://localhost:8080/ 277SERVERS = http://localhost:8080/
@@ -299,7 +282,6 @@ AUTOSTART = YES
299PORT = 20057 282PORT = 20057
300HOSTNAME = localhost 283HOSTNAME = localhost
301HOME = $SERVICEHOME 284HOME = $SERVICEHOME
302CONFIG = $DEFAULTCONFIG
303BINARY = gnunet-service-core 285BINARY = gnunet-service-core
304ACCEPT_FROM = 127.0.0.1; 286ACCEPT_FROM = 127.0.0.1;
305ACCEPT_FROM6 = ::1; 287ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
333PORT = 20055 315PORT = 20055
334HOSTNAME = localhost 316HOSTNAME = localhost
335HOME = $SERVICEHOME 317HOME = $SERVICEHOME
336CONFIG = $DEFAULTCONFIG
337BINARY = gnunet-service-statistics 318BINARY = gnunet-service-statistics
338ACCEPT_FROM = 127.0.0.1; 319ACCEPT_FROM = 127.0.0.1;
339ACCEPT_FROM6 = ::1; 320ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
346PORT = 20054 327PORT = 20054
347HOSTNAME = localhost 328HOSTNAME = localhost
348HOME = $SERVICEHOME 329HOME = $SERVICEHOME
349CONFIG = $DEFAULTCONFIG
350BINARY = gnunet-service-dht 330BINARY = gnunet-service-dht
351ACCEPT_FROM = 127.0.0.1; 331ACCEPT_FROM = 127.0.0.1;
352ACCEPT_FROM6 = ::1; 332ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index e3c30f783..8d4c7e3e8 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client/ 2SERVICEHOME = /tmp/c_no_nat_client/
3DEFAULTCONFIG = confs/c_no_nat_client.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 0 16PORT = 0
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-dns 19BINARY = gnunet-service-dns
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
28PORT = 20035 26PORT = 20035
29HOSTNAME = localhost 27HOSTNAME = localhost
30HOME = $SERVICEHOME 28HOME = $SERVICEHOME
31CONFIG = $DEFAULTCONFIG
32BINARY = gnunet-service-resolver 29BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1; 30ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1; 31ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
41PORT = 20034 38PORT = 20034
42HOSTNAME = localhost 39HOSTNAME = localhost
43HOME = $SERVICEHOME 40HOME = $SERVICEHOME
44CONFIG = $DEFAULTCONFIG
45BINARY = gnunet-service-mesh 41BINARY = gnunet-service-mesh
46ACCEPT_FROM = 127.0.0.1; 42ACCEPT_FROM = 127.0.0.1;
47ACCEPT_FROM6 = ::1; 43ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
54PORT = 20033 50PORT = 20033
55HOSTNAME = localhost 51HOSTNAME = localhost
56HOME = $SERVICEHOME 52HOME = $SERVICEHOME
57CONFIG = $DEFAULTCONFIG
58BINARY = gnunet-service-nse 53BINARY = gnunet-service-nse
59ACCEPT_FROM = 127.0.0.1; 54ACCEPT_FROM = 127.0.0.1;
60ACCEPT_FROM6 = ::1; 55ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
73AUTOCONNECT = YES 68AUTOCONNECT = YES
74TARGET-CONNECTION-COUNT = 16 69TARGET-CONNECTION-COUNT = 16
75FRIENDS = $SERVICEHOME/friends 70FRIENDS = $SERVICEHOME/friends
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-daemon-topology 71BINARY = gnunet-daemon-topology
78 72
79[datastore] 73[datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
84PORT = 20032 78PORT = 20032
85HOSTNAME = localhost 79HOSTNAME = localhost
86HOME = $SERVICEHOME 80HOME = $SERVICEHOME
87CONFIG = $DEFAULTCONFIG
88BINARY = gnunet-service-datastore 81BINARY = gnunet-service-datastore
89ACCEPT_FROM = 127.0.0.1; 82ACCEPT_FROM = 127.0.0.1;
90ACCEPT_FROM6 = ::1; 83ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
107PORT = 20031 100PORT = 20031
108HOSTNAME = localhost 101HOSTNAME = localhost
109HOME = $SERVICEHOME 102HOME = $SERVICEHOME
110CONFIG = $DEFAULTCONFIG
111BINARY = gnunet-service-peerinfo 103BINARY = gnunet-service-peerinfo
112ACCEPT_FROM = 127.0.0.1; 104ACCEPT_FROM = 127.0.0.1;
113ACCEPT_FROM6 = ::1; 105ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20030 123PORT = 20030
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@ AUTOSTART = YES
155PORT = 20029 146PORT = 20029
156HOSTNAME = localhost 147HOSTNAME = localhost
157HOME = $SERVICEHOME 148HOME = $SERVICEHOME
158CONFIG = $DEFAULTCONFIG
159BINARY = gnunet-service-transport 149BINARY = gnunet-service-transport
160NEIGHBOUR_LIMIT = 50 150NEIGHBOUR_LIMIT = 50
161ACCEPT_FROM = 127.0.0.1; 151ACCEPT_FROM = 127.0.0.1;
@@ -207,7 +197,6 @@ AUTOSTART = NO
207PORT = 20024 197PORT = 20024
208HOSTNAME = localhost 198HOSTNAME = localhost
209HOME = $SERVICEHOME 199HOME = $SERVICEHOME
210CONFIG = $DEFAULTCONFIG
211BINARY = gnunet-service-template 200BINARY = gnunet-service-template
212ACCEPT_FROM = 127.0.0.1; 201ACCEPT_FROM = 127.0.0.1;
213ACCEPT_FROM6 = ::1; 202ACCEPT_FROM6 = ::1;
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
225PORT = 20023 214PORT = 20023
226HOSTNAME = localhost 215HOSTNAME = localhost
227HOME = $SERVICEHOME 216HOME = $SERVICEHOME
228CONFIG = $DEFAULTCONFIG
229BINARY = gnunet-service-fs 217BINARY = gnunet-service-fs
230ACCEPT_FROM = 127.0.0.1; 218ACCEPT_FROM = 127.0.0.1;
231ACCEPT_FROM6 = ::1; 219ACCEPT_FROM6 = ::1;
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms
240EXPECTED_NEIGHBOUR_COUNT = 128 228EXPECTED_NEIGHBOUR_COUNT = 128
241 229
242[vpn] 230[vpn]
243CONFIG = $DEFAULTCONFIG
244BINARY = gnunet-daemon-vpn 231BINARY = gnunet-daemon-vpn
245IPV6ADDR = 1234::1 232IPV6ADDR = 1234::1
246IPV6PREFIX = 32 233IPV6PREFIX = 32
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17
251IFNAME = vpn-gnunet 238IFNAME = vpn-gnunet
252 239
253[exit] 240[exit]
254CONFIG = $DEFAULTCONFIG
255BINARY = gnunet-daemon-exit 241BINARY = gnunet-daemon-exit
256IPV6ADDR = 1234:1::1 242IPV6ADDR = 1234:1::1
257IPV6PREFIX = 32 243IPV6PREFIX = 32
@@ -266,7 +252,6 @@ AUTOSTART = YES
266PORT = 0 252PORT = 0
267HOSTNAME = localhost 253HOSTNAME = localhost
268HOME = $SERVICEHOME 254HOME = $SERVICEHOME
269CONFIG = $DEFAULTCONFIG
270BINARY = gnunet-service-dns 255BINARY = gnunet-service-dns
271ACCEPT_FROM = 127.0.0.1; 256ACCEPT_FROM = 127.0.0.1;
272ACCEPT_FROM6 = ::1; 257ACCEPT_FROM6 = ::1;
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO
277PORT = 20022 262PORT = 20022
278HOSTNAME = localhost 263HOSTNAME = localhost
279HOME = $SERVICEHOME 264HOME = $SERVICEHOME
280CONFIG = $DEFAULTCONFIG
281BINARY = gnunet-service-arm 265BINARY = gnunet-service-arm
282ACCEPT_FROM = 127.0.0.1; 266ACCEPT_FROM = 127.0.0.1;
283ACCEPT_FROM6 = ::1; 267ACCEPT_FROM6 = ::1;
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES
290HTTPPORT = 8080 274HTTPPORT = 8080
291HOME = $SERVICEHOME 275HOME = $SERVICEHOME
292HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 276HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
293CONFIG = $DEFAULTCONFIG
294BINARY = gnunet-daemon-hostlist 277BINARY = gnunet-daemon-hostlist
295OPTIONS = -b 278OPTIONS = -b
296SERVERS = http://localhost:8080/ 279SERVERS = http://localhost:8080/
@@ -301,7 +284,6 @@ AUTOSTART = YES
301PORT = 20021 284PORT = 20021
302HOSTNAME = localhost 285HOSTNAME = localhost
303HOME = $SERVICEHOME 286HOME = $SERVICEHOME
304CONFIG = $DEFAULTCONFIG
305BINARY = gnunet-service-core 287BINARY = gnunet-service-core
306ACCEPT_FROM = 127.0.0.1; 288ACCEPT_FROM = 127.0.0.1;
307ACCEPT_FROM6 = ::1; 289ACCEPT_FROM6 = ::1;
@@ -335,7 +317,6 @@ AUTOSTART = YES
335PORT = 20019 317PORT = 20019
336HOSTNAME = localhost 318HOSTNAME = localhost
337HOME = $SERVICEHOME 319HOME = $SERVICEHOME
338CONFIG = $DEFAULTCONFIG
339BINARY = gnunet-service-statistics 320BINARY = gnunet-service-statistics
340ACCEPT_FROM = 127.0.0.1; 321ACCEPT_FROM = 127.0.0.1;
341ACCEPT_FROM6 = ::1; 322ACCEPT_FROM6 = ::1;
@@ -348,7 +329,6 @@ AUTOSTART = YES
348PORT = 20018 329PORT = 20018
349HOSTNAME = localhost 330HOSTNAME = localhost
350HOME = $SERVICEHOME 331HOME = $SERVICEHOME
351CONFIG = $DEFAULTCONFIG
352BINARY = gnunet-service-dht 332BINARY = gnunet-service-dht
353ACCEPT_FROM = 127.0.0.1; 333ACCEPT_FROM = 127.0.0.1;
354ACCEPT_FROM6 = ::1; 334ACCEPT_FROM6 = ::1;
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 2ea3a9f6d..96d391b3d 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client_2/ 2SERVICEHOME = /tmp/c_no_nat_client_2/
3DEFAULTCONFIG = confs/c_no_nat_client_2.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
11PORT = 20053 10PORT = 20053
12HOSTNAME = localhost 11HOSTNAME = localhost
13HOME = $SERVICEHOME 12HOME = $SERVICEHOME
14CONFIG = $DEFAULTCONFIG
15BINARY = gnunet-service-resolver 13BINARY = gnunet-service-resolver
16ACCEPT_FROM = 127.0.0.1; 14ACCEPT_FROM = 127.0.0.1;
17ACCEPT_FROM6 = ::1; 15ACCEPT_FROM6 = ::1;
@@ -24,7 +22,6 @@ AUTOSTART = YES
24PORT = 20052 22PORT = 20052
25HOSTNAME = localhost 23HOSTNAME = localhost
26HOME = $SERVICEHOME 24HOME = $SERVICEHOME
27CONFIG = $DEFAULTCONFIG
28BINARY = gnunet-service-mesh 25BINARY = gnunet-service-mesh
29ACCEPT_FROM = 127.0.0.1; 26ACCEPT_FROM = 127.0.0.1;
30ACCEPT_FROM6 = ::1; 27ACCEPT_FROM6 = ::1;
@@ -37,7 +34,6 @@ AUTOSTART = YES
37PORT = 20051 34PORT = 20051
38HOSTNAME = localhost 35HOSTNAME = localhost
39HOME = $SERVICEHOME 36HOME = $SERVICEHOME
40CONFIG = $DEFAULTCONFIG
41BINARY = gnunet-service-nse 37BINARY = gnunet-service-nse
42ACCEPT_FROM = 127.0.0.1; 38ACCEPT_FROM = 127.0.0.1;
43ACCEPT_FROM6 = ::1; 39ACCEPT_FROM6 = ::1;
@@ -56,7 +52,6 @@ FRIENDS-ONLY = NO
56AUTOCONNECT = YES 52AUTOCONNECT = YES
57TARGET-CONNECTION-COUNT = 16 53TARGET-CONNECTION-COUNT = 16
58FRIENDS = $SERVICEHOME/friends 54FRIENDS = $SERVICEHOME/friends
59CONFIG = $DEFAULTCONFIG
60BINARY = gnunet-daemon-topology 55BINARY = gnunet-daemon-topology
61 56
62[datastore] 57[datastore]
@@ -67,7 +62,6 @@ UNIX_MATCH_GID = YES
67PORT = 20050 62PORT = 20050
68HOSTNAME = localhost 63HOSTNAME = localhost
69HOME = $SERVICEHOME 64HOME = $SERVICEHOME
70CONFIG = $DEFAULTCONFIG
71BINARY = gnunet-service-datastore 65BINARY = gnunet-service-datastore
72ACCEPT_FROM = 127.0.0.1; 66ACCEPT_FROM = 127.0.0.1;
73ACCEPT_FROM6 = ::1; 67ACCEPT_FROM6 = ::1;
@@ -90,7 +84,6 @@ AUTOSTART = YES
90PORT = 20049 84PORT = 20049
91HOSTNAME = localhost 85HOSTNAME = localhost
92HOME = $SERVICEHOME 86HOME = $SERVICEHOME
93CONFIG = $DEFAULTCONFIG
94BINARY = gnunet-service-peerinfo 87BINARY = gnunet-service-peerinfo
95ACCEPT_FROM = 127.0.0.1; 88ACCEPT_FROM = 127.0.0.1;
96ACCEPT_FROM6 = ::1; 89ACCEPT_FROM6 = ::1;
@@ -114,7 +107,6 @@ AUTOSTART = YES
114PORT = 20048 107PORT = 20048
115HOSTNAME = localhost 108HOSTNAME = localhost
116HOME = $SERVICEHOME 109HOME = $SERVICEHOME
117CONFIG = $DEFAULTCONFIG
118BINARY = gnunet-service-ats 110BINARY = gnunet-service-ats
119ACCEPT_FROM = 127.0.0.1; 111ACCEPT_FROM = 127.0.0.1;
120ACCEPT_FROM6 = ::1; 112ACCEPT_FROM6 = ::1;
@@ -136,7 +128,6 @@ AUTOSTART = YES
136PORT = 20047 128PORT = 20047
137HOSTNAME = localhost 129HOSTNAME = localhost
138HOME = $SERVICEHOME 130HOME = $SERVICEHOME
139CONFIG = $DEFAULTCONFIG
140BINARY = gnunet-service-transport 131BINARY = gnunet-service-transport
141NEIGHBOUR_LIMIT = 50 132NEIGHBOUR_LIMIT = 50
142ACCEPT_FROM = 127.0.0.1; 133ACCEPT_FROM = 127.0.0.1;
@@ -188,7 +179,6 @@ AUTOSTART = NO
188PORT = 20042 179PORT = 20042
189HOSTNAME = localhost 180HOSTNAME = localhost
190HOME = $SERVICEHOME 181HOME = $SERVICEHOME
191CONFIG = $DEFAULTCONFIG
192BINARY = gnunet-service-template 182BINARY = gnunet-service-template
193ACCEPT_FROM = 127.0.0.1; 183ACCEPT_FROM = 127.0.0.1;
194ACCEPT_FROM6 = ::1; 184ACCEPT_FROM6 = ::1;
@@ -206,7 +196,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
206PORT = 20041 196PORT = 20041
207HOSTNAME = localhost 197HOSTNAME = localhost
208HOME = $SERVICEHOME 198HOME = $SERVICEHOME
209CONFIG = $DEFAULTCONFIG
210BINARY = gnunet-service-fs 199BINARY = gnunet-service-fs
211ACCEPT_FROM = 127.0.0.1; 200ACCEPT_FROM = 127.0.0.1;
212ACCEPT_FROM6 = ::1; 201ACCEPT_FROM6 = ::1;
@@ -221,7 +210,6 @@ MIN_MIGRATION_DELAY = 100 ms
221EXPECTED_NEIGHBOUR_COUNT = 128 210EXPECTED_NEIGHBOUR_COUNT = 128
222 211
223[vpn] 212[vpn]
224CONFIG = $DEFAULTCONFIG
225BINARY = gnunet-daemon-vpn 213BINARY = gnunet-daemon-vpn
226IPV6ADDR = 1234::1 214IPV6ADDR = 1234::1
227IPV6PREFIX = 32 215IPV6PREFIX = 32
@@ -232,7 +220,6 @@ VIRTDNS6 = 1234::17
232IFNAME = vpn-gnunet 220IFNAME = vpn-gnunet
233 221
234[exit] 222[exit]
235CONFIG = $DEFAULTCONFIG
236BINARY = gnunet-daemon-exit 223BINARY = gnunet-daemon-exit
237IPV6ADDR = 1234:1::1 224IPV6ADDR = 1234:1::1
238IPV6PREFIX = 32 225IPV6PREFIX = 32
@@ -247,7 +234,6 @@ AUTOSTART = YES
247PORT = 0 234PORT = 0
248HOSTNAME = localhost 235HOSTNAME = localhost
249HOME = $SERVICEHOME 236HOME = $SERVICEHOME
250CONFIG = $DEFAULTCONFIG
251BINARY = gnunet-service-dns 237BINARY = gnunet-service-dns
252ACCEPT_FROM = 127.0.0.1; 238ACCEPT_FROM = 127.0.0.1;
253ACCEPT_FROM6 = ::1; 239ACCEPT_FROM6 = ::1;
@@ -258,7 +244,6 @@ PROVIDE_EXIT = NO
258PORT = 20040 244PORT = 20040
259HOSTNAME = localhost 245HOSTNAME = localhost
260HOME = $SERVICEHOME 246HOME = $SERVICEHOME
261CONFIG = $DEFAULTCONFIG
262BINARY = gnunet-service-arm 247BINARY = gnunet-service-arm
263ACCEPT_FROM = 127.0.0.1; 248ACCEPT_FROM = 127.0.0.1;
264ACCEPT_FROM6 = ::1; 249ACCEPT_FROM6 = ::1;
@@ -271,7 +256,6 @@ UNIX_MATCH_GID = YES
271HTTPPORT = 8080 256HTTPPORT = 8080
272HOME = $SERVICEHOME 257HOME = $SERVICEHOME
273HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 258HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
274CONFIG = $DEFAULTCONFIG
275BINARY = gnunet-daemon-hostlist 259BINARY = gnunet-daemon-hostlist
276OPTIONS = -b 260OPTIONS = -b
277SERVERS = http://localhost:8080/ 261SERVERS = http://localhost:8080/
@@ -282,7 +266,6 @@ AUTOSTART = YES
282PORT = 20039 266PORT = 20039
283HOSTNAME = localhost 267HOSTNAME = localhost
284HOME = $SERVICEHOME 268HOME = $SERVICEHOME
285CONFIG = $DEFAULTCONFIG
286BINARY = gnunet-service-core 269BINARY = gnunet-service-core
287ACCEPT_FROM = 127.0.0.1; 270ACCEPT_FROM = 127.0.0.1;
288ACCEPT_FROM6 = ::1; 271ACCEPT_FROM6 = ::1;
@@ -316,7 +299,6 @@ AUTOSTART = YES
316PORT = 20037 299PORT = 20037
317HOSTNAME = localhost 300HOSTNAME = localhost
318HOME = $SERVICEHOME 301HOME = $SERVICEHOME
319CONFIG = $DEFAULTCONFIG
320BINARY = gnunet-service-statistics 302BINARY = gnunet-service-statistics
321ACCEPT_FROM = 127.0.0.1; 303ACCEPT_FROM = 127.0.0.1;
322ACCEPT_FROM6 = ::1; 304ACCEPT_FROM6 = ::1;
@@ -329,7 +311,6 @@ AUTOSTART = YES
329PORT = 20036 311PORT = 20036
330HOSTNAME = localhost 312HOSTNAME = localhost
331HOME = $SERVICEHOME 313HOME = $SERVICEHOME
332CONFIG = $DEFAULTCONFIG
333BINARY = gnunet-service-dht 314BINARY = gnunet-service-dht
334ACCEPT_FROM = 127.0.0.1; 315ACCEPT_FROM = 127.0.0.1;
335ACCEPT_FROM6 = ::1; 316ACCEPT_FROM6 = ::1;
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 0ed1aee8f..523a4fdcf 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client/ 2SERVICEHOME = /tmp/c_no_nat_client/
3DEFAULTCONFIG = confs/c_no_nat_client_http.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 0 16PORT = 0
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-dns 19BINARY = gnunet-service-dns
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
28PORT = 20035 26PORT = 20035
29HOSTNAME = localhost 27HOSTNAME = localhost
30HOME = $SERVICEHOME 28HOME = $SERVICEHOME
31CONFIG = $DEFAULTCONFIG
32BINARY = gnunet-service-resolver 29BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1; 30ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1; 31ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
41PORT = 20034 38PORT = 20034
42HOSTNAME = localhost 39HOSTNAME = localhost
43HOME = $SERVICEHOME 40HOME = $SERVICEHOME
44CONFIG = $DEFAULTCONFIG
45BINARY = gnunet-service-mesh 41BINARY = gnunet-service-mesh
46ACCEPT_FROM = 127.0.0.1; 42ACCEPT_FROM = 127.0.0.1;
47ACCEPT_FROM6 = ::1; 43ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
54PORT = 20033 50PORT = 20033
55HOSTNAME = localhost 51HOSTNAME = localhost
56HOME = $SERVICEHOME 52HOME = $SERVICEHOME
57CONFIG = $DEFAULTCONFIG
58BINARY = gnunet-service-nse 53BINARY = gnunet-service-nse
59ACCEPT_FROM = 127.0.0.1; 54ACCEPT_FROM = 127.0.0.1;
60ACCEPT_FROM6 = ::1; 55ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
73AUTOCONNECT = YES 68AUTOCONNECT = YES
74TARGET-CONNECTION-COUNT = 16 69TARGET-CONNECTION-COUNT = 16
75FRIENDS = $SERVICEHOME/friends 70FRIENDS = $SERVICEHOME/friends
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-daemon-topology 71BINARY = gnunet-daemon-topology
78 72
79[datastore] 73[datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
84PORT = 20032 78PORT = 20032
85HOSTNAME = localhost 79HOSTNAME = localhost
86HOME = $SERVICEHOME 80HOME = $SERVICEHOME
87CONFIG = $DEFAULTCONFIG
88BINARY = gnunet-service-datastore 81BINARY = gnunet-service-datastore
89ACCEPT_FROM = 127.0.0.1; 82ACCEPT_FROM = 127.0.0.1;
90ACCEPT_FROM6 = ::1; 83ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
107PORT = 20031 100PORT = 20031
108HOSTNAME = localhost 101HOSTNAME = localhost
109HOME = $SERVICEHOME 102HOME = $SERVICEHOME
110CONFIG = $DEFAULTCONFIG
111BINARY = gnunet-service-peerinfo 103BINARY = gnunet-service-peerinfo
112ACCEPT_FROM = 127.0.0.1; 104ACCEPT_FROM = 127.0.0.1;
113ACCEPT_FROM6 = ::1; 105ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20030 123PORT = 20030
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@ AUTOSTART = YES
155PORT = 20029 146PORT = 20029
156HOSTNAME = localhost 147HOSTNAME = localhost
157HOME = $SERVICEHOME 148HOME = $SERVICEHOME
158CONFIG = $DEFAULTCONFIG
159BINARY = gnunet-service-transport 149BINARY = gnunet-service-transport
160NEIGHBOUR_LIMIT = 50 150NEIGHBOUR_LIMIT = 50
161ACCEPT_FROM = 127.0.0.1; 151ACCEPT_FROM = 127.0.0.1;
@@ -207,7 +197,6 @@ AUTOSTART = NO
207PORT = 20024 197PORT = 20024
208HOSTNAME = localhost 198HOSTNAME = localhost
209HOME = $SERVICEHOME 199HOME = $SERVICEHOME
210CONFIG = $DEFAULTCONFIG
211BINARY = gnunet-service-template 200BINARY = gnunet-service-template
212ACCEPT_FROM = 127.0.0.1; 201ACCEPT_FROM = 127.0.0.1;
213ACCEPT_FROM6 = ::1; 202ACCEPT_FROM6 = ::1;
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
225PORT = 20023 214PORT = 20023
226HOSTNAME = localhost 215HOSTNAME = localhost
227HOME = $SERVICEHOME 216HOME = $SERVICEHOME
228CONFIG = $DEFAULTCONFIG
229BINARY = gnunet-service-fs 217BINARY = gnunet-service-fs
230ACCEPT_FROM = 127.0.0.1; 218ACCEPT_FROM = 127.0.0.1;
231ACCEPT_FROM6 = ::1; 219ACCEPT_FROM6 = ::1;
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms
240EXPECTED_NEIGHBOUR_COUNT = 128 228EXPECTED_NEIGHBOUR_COUNT = 128
241 229
242[vpn] 230[vpn]
243CONFIG = $DEFAULTCONFIG
244BINARY = gnunet-daemon-vpn 231BINARY = gnunet-daemon-vpn
245IPV6ADDR = 1234::1 232IPV6ADDR = 1234::1
246IPV6PREFIX = 32 233IPV6PREFIX = 32
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17
251IFNAME = vpn-gnunet 238IFNAME = vpn-gnunet
252 239
253[exit] 240[exit]
254CONFIG = $DEFAULTCONFIG
255BINARY = gnunet-daemon-exit 241BINARY = gnunet-daemon-exit
256IPV6ADDR = 1234:1::1 242IPV6ADDR = 1234:1::1
257IPV6PREFIX = 32 243IPV6PREFIX = 32
@@ -266,7 +252,6 @@ AUTOSTART = YES
266PORT = 0 252PORT = 0
267HOSTNAME = localhost 253HOSTNAME = localhost
268HOME = $SERVICEHOME 254HOME = $SERVICEHOME
269CONFIG = $DEFAULTCONFIG
270BINARY = gnunet-service-dns 255BINARY = gnunet-service-dns
271ACCEPT_FROM = 127.0.0.1; 256ACCEPT_FROM = 127.0.0.1;
272ACCEPT_FROM6 = ::1; 257ACCEPT_FROM6 = ::1;
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO
277PORT = 20022 262PORT = 20022
278HOSTNAME = localhost 263HOSTNAME = localhost
279HOME = $SERVICEHOME 264HOME = $SERVICEHOME
280CONFIG = $DEFAULTCONFIG
281BINARY = gnunet-service-arm 265BINARY = gnunet-service-arm
282ACCEPT_FROM = 127.0.0.1; 266ACCEPT_FROM = 127.0.0.1;
283ACCEPT_FROM6 = ::1; 267ACCEPT_FROM6 = ::1;
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES
290HTTPPORT = 8080 274HTTPPORT = 8080
291HOME = $SERVICEHOME 275HOME = $SERVICEHOME
292HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 276HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
293CONFIG = $DEFAULTCONFIG
294BINARY = gnunet-daemon-hostlist 277BINARY = gnunet-daemon-hostlist
295OPTIONS = -b 278OPTIONS = -b
296SERVERS = http://localhost:8080/ 279SERVERS = http://localhost:8080/
@@ -301,7 +284,6 @@ AUTOSTART = YES
301PORT = 20021 284PORT = 20021
302HOSTNAME = localhost 285HOSTNAME = localhost
303HOME = $SERVICEHOME 286HOME = $SERVICEHOME
304CONFIG = $DEFAULTCONFIG
305BINARY = gnunet-service-core 287BINARY = gnunet-service-core
306ACCEPT_FROM = 127.0.0.1; 288ACCEPT_FROM = 127.0.0.1;
307ACCEPT_FROM6 = ::1; 289ACCEPT_FROM6 = ::1;
@@ -335,7 +317,6 @@ AUTOSTART = YES
335PORT = 20019 317PORT = 20019
336HOSTNAME = localhost 318HOSTNAME = localhost
337HOME = $SERVICEHOME 319HOME = $SERVICEHOME
338CONFIG = $DEFAULTCONFIG
339BINARY = gnunet-service-statistics 320BINARY = gnunet-service-statistics
340ACCEPT_FROM = 127.0.0.1; 321ACCEPT_FROM = 127.0.0.1;
341ACCEPT_FROM6 = ::1; 322ACCEPT_FROM6 = ::1;
@@ -348,7 +329,6 @@ AUTOSTART = YES
348PORT = 20018 329PORT = 20018
349HOSTNAME = localhost 330HOSTNAME = localhost
350HOME = $SERVICEHOME 331HOME = $SERVICEHOME
351CONFIG = $DEFAULTCONFIG
352BINARY = gnunet-service-dht 332BINARY = gnunet-service-dht
353ACCEPT_FROM = 127.0.0.1; 333ACCEPT_FROM = 127.0.0.1;
354ACCEPT_FROM6 = ::1; 334ACCEPT_FROM6 = ::1;
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 47c861a72..1f7f08523 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,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client_2/ 2SERVICEHOME = /tmp/c_no_nat_client_2/
3DEFAULTCONFIG = confs/c_no_nat_client_http_2.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 20053 16PORT = 20053
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-resolver 19BINARY = gnunet-service-resolver
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -30,7 +28,6 @@ AUTOSTART = YES
30PORT = 20052 28PORT = 20052
31HOSTNAME = localhost 29HOSTNAME = localhost
32HOME = $SERVICEHOME 30HOME = $SERVICEHOME
33CONFIG = $DEFAULTCONFIG
34BINARY = gnunet-service-mesh 31BINARY = gnunet-service-mesh
35ACCEPT_FROM = 127.0.0.1; 32ACCEPT_FROM = 127.0.0.1;
36ACCEPT_FROM6 = ::1; 33ACCEPT_FROM6 = ::1;
@@ -43,7 +40,6 @@ AUTOSTART = YES
43PORT = 20051 40PORT = 20051
44HOSTNAME = localhost 41HOSTNAME = localhost
45HOME = $SERVICEHOME 42HOME = $SERVICEHOME
46CONFIG = $DEFAULTCONFIG
47BINARY = gnunet-service-nse 43BINARY = gnunet-service-nse
48ACCEPT_FROM = 127.0.0.1; 44ACCEPT_FROM = 127.0.0.1;
49ACCEPT_FROM6 = ::1; 45ACCEPT_FROM6 = ::1;
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO
62AUTOCONNECT = YES 58AUTOCONNECT = YES
63TARGET-CONNECTION-COUNT = 16 59TARGET-CONNECTION-COUNT = 16
64FRIENDS = $SERVICEHOME/friends 60FRIENDS = $SERVICEHOME/friends
65CONFIG = $DEFAULTCONFIG
66BINARY = gnunet-daemon-topology 61BINARY = gnunet-daemon-topology
67 62
68[datastore] 63[datastore]
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES
73PORT = 20050 68PORT = 20050
74HOSTNAME = localhost 69HOSTNAME = localhost
75HOME = $SERVICEHOME 70HOME = $SERVICEHOME
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-service-datastore 71BINARY = gnunet-service-datastore
78ACCEPT_FROM = 127.0.0.1; 72ACCEPT_FROM = 127.0.0.1;
79ACCEPT_FROM6 = ::1; 73ACCEPT_FROM6 = ::1;
@@ -96,7 +90,6 @@ AUTOSTART = YES
96PORT = 20049 90PORT = 20049
97HOSTNAME = localhost 91HOSTNAME = localhost
98HOME = $SERVICEHOME 92HOME = $SERVICEHOME
99CONFIG = $DEFAULTCONFIG
100BINARY = gnunet-service-peerinfo 93BINARY = gnunet-service-peerinfo
101ACCEPT_FROM = 127.0.0.1; 94ACCEPT_FROM = 127.0.0.1;
102ACCEPT_FROM6 = ::1; 95ACCEPT_FROM6 = ::1;
@@ -120,7 +113,6 @@ AUTOSTART = YES
120PORT = 20048 113PORT = 20048
121HOSTNAME = localhost 114HOSTNAME = localhost
122HOME = $SERVICEHOME 115HOME = $SERVICEHOME
123CONFIG = $DEFAULTCONFIG
124BINARY = gnunet-service-ats 116BINARY = gnunet-service-ats
125ACCEPT_FROM = 127.0.0.1; 117ACCEPT_FROM = 127.0.0.1;
126ACCEPT_FROM6 = ::1; 118ACCEPT_FROM6 = ::1;
@@ -144,7 +136,6 @@ AUTOSTART = YES
144PORT = 20047 136PORT = 20047
145HOSTNAME = localhost 137HOSTNAME = localhost
146HOME = $SERVICEHOME 138HOME = $SERVICEHOME
147CONFIG = $DEFAULTCONFIG
148BINARY = gnunet-service-transport 139BINARY = gnunet-service-transport
149NEIGHBOUR_LIMIT = 50 140NEIGHBOUR_LIMIT = 50
150ACCEPT_FROM = 127.0.0.1; 141ACCEPT_FROM = 127.0.0.1;
@@ -196,7 +187,6 @@ AUTOSTART = NO
196PORT = 20042 187PORT = 20042
197HOSTNAME = localhost 188HOSTNAME = localhost
198HOME = $SERVICEHOME 189HOME = $SERVICEHOME
199CONFIG = $DEFAULTCONFIG
200BINARY = gnunet-service-template 190BINARY = gnunet-service-template
201ACCEPT_FROM = 127.0.0.1; 191ACCEPT_FROM = 127.0.0.1;
202ACCEPT_FROM6 = ::1; 192ACCEPT_FROM6 = ::1;
@@ -214,7 +204,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
214PORT = 20041 204PORT = 20041
215HOSTNAME = localhost 205HOSTNAME = localhost
216HOME = $SERVICEHOME 206HOME = $SERVICEHOME
217CONFIG = $DEFAULTCONFIG
218BINARY = gnunet-service-fs 207BINARY = gnunet-service-fs
219ACCEPT_FROM = 127.0.0.1; 208ACCEPT_FROM = 127.0.0.1;
220ACCEPT_FROM6 = ::1; 209ACCEPT_FROM6 = ::1;
@@ -229,7 +218,6 @@ MIN_MIGRATION_DELAY = 100 ms
229EXPECTED_NEIGHBOUR_COUNT = 128 218EXPECTED_NEIGHBOUR_COUNT = 128
230 219
231[vpn] 220[vpn]
232CONFIG = $DEFAULTCONFIG
233BINARY = gnunet-daemon-vpn 221BINARY = gnunet-daemon-vpn
234IPV6ADDR = 1234::1 222IPV6ADDR = 1234::1
235IPV6PREFIX = 32 223IPV6PREFIX = 32
@@ -240,7 +228,6 @@ VIRTDNS6 = 1234::17
240IFNAME = vpn-gnunet 228IFNAME = vpn-gnunet
241 229
242[exit] 230[exit]
243CONFIG = $DEFAULTCONFIG
244BINARY = gnunet-daemon-exit 231BINARY = gnunet-daemon-exit
245IPV6ADDR = 1234:1::1 232IPV6ADDR = 1234:1::1
246IPV6PREFIX = 32 233IPV6PREFIX = 32
@@ -255,7 +242,6 @@ AUTOSTART = YES
255PORT = 0 242PORT = 0
256HOSTNAME = localhost 243HOSTNAME = localhost
257HOME = $SERVICEHOME 244HOME = $SERVICEHOME
258CONFIG = $DEFAULTCONFIG
259BINARY = gnunet-service-dns 245BINARY = gnunet-service-dns
260ACCEPT_FROM = 127.0.0.1; 246ACCEPT_FROM = 127.0.0.1;
261ACCEPT_FROM6 = ::1; 247ACCEPT_FROM6 = ::1;
@@ -266,7 +252,6 @@ PROVIDE_EXIT = NO
266PORT = 20040 252PORT = 20040
267HOSTNAME = localhost 253HOSTNAME = localhost
268HOME = $SERVICEHOME 254HOME = $SERVICEHOME
269CONFIG = $DEFAULTCONFIG
270BINARY = gnunet-service-arm 255BINARY = gnunet-service-arm
271ACCEPT_FROM = 127.0.0.1; 256ACCEPT_FROM = 127.0.0.1;
272ACCEPT_FROM6 = ::1; 257ACCEPT_FROM6 = ::1;
@@ -279,7 +264,6 @@ UNIX_MATCH_GID = YES
279HTTPPORT = 8080 264HTTPPORT = 8080
280HOME = $SERVICEHOME 265HOME = $SERVICEHOME
281HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 266HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
282CONFIG = $DEFAULTCONFIG
283BINARY = gnunet-daemon-hostlist 267BINARY = gnunet-daemon-hostlist
284OPTIONS = -b 268OPTIONS = -b
285SERVERS = http://localhost:8080/ 269SERVERS = http://localhost:8080/
@@ -290,7 +274,6 @@ AUTOSTART = YES
290PORT = 20039 274PORT = 20039
291HOSTNAME = localhost 275HOSTNAME = localhost
292HOME = $SERVICEHOME 276HOME = $SERVICEHOME
293CONFIG = $DEFAULTCONFIG
294BINARY = gnunet-service-core 277BINARY = gnunet-service-core
295ACCEPT_FROM = 127.0.0.1; 278ACCEPT_FROM = 127.0.0.1;
296ACCEPT_FROM6 = ::1; 279ACCEPT_FROM6 = ::1;
@@ -324,7 +307,6 @@ AUTOSTART = YES
324PORT = 20037 307PORT = 20037
325HOSTNAME = localhost 308HOSTNAME = localhost
326HOME = $SERVICEHOME 309HOME = $SERVICEHOME
327CONFIG = $DEFAULTCONFIG
328BINARY = gnunet-service-statistics 310BINARY = gnunet-service-statistics
329ACCEPT_FROM = 127.0.0.1; 311ACCEPT_FROM = 127.0.0.1;
330ACCEPT_FROM6 = ::1; 312ACCEPT_FROM6 = ::1;
@@ -337,7 +319,6 @@ AUTOSTART = YES
337PORT = 20036 319PORT = 20036
338HOSTNAME = localhost 320HOSTNAME = localhost
339HOME = $SERVICEHOME 321HOME = $SERVICEHOME
340CONFIG = $DEFAULTCONFIG
341BINARY = gnunet-service-dht 322BINARY = gnunet-service-dht
342ACCEPT_FROM = 127.0.0.1; 323ACCEPT_FROM = 127.0.0.1;
343ACCEPT_FROM6 = ::1; 324ACCEPT_FROM6 = ::1;
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 b48042908..62d679fd2 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client/ 2SERVICEHOME = /tmp/c_no_nat_client/
3DEFAULTCONFIG = confs/c_no_nat_client_unix.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 0 16PORT = 0
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-dns 19BINARY = gnunet-service-dns
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
28PORT = 20035 26PORT = 20035
29HOSTNAME = localhost 27HOSTNAME = localhost
30HOME = $SERVICEHOME 28HOME = $SERVICEHOME
31CONFIG = $DEFAULTCONFIG
32BINARY = gnunet-service-resolver 29BINARY = gnunet-service-resolver
33ACCEPT_FROM = 127.0.0.1; 30ACCEPT_FROM = 127.0.0.1;
34ACCEPT_FROM6 = ::1; 31ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
41PORT = 20034 38PORT = 20034
42HOSTNAME = localhost 39HOSTNAME = localhost
43HOME = $SERVICEHOME 40HOME = $SERVICEHOME
44CONFIG = $DEFAULTCONFIG
45BINARY = gnunet-service-mesh 41BINARY = gnunet-service-mesh
46ACCEPT_FROM = 127.0.0.1; 42ACCEPT_FROM = 127.0.0.1;
47ACCEPT_FROM6 = ::1; 43ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
54PORT = 20033 50PORT = 20033
55HOSTNAME = localhost 51HOSTNAME = localhost
56HOME = $SERVICEHOME 52HOME = $SERVICEHOME
57CONFIG = $DEFAULTCONFIG
58BINARY = gnunet-service-nse 53BINARY = gnunet-service-nse
59ACCEPT_FROM = 127.0.0.1; 54ACCEPT_FROM = 127.0.0.1;
60ACCEPT_FROM6 = ::1; 55ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
73AUTOCONNECT = YES 68AUTOCONNECT = YES
74TARGET-CONNECTION-COUNT = 16 69TARGET-CONNECTION-COUNT = 16
75FRIENDS = $SERVICEHOME/friends 70FRIENDS = $SERVICEHOME/friends
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-daemon-topology 71BINARY = gnunet-daemon-topology
78 72
79[datastore] 73[datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
84PORT = 20032 78PORT = 20032
85HOSTNAME = localhost 79HOSTNAME = localhost
86HOME = $SERVICEHOME 80HOME = $SERVICEHOME
87CONFIG = $DEFAULTCONFIG
88BINARY = gnunet-service-datastore 81BINARY = gnunet-service-datastore
89ACCEPT_FROM = 127.0.0.1; 82ACCEPT_FROM = 127.0.0.1;
90ACCEPT_FROM6 = ::1; 83ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
107PORT = 20031 100PORT = 20031
108HOSTNAME = localhost 101HOSTNAME = localhost
109HOME = $SERVICEHOME 102HOME = $SERVICEHOME
110CONFIG = $DEFAULTCONFIG
111BINARY = gnunet-service-peerinfo 103BINARY = gnunet-service-peerinfo
112ACCEPT_FROM = 127.0.0.1; 104ACCEPT_FROM = 127.0.0.1;
113ACCEPT_FROM6 = ::1; 105ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20030 123PORT = 20030
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@ AUTOSTART = YES
155PORT = 20029 146PORT = 20029
156HOSTNAME = localhost 147HOSTNAME = localhost
157HOME = $SERVICEHOME 148HOME = $SERVICEHOME
158CONFIG = $DEFAULTCONFIG
159BINARY = gnunet-service-transport 149BINARY = gnunet-service-transport
160NEIGHBOUR_LIMIT = 50 150NEIGHBOUR_LIMIT = 50
161ACCEPT_FROM = 127.0.0.1; 151ACCEPT_FROM = 127.0.0.1;
@@ -210,7 +200,6 @@ AUTOSTART = NO
210PORT = 20024 200PORT = 20024
211HOSTNAME = localhost 201HOSTNAME = localhost
212HOME = $SERVICEHOME 202HOME = $SERVICEHOME
213CONFIG = $DEFAULTCONFIG
214BINARY = gnunet-service-template 203BINARY = gnunet-service-template
215ACCEPT_FROM = 127.0.0.1; 204ACCEPT_FROM = 127.0.0.1;
216ACCEPT_FROM6 = ::1; 205ACCEPT_FROM6 = ::1;
@@ -228,7 +217,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
228PORT = 20023 217PORT = 20023
229HOSTNAME = localhost 218HOSTNAME = localhost
230HOME = $SERVICEHOME 219HOME = $SERVICEHOME
231CONFIG = $DEFAULTCONFIG
232BINARY = gnunet-service-fs 220BINARY = gnunet-service-fs
233ACCEPT_FROM = 127.0.0.1; 221ACCEPT_FROM = 127.0.0.1;
234ACCEPT_FROM6 = ::1; 222ACCEPT_FROM6 = ::1;
@@ -243,7 +231,6 @@ MIN_MIGRATION_DELAY = 100 ms
243EXPECTED_NEIGHBOUR_COUNT = 128 231EXPECTED_NEIGHBOUR_COUNT = 128
244 232
245[vpn] 233[vpn]
246CONFIG = $DEFAULTCONFIG
247BINARY = gnunet-daemon-vpn 234BINARY = gnunet-daemon-vpn
248IPV6ADDR = 1234::1 235IPV6ADDR = 1234::1
249IPV6PREFIX = 32 236IPV6PREFIX = 32
@@ -254,7 +241,6 @@ VIRTDNS6 = 1234::17
254IFNAME = vpn-gnunet 241IFNAME = vpn-gnunet
255 242
256[exit] 243[exit]
257CONFIG = $DEFAULTCONFIG
258BINARY = gnunet-daemon-exit 244BINARY = gnunet-daemon-exit
259IPV6ADDR = 1234:1::1 245IPV6ADDR = 1234:1::1
260IPV6PREFIX = 32 246IPV6PREFIX = 32
@@ -269,7 +255,6 @@ AUTOSTART = YES
269PORT = 0 255PORT = 0
270HOSTNAME = localhost 256HOSTNAME = localhost
271HOME = $SERVICEHOME 257HOME = $SERVICEHOME
272CONFIG = $DEFAULTCONFIG
273BINARY = gnunet-service-dns 258BINARY = gnunet-service-dns
274ACCEPT_FROM = 127.0.0.1; 259ACCEPT_FROM = 127.0.0.1;
275ACCEPT_FROM6 = ::1; 260ACCEPT_FROM6 = ::1;
@@ -280,7 +265,6 @@ PROVIDE_EXIT = NO
280PORT = 20022 265PORT = 20022
281HOSTNAME = localhost 266HOSTNAME = localhost
282HOME = $SERVICEHOME 267HOME = $SERVICEHOME
283CONFIG = $DEFAULTCONFIG
284BINARY = gnunet-service-arm 268BINARY = gnunet-service-arm
285ACCEPT_FROM = 127.0.0.1; 269ACCEPT_FROM = 127.0.0.1;
286ACCEPT_FROM6 = ::1; 270ACCEPT_FROM6 = ::1;
@@ -293,7 +277,6 @@ UNIX_MATCH_GID = YES
293HTTPPORT = 8080 277HTTPPORT = 8080
294HOME = $SERVICEHOME 278HOME = $SERVICEHOME
295HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 279HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
296CONFIG = $DEFAULTCONFIG
297BINARY = gnunet-daemon-hostlist 280BINARY = gnunet-daemon-hostlist
298OPTIONS = -b 281OPTIONS = -b
299SERVERS = http://localhost:8080/ 282SERVERS = http://localhost:8080/
@@ -304,7 +287,6 @@ AUTOSTART = YES
304PORT = 20021 287PORT = 20021
305HOSTNAME = localhost 288HOSTNAME = localhost
306HOME = $SERVICEHOME 289HOME = $SERVICEHOME
307CONFIG = $DEFAULTCONFIG
308BINARY = gnunet-service-core 290BINARY = gnunet-service-core
309ACCEPT_FROM = 127.0.0.1; 291ACCEPT_FROM = 127.0.0.1;
310ACCEPT_FROM6 = ::1; 292ACCEPT_FROM6 = ::1;
@@ -338,7 +320,6 @@ AUTOSTART = YES
338PORT = 20019 320PORT = 20019
339HOSTNAME = localhost 321HOSTNAME = localhost
340HOME = $SERVICEHOME 322HOME = $SERVICEHOME
341CONFIG = $DEFAULTCONFIG
342BINARY = gnunet-service-statistics 323BINARY = gnunet-service-statistics
343ACCEPT_FROM = 127.0.0.1; 324ACCEPT_FROM = 127.0.0.1;
344ACCEPT_FROM6 = ::1; 325ACCEPT_FROM6 = ::1;
@@ -351,7 +332,6 @@ AUTOSTART = YES
351PORT = 20018 332PORT = 20018
352HOSTNAME = localhost 333HOSTNAME = localhost
353HOME = $SERVICEHOME 334HOME = $SERVICEHOME
354CONFIG = $DEFAULTCONFIG
355BINARY = gnunet-service-dht 335BINARY = gnunet-service-dht
356ACCEPT_FROM = 127.0.0.1; 336ACCEPT_FROM = 127.0.0.1;
357ACCEPT_FROM6 = ::1; 337ACCEPT_FROM6 = ::1;
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 ca4da89cb..a4080ab20 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,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client_2/ 2SERVICEHOME = /tmp/c_no_nat_client_2/
3DEFAULTCONFIG = confs/c_no_nat_client_unix_2.conf
4 3
5[gnunetd] 4[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey 5#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
17PORT = 20053 16PORT = 20053
18HOSTNAME = localhost 17HOSTNAME = localhost
19HOME = $SERVICEHOME 18HOME = $SERVICEHOME
20CONFIG = $DEFAULTCONFIG
21BINARY = gnunet-service-resolver 19BINARY = gnunet-service-resolver
22ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 21ACCEPT_FROM6 = ::1;
@@ -30,7 +28,6 @@ AUTOSTART = YES
30PORT = 20052 28PORT = 20052
31HOSTNAME = localhost 29HOSTNAME = localhost
32HOME = $SERVICEHOME 30HOME = $SERVICEHOME
33CONFIG = $DEFAULTCONFIG
34BINARY = gnunet-service-mesh 31BINARY = gnunet-service-mesh
35ACCEPT_FROM = 127.0.0.1; 32ACCEPT_FROM = 127.0.0.1;
36ACCEPT_FROM6 = ::1; 33ACCEPT_FROM6 = ::1;
@@ -43,7 +40,6 @@ AUTOSTART = YES
43PORT = 20051 40PORT = 20051
44HOSTNAME = localhost 41HOSTNAME = localhost
45HOME = $SERVICEHOME 42HOME = $SERVICEHOME
46CONFIG = $DEFAULTCONFIG
47BINARY = gnunet-service-nse 43BINARY = gnunet-service-nse
48ACCEPT_FROM = 127.0.0.1; 44ACCEPT_FROM = 127.0.0.1;
49ACCEPT_FROM6 = ::1; 45ACCEPT_FROM6 = ::1;
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO
62AUTOCONNECT = YES 58AUTOCONNECT = YES
63TARGET-CONNECTION-COUNT = 16 59TARGET-CONNECTION-COUNT = 16
64FRIENDS = $SERVICEHOME/friends 60FRIENDS = $SERVICEHOME/friends
65CONFIG = $DEFAULTCONFIG
66BINARY = gnunet-daemon-topology 61BINARY = gnunet-daemon-topology
67 62
68[datastore] 63[datastore]
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES
73PORT = 20050 68PORT = 20050
74HOSTNAME = localhost 69HOSTNAME = localhost
75HOME = $SERVICEHOME 70HOME = $SERVICEHOME
76CONFIG = $DEFAULTCONFIG
77BINARY = gnunet-service-datastore 71BINARY = gnunet-service-datastore
78ACCEPT_FROM = 127.0.0.1; 72ACCEPT_FROM = 127.0.0.1;
79ACCEPT_FROM6 = ::1; 73ACCEPT_FROM6 = ::1;
@@ -96,7 +90,6 @@ AUTOSTART = YES
96PORT = 20049 90PORT = 20049
97HOSTNAME = localhost 91HOSTNAME = localhost
98HOME = $SERVICEHOME 92HOME = $SERVICEHOME
99CONFIG = $DEFAULTCONFIG
100BINARY = gnunet-service-peerinfo 93BINARY = gnunet-service-peerinfo
101ACCEPT_FROM = 127.0.0.1; 94ACCEPT_FROM = 127.0.0.1;
102ACCEPT_FROM6 = ::1; 95ACCEPT_FROM6 = ::1;
@@ -120,7 +113,6 @@ AUTOSTART = YES
120PORT = 20048 113PORT = 20048
121HOSTNAME = localhost 114HOSTNAME = localhost
122HOME = $SERVICEHOME 115HOME = $SERVICEHOME
123CONFIG = $DEFAULTCONFIG
124BINARY = gnunet-service-ats 116BINARY = gnunet-service-ats
125ACCEPT_FROM = 127.0.0.1; 117ACCEPT_FROM = 127.0.0.1;
126ACCEPT_FROM6 = ::1; 118ACCEPT_FROM6 = ::1;
@@ -144,7 +136,6 @@ AUTOSTART = YES
144PORT = 20047 136PORT = 20047
145HOSTNAME = localhost 137HOSTNAME = localhost
146HOME = $SERVICEHOME 138HOME = $SERVICEHOME
147CONFIG = $DEFAULTCONFIG
148BINARY = gnunet-service-transport 139BINARY = gnunet-service-transport
149NEIGHBOUR_LIMIT = 50 140NEIGHBOUR_LIMIT = 50
150ACCEPT_FROM = 127.0.0.1; 141ACCEPT_FROM = 127.0.0.1;
@@ -199,7 +190,6 @@ AUTOSTART = NO
199PORT = 20042 190PORT = 20042
200HOSTNAME = localhost 191HOSTNAME = localhost
201HOME = $SERVICEHOME 192HOME = $SERVICEHOME
202CONFIG = $DEFAULTCONFIG
203BINARY = gnunet-service-template 193BINARY = gnunet-service-template
204ACCEPT_FROM = 127.0.0.1; 194ACCEPT_FROM = 127.0.0.1;
205ACCEPT_FROM6 = ::1; 195ACCEPT_FROM6 = ::1;
@@ -217,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
217PORT = 20041 207PORT = 20041
218HOSTNAME = localhost 208HOSTNAME = localhost
219HOME = $SERVICEHOME 209HOME = $SERVICEHOME
220CONFIG = $DEFAULTCONFIG
221BINARY = gnunet-service-fs 210BINARY = gnunet-service-fs
222ACCEPT_FROM = 127.0.0.1; 211ACCEPT_FROM = 127.0.0.1;
223ACCEPT_FROM6 = ::1; 212ACCEPT_FROM6 = ::1;
@@ -232,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms
232EXPECTED_NEIGHBOUR_COUNT = 128 221EXPECTED_NEIGHBOUR_COUNT = 128
233 222
234[vpn] 223[vpn]
235CONFIG = $DEFAULTCONFIG
236BINARY = gnunet-daemon-vpn 224BINARY = gnunet-daemon-vpn
237IPV6ADDR = 1234::1 225IPV6ADDR = 1234::1
238IPV6PREFIX = 32 226IPV6PREFIX = 32
@@ -243,7 +231,6 @@ VIRTDNS6 = 1234::17
243IFNAME = vpn-gnunet 231IFNAME = vpn-gnunet
244 232
245[exit] 233[exit]
246CONFIG = $DEFAULTCONFIG
247BINARY = gnunet-daemon-exit 234BINARY = gnunet-daemon-exit
248IPV6ADDR = 1234:1::1 235IPV6ADDR = 1234:1::1
249IPV6PREFIX = 32 236IPV6PREFIX = 32
@@ -258,7 +245,6 @@ AUTOSTART = YES
258PORT = 0 245PORT = 0
259HOSTNAME = localhost 246HOSTNAME = localhost
260HOME = $SERVICEHOME 247HOME = $SERVICEHOME
261CONFIG = $DEFAULTCONFIG
262BINARY = gnunet-service-dns 248BINARY = gnunet-service-dns
263ACCEPT_FROM = 127.0.0.1; 249ACCEPT_FROM = 127.0.0.1;
264ACCEPT_FROM6 = ::1; 250ACCEPT_FROM6 = ::1;
@@ -269,7 +255,6 @@ PROVIDE_EXIT = NO
269PORT = 20040 255PORT = 20040
270HOSTNAME = localhost 256HOSTNAME = localhost
271HOME = $SERVICEHOME 257HOME = $SERVICEHOME
272CONFIG = $DEFAULTCONFIG
273BINARY = gnunet-service-arm 258BINARY = gnunet-service-arm
274ACCEPT_FROM = 127.0.0.1; 259ACCEPT_FROM = 127.0.0.1;
275ACCEPT_FROM6 = ::1; 260ACCEPT_FROM6 = ::1;
@@ -282,7 +267,6 @@ UNIX_MATCH_GID = YES
282HTTPPORT = 8080 267HTTPPORT = 8080
283HOME = $SERVICEHOME 268HOME = $SERVICEHOME
284HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 269HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
285CONFIG = $DEFAULTCONFIG
286BINARY = gnunet-daemon-hostlist 270BINARY = gnunet-daemon-hostlist
287OPTIONS = -b 271OPTIONS = -b
288SERVERS = http://localhost:8080/ 272SERVERS = http://localhost:8080/
@@ -293,7 +277,6 @@ AUTOSTART = YES
293PORT = 20039 277PORT = 20039
294HOSTNAME = localhost 278HOSTNAME = localhost
295HOME = $SERVICEHOME 279HOME = $SERVICEHOME
296CONFIG = $DEFAULTCONFIG
297BINARY = gnunet-service-core 280BINARY = gnunet-service-core
298ACCEPT_FROM = 127.0.0.1; 281ACCEPT_FROM = 127.0.0.1;
299ACCEPT_FROM6 = ::1; 282ACCEPT_FROM6 = ::1;
@@ -327,7 +310,6 @@ AUTOSTART = YES
327PORT = 20037 310PORT = 20037
328HOSTNAME = localhost 311HOSTNAME = localhost
329HOME = $SERVICEHOME 312HOME = $SERVICEHOME
330CONFIG = $DEFAULTCONFIG
331BINARY = gnunet-service-statistics 313BINARY = gnunet-service-statistics
332ACCEPT_FROM = 127.0.0.1; 314ACCEPT_FROM = 127.0.0.1;
333ACCEPT_FROM6 = ::1; 315ACCEPT_FROM6 = ::1;
@@ -340,7 +322,6 @@ AUTOSTART = YES
340PORT = 20036 322PORT = 20036
341HOSTNAME = localhost 323HOSTNAME = localhost
342HOME = $SERVICEHOME 324HOME = $SERVICEHOME
343CONFIG = $DEFAULTCONFIG
344BINARY = gnunet-service-dht 325BINARY = gnunet-service-dht
345ACCEPT_FROM = 127.0.0.1; 326ACCEPT_FROM = 127.0.0.1;
346ACCEPT_FROM6 = ::1; 327ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index f01cac9d1..d224670fe 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_normal_client 2SERVICEHOME = /tmp/c_normal_client
3DEFAULTCONFIG = confs/c_normal_client_tcp.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = hostkeys/0002-hostkey 5HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
19PORT = 0 18PORT = 0
20HOSTNAME = localhost 19HOSTNAME = localhost
21HOME = $SERVICEHOME 20HOME = $SERVICEHOME
22CONFIG = $DEFAULTCONFIG
23BINARY = gnunet-service-dns 21BINARY = gnunet-service-dns
24ACCEPT_FROM = 127.0.0.1; 22ACCEPT_FROM = 127.0.0.1;
25ACCEPT_FROM6 = ::1; 23ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
31PORT = 20071 29PORT = 20071
32HOSTNAME = localhost 30HOSTNAME = localhost
33HOME = $SERVICEHOME 31HOME = $SERVICEHOME
34CONFIG = $DEFAULTCONFIG
35BINARY = gnunet-service-resolver 32BINARY = gnunet-service-resolver
36ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1; 34ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
44PORT = 20070 41PORT = 20070
45HOSTNAME = localhost 42HOSTNAME = localhost
46HOME = $SERVICEHOME 43HOME = $SERVICEHOME
47CONFIG = $DEFAULTCONFIG
48BINARY = gnunet-service-mesh 44BINARY = gnunet-service-mesh
49ACCEPT_FROM = 127.0.0.1; 45ACCEPT_FROM = 127.0.0.1;
50ACCEPT_FROM6 = ::1; 46ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
57PORT = 20069 53PORT = 20069
58HOSTNAME = localhost 54HOSTNAME = localhost
59HOME = $SERVICEHOME 55HOME = $SERVICEHOME
60CONFIG = $DEFAULTCONFIG
61BINARY = gnunet-service-nse 56BINARY = gnunet-service-nse
62ACCEPT_FROM = 127.0.0.1; 57ACCEPT_FROM = 127.0.0.1;
63ACCEPT_FROM6 = ::1; 58ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
76AUTOCONNECT = YES 71AUTOCONNECT = YES
77TARGET-CONNECTION-COUNT = 16 72TARGET-CONNECTION-COUNT = 16
78FRIENDS = $SERVICEHOME/friends 73FRIENDS = $SERVICEHOME/friends
79CONFIG = $DEFAULTCONFIG
80BINARY = gnunet-daemon-topology 74BINARY = gnunet-daemon-topology
81 75
82[datastore] 76[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
87PORT = 20068 81PORT = 20068
88HOSTNAME = localhost 82HOSTNAME = localhost
89HOME = $SERVICEHOME 83HOME = $SERVICEHOME
90CONFIG = $DEFAULTCONFIG
91BINARY = gnunet-service-datastore 84BINARY = gnunet-service-datastore
92ACCEPT_FROM = 127.0.0.1; 85ACCEPT_FROM = 127.0.0.1;
93ACCEPT_FROM6 = ::1; 86ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
110PORT = 20067 103PORT = 20067
111HOSTNAME = localhost 104HOSTNAME = localhost
112HOME = $SERVICEHOME 105HOME = $SERVICEHOME
113CONFIG = $DEFAULTCONFIG
114BINARY = gnunet-service-peerinfo 106BINARY = gnunet-service-peerinfo
115ACCEPT_FROM = 127.0.0.1; 107ACCEPT_FROM = 127.0.0.1;
116ACCEPT_FROM6 = ::1; 108ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20066 123PORT = 20066
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
153PORT = 20065 144PORT = 20065
154HOSTNAME = localhost 145HOSTNAME = localhost
155HOME = $SERVICEHOME 146HOME = $SERVICEHOME
156CONFIG = $DEFAULTCONFIG
157BINARY = gnunet-service-transport 147BINARY = gnunet-service-transport
158NEIGHBOUR_LIMIT = 50 148NEIGHBOUR_LIMIT = 50
159ACCEPT_FROM = 127.0.0.1; 149ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
205PORT = 20060 195PORT = 20060
206HOSTNAME = localhost 196HOSTNAME = localhost
207HOME = $SERVICEHOME 197HOME = $SERVICEHOME
208CONFIG = $DEFAULTCONFIG
209BINARY = gnunet-service-template 198BINARY = gnunet-service-template
210ACCEPT_FROM = 127.0.0.1; 199ACCEPT_FROM = 127.0.0.1;
211ACCEPT_FROM6 = ::1; 200ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
223PORT = 20059 212PORT = 20059
224HOSTNAME = localhost 213HOSTNAME = localhost
225HOME = $SERVICEHOME 214HOME = $SERVICEHOME
226CONFIG = $DEFAULTCONFIG
227BINARY = gnunet-service-fs 215BINARY = gnunet-service-fs
228ACCEPT_FROM = 127.0.0.1; 216ACCEPT_FROM = 127.0.0.1;
229ACCEPT_FROM6 = ::1; 217ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
238EXPECTED_NEIGHBOUR_COUNT = 128 226EXPECTED_NEIGHBOUR_COUNT = 128
239 227
240[vpn] 228[vpn]
241CONFIG = $DEFAULTCONFIG
242BINARY = gnunet-daemon-vpn 229BINARY = gnunet-daemon-vpn
243IPV6ADDR = 1234::1 230IPV6ADDR = 1234::1
244IPV6PREFIX = 32 231IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
249IFNAME = vpn-gnunet 236IFNAME = vpn-gnunet
250 237
251[exit] 238[exit]
252CONFIG = $DEFAULTCONFIG
253BINARY = gnunet-daemon-exit 239BINARY = gnunet-daemon-exit
254IPV6ADDR = 1234:1::1 240IPV6ADDR = 1234:1::1
255IPV6PREFIX = 32 241IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
264PORT = 0 250PORT = 0
265HOSTNAME = localhost 251HOSTNAME = localhost
266HOME = $SERVICEHOME 252HOME = $SERVICEHOME
267CONFIG = $DEFAULTCONFIG
268BINARY = gnunet-service-dns 253BINARY = gnunet-service-dns
269ACCEPT_FROM = 127.0.0.1; 254ACCEPT_FROM = 127.0.0.1;
270ACCEPT_FROM6 = ::1; 255ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
275PORT = 20058 260PORT = 20058
276HOSTNAME = localhost 261HOSTNAME = localhost
277HOME = $SERVICEHOME 262HOME = $SERVICEHOME
278CONFIG = $DEFAULTCONFIG
279BINARY = gnunet-service-arm 263BINARY = gnunet-service-arm
280ACCEPT_FROM = 127.0.0.1; 264ACCEPT_FROM = 127.0.0.1;
281ACCEPT_FROM6 = ::1; 265ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
288HTTPPORT = 8080 272HTTPPORT = 8080
289HOME = $SERVICEHOME 273HOME = $SERVICEHOME
290HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
291CONFIG = $DEFAULTCONFIG
292BINARY = gnunet-daemon-hostlist 275BINARY = gnunet-daemon-hostlist
293OPTIONS = -b 276OPTIONS = -b
294SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ 277SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@ AUTOSTART = YES
299PORT = 20057 282PORT = 20057
300HOSTNAME = localhost 283HOSTNAME = localhost
301HOME = $SERVICEHOME 284HOME = $SERVICEHOME
302CONFIG = $DEFAULTCONFIG
303BINARY = gnunet-service-core 285BINARY = gnunet-service-core
304ACCEPT_FROM = 127.0.0.1; 286ACCEPT_FROM = 127.0.0.1;
305ACCEPT_FROM6 = ::1; 287ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
333PORT = 20055 315PORT = 20055
334HOSTNAME = localhost 316HOSTNAME = localhost
335HOME = $SERVICEHOME 317HOME = $SERVICEHOME
336CONFIG = $DEFAULTCONFIG
337BINARY = gnunet-service-statistics 318BINARY = gnunet-service-statistics
338ACCEPT_FROM = 127.0.0.1; 319ACCEPT_FROM = 127.0.0.1;
339ACCEPT_FROM6 = ::1; 320ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
346PORT = 20054 327PORT = 20054
347HOSTNAME = localhost 328HOSTNAME = localhost
348HOME = $SERVICEHOME 329HOME = $SERVICEHOME
349CONFIG = $DEFAULTCONFIG
350BINARY = gnunet-service-dht 330BINARY = gnunet-service-dht
351ACCEPT_FROM = 127.0.0.1; 331ACCEPT_FROM = 127.0.0.1;
352ACCEPT_FROM6 = ::1; 332ACCEPT_FROM6 = ::1;
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 f515609bd..b94eecd8b 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -1,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_normal_client 2SERVICEHOME = /tmp/c_normal_client
3DEFAULTCONFIG = confs/c_normal_client_tcp_udp.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = hostkeys/0002-hostkey 5HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
19PORT = 0 18PORT = 0
20HOSTNAME = localhost 19HOSTNAME = localhost
21HOME = $SERVICEHOME 20HOME = $SERVICEHOME
22CONFIG = $DEFAULTCONFIG
23BINARY = gnunet-service-dns 21BINARY = gnunet-service-dns
24ACCEPT_FROM = 127.0.0.1; 22ACCEPT_FROM = 127.0.0.1;
25ACCEPT_FROM6 = ::1; 23ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
31PORT = 20071 29PORT = 20071
32HOSTNAME = localhost 30HOSTNAME = localhost
33HOME = $SERVICEHOME 31HOME = $SERVICEHOME
34CONFIG = $DEFAULTCONFIG
35BINARY = gnunet-service-resolver 32BINARY = gnunet-service-resolver
36ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1; 34ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
44PORT = 20070 41PORT = 20070
45HOSTNAME = localhost 42HOSTNAME = localhost
46HOME = $SERVICEHOME 43HOME = $SERVICEHOME
47CONFIG = $DEFAULTCONFIG
48BINARY = gnunet-service-mesh 44BINARY = gnunet-service-mesh
49ACCEPT_FROM = 127.0.0.1; 45ACCEPT_FROM = 127.0.0.1;
50ACCEPT_FROM6 = ::1; 46ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
57PORT = 20069 53PORT = 20069
58HOSTNAME = localhost 54HOSTNAME = localhost
59HOME = $SERVICEHOME 55HOME = $SERVICEHOME
60CONFIG = $DEFAULTCONFIG
61BINARY = gnunet-service-nse 56BINARY = gnunet-service-nse
62ACCEPT_FROM = 127.0.0.1; 57ACCEPT_FROM = 127.0.0.1;
63ACCEPT_FROM6 = ::1; 58ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
76AUTOCONNECT = YES 71AUTOCONNECT = YES
77TARGET-CONNECTION-COUNT = 16 72TARGET-CONNECTION-COUNT = 16
78FRIENDS = $SERVICEHOME/friends 73FRIENDS = $SERVICEHOME/friends
79CONFIG = $DEFAULTCONFIG
80BINARY = gnunet-daemon-topology 74BINARY = gnunet-daemon-topology
81 75
82[datastore] 76[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
87PORT = 20068 81PORT = 20068
88HOSTNAME = localhost 82HOSTNAME = localhost
89HOME = $SERVICEHOME 83HOME = $SERVICEHOME
90CONFIG = $DEFAULTCONFIG
91BINARY = gnunet-service-datastore 84BINARY = gnunet-service-datastore
92ACCEPT_FROM = 127.0.0.1; 85ACCEPT_FROM = 127.0.0.1;
93ACCEPT_FROM6 = ::1; 86ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
110PORT = 20067 103PORT = 20067
111HOSTNAME = localhost 104HOSTNAME = localhost
112HOME = $SERVICEHOME 105HOME = $SERVICEHOME
113CONFIG = $DEFAULTCONFIG
114BINARY = gnunet-service-peerinfo 106BINARY = gnunet-service-peerinfo
115ACCEPT_FROM = 127.0.0.1; 107ACCEPT_FROM = 127.0.0.1;
116ACCEPT_FROM6 = ::1; 108ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20066 123PORT = 20066
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
153PORT = 20065 144PORT = 20065
154HOSTNAME = localhost 145HOSTNAME = localhost
155HOME = $SERVICEHOME 146HOME = $SERVICEHOME
156CONFIG = $DEFAULTCONFIG
157BINARY = gnunet-service-transport 147BINARY = gnunet-service-transport
158NEIGHBOUR_LIMIT = 50 148NEIGHBOUR_LIMIT = 50
159ACCEPT_FROM = 127.0.0.1; 149ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
205PORT = 20060 195PORT = 20060
206HOSTNAME = localhost 196HOSTNAME = localhost
207HOME = $SERVICEHOME 197HOME = $SERVICEHOME
208CONFIG = $DEFAULTCONFIG
209BINARY = gnunet-service-template 198BINARY = gnunet-service-template
210ACCEPT_FROM = 127.0.0.1; 199ACCEPT_FROM = 127.0.0.1;
211ACCEPT_FROM6 = ::1; 200ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
223PORT = 20059 212PORT = 20059
224HOSTNAME = localhost 213HOSTNAME = localhost
225HOME = $SERVICEHOME 214HOME = $SERVICEHOME
226CONFIG = $DEFAULTCONFIG
227BINARY = gnunet-service-fs 215BINARY = gnunet-service-fs
228ACCEPT_FROM = 127.0.0.1; 216ACCEPT_FROM = 127.0.0.1;
229ACCEPT_FROM6 = ::1; 217ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
238EXPECTED_NEIGHBOUR_COUNT = 128 226EXPECTED_NEIGHBOUR_COUNT = 128
239 227
240[vpn] 228[vpn]
241CONFIG = $DEFAULTCONFIG
242BINARY = gnunet-daemon-vpn 229BINARY = gnunet-daemon-vpn
243IPV6ADDR = 1234::1 230IPV6ADDR = 1234::1
244IPV6PREFIX = 32 231IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
249IFNAME = vpn-gnunet 236IFNAME = vpn-gnunet
250 237
251[exit] 238[exit]
252CONFIG = $DEFAULTCONFIG
253BINARY = gnunet-daemon-exit 239BINARY = gnunet-daemon-exit
254IPV6ADDR = 1234:1::1 240IPV6ADDR = 1234:1::1
255IPV6PREFIX = 32 241IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
264PORT = 0 250PORT = 0
265HOSTNAME = localhost 251HOSTNAME = localhost
266HOME = $SERVICEHOME 252HOME = $SERVICEHOME
267CONFIG = $DEFAULTCONFIG
268BINARY = gnunet-service-dns 253BINARY = gnunet-service-dns
269ACCEPT_FROM = 127.0.0.1; 254ACCEPT_FROM = 127.0.0.1;
270ACCEPT_FROM6 = ::1; 255ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
275PORT = 20058 260PORT = 20058
276HOSTNAME = localhost 261HOSTNAME = localhost
277HOME = $SERVICEHOME 262HOME = $SERVICEHOME
278CONFIG = $DEFAULTCONFIG
279BINARY = gnunet-service-arm 263BINARY = gnunet-service-arm
280ACCEPT_FROM = 127.0.0.1; 264ACCEPT_FROM = 127.0.0.1;
281ACCEPT_FROM6 = ::1; 265ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
288HTTPPORT = 8080 272HTTPPORT = 8080
289HOME = $SERVICEHOME 273HOME = $SERVICEHOME
290HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
291CONFIG = $DEFAULTCONFIG
292BINARY = gnunet-daemon-hostlist 275BINARY = gnunet-daemon-hostlist
293OPTIONS = -b 276OPTIONS = -b
294SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ 277SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@ AUTOSTART = YES
299PORT = 20057 282PORT = 20057
300HOSTNAME = localhost 283HOSTNAME = localhost
301HOME = $SERVICEHOME 284HOME = $SERVICEHOME
302CONFIG = $DEFAULTCONFIG
303BINARY = gnunet-service-core 285BINARY = gnunet-service-core
304ACCEPT_FROM = 127.0.0.1; 286ACCEPT_FROM = 127.0.0.1;
305ACCEPT_FROM6 = ::1; 287ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
333PORT = 20055 315PORT = 20055
334HOSTNAME = localhost 316HOSTNAME = localhost
335HOME = $SERVICEHOME 317HOME = $SERVICEHOME
336CONFIG = $DEFAULTCONFIG
337BINARY = gnunet-service-statistics 318BINARY = gnunet-service-statistics
338ACCEPT_FROM = 127.0.0.1; 319ACCEPT_FROM = 127.0.0.1;
339ACCEPT_FROM6 = ::1; 320ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
346PORT = 20054 327PORT = 20054
347HOSTNAME = localhost 328HOSTNAME = localhost
348HOME = $SERVICEHOME 329HOME = $SERVICEHOME
349CONFIG = $DEFAULTCONFIG
350BINARY = gnunet-service-dht 330BINARY = gnunet-service-dht
351ACCEPT_FROM = 127.0.0.1; 331ACCEPT_FROM = 127.0.0.1;
352ACCEPT_FROM6 = ::1; 332ACCEPT_FROM6 = ::1;
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES
367 347
368[dhtcache] 348[dhtcache]
369DATABASE = sqlite 349DATABASE = sqlite
370QUOTA = 1 MB \ No newline at end of file 350QUOTA = 1 MB
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 a4a30c18c..c887bdae0 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,6 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/c_normal_client 2SERVICEHOME = /tmp/c_normal_client
3DEFAULTCONFIG = confs/c_normal_client_tcp_udp_http.conf
4 3
5[gnunetd] 4[gnunetd]
6HOSTKEY = hostkeys/0002-hostkey 5HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
19PORT = 0 18PORT = 0
20HOSTNAME = localhost 19HOSTNAME = localhost
21HOME = $SERVICEHOME 20HOME = $SERVICEHOME
22CONFIG = $DEFAULTCONFIG
23BINARY = gnunet-service-dns 21BINARY = gnunet-service-dns
24ACCEPT_FROM = 127.0.0.1; 22ACCEPT_FROM = 127.0.0.1;
25ACCEPT_FROM6 = ::1; 23ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
31PORT = 20071 29PORT = 20071
32HOSTNAME = localhost 30HOSTNAME = localhost
33HOME = $SERVICEHOME 31HOME = $SERVICEHOME
34CONFIG = $DEFAULTCONFIG
35BINARY = gnunet-service-resolver 32BINARY = gnunet-service-resolver
36ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
37ACCEPT_FROM6 = ::1; 34ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
44PORT = 20070 41PORT = 20070
45HOSTNAME = localhost 42HOSTNAME = localhost
46HOME = $SERVICEHOME 43HOME = $SERVICEHOME
47CONFIG = $DEFAULTCONFIG
48BINARY = gnunet-service-mesh 44BINARY = gnunet-service-mesh
49ACCEPT_FROM = 127.0.0.1; 45ACCEPT_FROM = 127.0.0.1;
50ACCEPT_FROM6 = ::1; 46ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
57PORT = 20069 53PORT = 20069
58HOSTNAME = localhost 54HOSTNAME = localhost
59HOME = $SERVICEHOME 55HOME = $SERVICEHOME
60CONFIG = $DEFAULTCONFIG
61BINARY = gnunet-service-nse 56BINARY = gnunet-service-nse
62ACCEPT_FROM = 127.0.0.1; 57ACCEPT_FROM = 127.0.0.1;
63ACCEPT_FROM6 = ::1; 58ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
76AUTOCONNECT = YES 71AUTOCONNECT = YES
77TARGET-CONNECTION-COUNT = 16 72TARGET-CONNECTION-COUNT = 16
78FRIENDS = $SERVICEHOME/friends 73FRIENDS = $SERVICEHOME/friends
79CONFIG = $DEFAULTCONFIG
80BINARY = gnunet-daemon-topology 74BINARY = gnunet-daemon-topology
81 75
82[datastore] 76[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
87PORT = 20068 81PORT = 20068
88HOSTNAME = localhost 82HOSTNAME = localhost
89HOME = $SERVICEHOME 83HOME = $SERVICEHOME
90CONFIG = $DEFAULTCONFIG
91BINARY = gnunet-service-datastore 84BINARY = gnunet-service-datastore
92ACCEPT_FROM = 127.0.0.1; 85ACCEPT_FROM = 127.0.0.1;
93ACCEPT_FROM6 = ::1; 86ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
110PORT = 20067 103PORT = 20067
111HOSTNAME = localhost 104HOSTNAME = localhost
112HOME = $SERVICEHOME 105HOME = $SERVICEHOME
113CONFIG = $DEFAULTCONFIG
114BINARY = gnunet-service-peerinfo 106BINARY = gnunet-service-peerinfo
115ACCEPT_FROM = 127.0.0.1; 107ACCEPT_FROM = 127.0.0.1;
116ACCEPT_FROM6 = ::1; 108ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
131PORT = 20066 123PORT = 20066
132HOSTNAME = localhost 124HOSTNAME = localhost
133HOME = $SERVICEHOME 125HOME = $SERVICEHOME
134CONFIG = $DEFAULTCONFIG
135BINARY = gnunet-service-ats 126BINARY = gnunet-service-ats
136ACCEPT_FROM = 127.0.0.1; 127ACCEPT_FROM = 127.0.0.1;
137ACCEPT_FROM6 = ::1; 128ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
153PORT = 20065 144PORT = 20065
154HOSTNAME = localhost 145HOSTNAME = localhost
155HOME = $SERVICEHOME 146HOME = $SERVICEHOME
156CONFIG = $DEFAULTCONFIG
157BINARY = gnunet-service-transport 147BINARY = gnunet-service-transport
158NEIGHBOUR_LIMIT = 50 148NEIGHBOUR_LIMIT = 50
159ACCEPT_FROM = 127.0.0.1; 149ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
205PORT = 20060 195PORT = 20060
206HOSTNAME = localhost 196HOSTNAME = localhost
207HOME = $SERVICEHOME 197HOME = $SERVICEHOME
208CONFIG = $DEFAULTCONFIG
209BINARY = gnunet-service-template 198BINARY = gnunet-service-template
210ACCEPT_FROM = 127.0.0.1; 199ACCEPT_FROM = 127.0.0.1;
211ACCEPT_FROM6 = ::1; 200ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
223PORT = 20059 212PORT = 20059
224HOSTNAME = localhost 213HOSTNAME = localhost
225HOME = $SERVICEHOME 214HOME = $SERVICEHOME
226CONFIG = $DEFAULTCONFIG
227BINARY = gnunet-service-fs 215BINARY = gnunet-service-fs
228ACCEPT_FROM = 127.0.0.1; 216ACCEPT_FROM = 127.0.0.1;
229ACCEPT_FROM6 = ::1; 217ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
238EXPECTED_NEIGHBOUR_COUNT = 128 226EXPECTED_NEIGHBOUR_COUNT = 128
239 227
240[vpn] 228[vpn]
241CONFIG = $DEFAULTCONFIG
242BINARY = gnunet-daemon-vpn 229BINARY = gnunet-daemon-vpn
243IPV6ADDR = 1234::1 230IPV6ADDR = 1234::1
244IPV6PREFIX = 32 231IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
249IFNAME = vpn-gnunet 236IFNAME = vpn-gnunet
250 237
251[exit] 238[exit]
252CONFIG = $DEFAULTCONFIG
253BINARY = gnunet-daemon-exit 239BINARY = gnunet-daemon-exit
254IPV6ADDR = 1234:1::1 240IPV6ADDR = 1234:1::1
255IPV6PREFIX = 32 241IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
264PORT = 0 250PORT = 0
265HOSTNAME = localhost 251HOSTNAME = localhost
266HOME = $SERVICEHOME 252HOME = $SERVICEHOME
267CONFIG = $DEFAULTCONFIG
268BINARY = gnunet-service-dns 253BINARY = gnunet-service-dns
269ACCEPT_FROM = 127.0.0.1; 254ACCEPT_FROM = 127.0.0.1;
270ACCEPT_FROM6 = ::1; 255ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
275PORT = 20058 260PORT = 20058
276HOSTNAME = localhost 261HOSTNAME = localhost
277HOME = $SERVICEHOME 262HOME = $SERVICEHOME
278CONFIG = $DEFAULTCONFIG
279BINARY = gnunet-service-arm 263BINARY = gnunet-service-arm
280ACCEPT_FROM = 127.0.0.1; 264ACCEPT_FROM = 127.0.0.1;
281ACCEPT_FROM6 = ::1; 265ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
288HTTPPORT = 8080 272HTTPPORT = 8080
289HOME = $SERVICEHOME 273HOME = $SERVICEHOME
290HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data 274HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
291CONFIG = $DEFAULTCONFIG
292BINARY = gnunet-daemon-hostlist 275BINARY = gnunet-daemon-hostlist
293OPTIONS = -b 276OPTIONS = -b
294SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ 277SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@ AUTOSTART = YES
299PORT = 20057 282PORT = 20057
300HOSTNAME = localhost 283HOSTNAME = localhost
301HOME = $SERVICEHOME 284HOME = $SERVICEHOME
302CONFIG = $DEFAULTCONFIG
303BINARY = gnunet-service-core 285BINARY = gnunet-service-core
304ACCEPT_FROM = 127.0.0.1; 286ACCEPT_FROM = 127.0.0.1;
305ACCEPT_FROM6 = ::1; 287ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
333PORT = 20055 315PORT = 20055
334HOSTNAME = localhost 316HOSTNAME = localhost
335HOME = $SERVICEHOME 317HOME = $SERVICEHOME
336CONFIG = $DEFAULTCONFIG
337BINARY = gnunet-service-statistics 318BINARY = gnunet-service-statistics
338ACCEPT_FROM = 127.0.0.1; 319ACCEPT_FROM = 127.0.0.1;
339ACCEPT_FROM6 = ::1; 320ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
346PORT = 20054 327PORT = 20054
347HOSTNAME = localhost 328HOSTNAME = localhost
348HOME = $SERVICEHOME 329HOME = $SERVICEHOME
349CONFIG = $DEFAULTCONFIG
350BINARY = gnunet-service-dht 330BINARY = gnunet-service-dht
351ACCEPT_FROM = 127.0.0.1; 331ACCEPT_FROM = 127.0.0.1;
352ACCEPT_FROM6 = ::1; 332ACCEPT_FROM6 = ::1;
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES
367 347
368[dhtcache] 348[dhtcache]
369DATABASE = sqlite 349DATABASE = sqlite
370QUOTA = 1 MB \ No newline at end of file 350QUOTA = 1 MB
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 20:32:32 +0000