aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxrs <xrs@mail36.net>2018-06-23 16:58:42 +0200
committerxrs <xrs@mail36.net>2018-06-23 16:58:42 +0200
commit99c6e18e63181d8759ecbb398d58019a55d3ce6f (patch)
treecf925bf99a6fbe60dbec8ead7248bc59a0c8cce6 /src
parentb993ca621717d0a9958b4138a32fb1e3cef7f54c (diff)
parentc293f84ea192f361baf720a3979589c0e0881abc (diff)
downloadgnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.tar.gz
gnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.zip
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src')
-rw-r--r--src/arm/arm.conf.in6
-rw-r--r--src/arm/gnunet-service-arm.c44
-rw-r--r--src/arm/test_arm_api_data.conf14
-rw-r--r--src/ats/ats.conf.in2
-rw-r--r--src/auction/auction.conf2
-rw-r--r--src/cadet/cadet.conf.in2
-rw-r--r--src/cadet/gnunet-cadet.c1
-rw-r--r--src/cadet/test_cadet.conf16
-rw-r--r--src/consensus/consensus.conf.in2
-rw-r--r--src/consensus/test_consensus.conf6
-rw-r--r--src/conversation/conversation.conf.in2
-rw-r--r--src/core/core.conf.in2
-rw-r--r--src/credential/credential.conf.in4
-rw-r--r--src/credential/test_credential_lookup.conf6
-rw-r--r--src/datastore/datastore.conf.in2
-rw-r--r--src/datastore/test_defaults.conf2
-rw-r--r--src/dht/dht.conf.in2
-rw-r--r--src/dht/test_dht_2dtorus.conf4
-rw-r--r--src/dht/test_dht_api_data.conf4
-rw-r--r--src/dht/test_dht_api_peer1.conf4
-rw-r--r--src/dht/test_dht_line.conf4
-rw-r--r--src/dht/test_dht_monitor.conf4
-rw-r--r--src/dht/test_dht_multipeer.conf4
-rw-r--r--src/dht/test_dht_tools.conf58
-rw-r--r--src/dns/dns.conf.in2
-rw-r--r--src/dv/dv.conf.in2
-rw-r--r--src/dv/test_transport_dv_data.conf4
-rw-r--r--src/fragmentation/test_fragmentation_data.conf2
-rw-r--r--src/fs/fs.conf.in2
-rw-r--r--src/gns/gns-helper-service-w32.conf2
-rw-r--r--src/gns/gns.conf.in10
-rw-r--r--src/gns/gns_api.c6
-rw-r--r--src/gns/gns_tld_api.c6
-rw-r--r--src/gns/gnunet-gns-proxy.c169
-rw-r--r--src/gns/test_gns_lookup.conf4
-rw-r--r--src/gns/test_gns_nick_shorten.conf4
-rw-r--r--src/gns/test_gns_proxy.conf4
-rw-r--r--src/gns/test_gns_simple_lookup.conf16
-rw-r--r--src/identity-provider/identity-provider.conf4
-rw-r--r--src/identity-provider/test_idp.conf8
-rw-r--r--src/identity/identity.conf.in4
-rw-r--r--src/include/gnunet_gns_service.h6
-rw-r--r--src/include/gnunet_gnsrecord_lib.h4
-rw-r--r--src/integration-tests/confs/c_no_nat_client.conf4
-rw-r--r--src/integration-tests/confs/c_no_nat_client_2.conf6
-rw-r--r--src/integration-tests/confs/test_defaults.conf8
-rw-r--r--src/multicast/multicast.conf.in2
-rw-r--r--src/multicast/test_multicast.conf18
-rw-r--r--src/multicast/test_multicast_line.conf18
-rw-r--r--src/multicast/test_multicast_star.conf18
-rw-r--r--src/namecache/namecache.conf.in4
-rw-r--r--src/namestore/namestore.conf.in6
-rw-r--r--src/namestore/test_namestore_api.conf6
-rw-r--r--src/nat-auto/nat-auto.conf.in2
-rw-r--r--src/nat/nat.conf.in2
-rw-r--r--src/nat/test_nat_test_data.conf2
-rw-r--r--src/nse/nse.conf.in2
-rw-r--r--src/nse/nse_infiniband.conf2
-rw-r--r--src/nse/nse_profiler_test.conf4
-rw-r--r--src/peerinfo/peerinfo.conf.in2
-rw-r--r--src/peerinfo/test_peerinfo_api_data.conf4
-rw-r--r--src/peerstore/peerstore.conf.in2
-rw-r--r--src/peerstore/test_peerstore_api_data.conf2
-rw-r--r--src/psyc/psyc.conf.in2
-rw-r--r--src/psyc/test_psyc.conf6
-rw-r--r--src/psycstore/psycstore.conf.in2
-rw-r--r--src/pt/test_gns_vpn.conf14
-rw-r--r--src/pt/test_gnunet_vpn.conf6
-rw-r--r--src/regex/regex.conf.in2
-rw-r--r--src/regex/test_regex_api_data.conf4
-rw-r--r--src/revocation/revocation.conf.in2
-rw-r--r--src/rps/rps.conf.in2
-rw-r--r--src/rps/test_rps.conf22
-rw-r--r--src/scalarproduct/scalarproduct.conf.in4
-rw-r--r--src/secretsharing/secretsharing.conf.in2
-rw-r--r--src/secretsharing/test_secretsharing.conf8
-rw-r--r--src/set/set.conf.in2
-rw-r--r--src/set/test_set.conf2
-rw-r--r--src/social/social.conf.in4
-rw-r--r--src/statistics/statistics.conf.in2
-rw-r--r--src/template/template.conf2
-rw-r--r--src/testbed-logger/testbed-logger.conf.in12
-rw-r--r--src/testbed/test_testbed_api_barriers.conf.in34
-rw-r--r--src/testbed/test_testbed_api_statistics.conf2
-rw-r--r--src/testbed/test_testbed_api_template.conf4
-rw-r--r--src/testbed/test_testbed_underlay.conf.in4
-rw-r--r--src/testbed/testbed.conf.in10
-rw-r--r--src/transport/test_transport_api_manipulation_cfg.c1
-rw-r--r--src/transport/transport.conf.in2
-rw-r--r--src/util/resolver.conf.in2
-rw-r--r--src/util/resolver_api.c5
-rw-r--r--src/util/util.conf2
-rw-r--r--src/vpn/vpn.conf.in2
-rw-r--r--src/zonemaster/zonemaster.conf.in4
94 files changed, 385 insertions, 357 deletions
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 38cf4599c..64ae35786 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -22,9 +22,9 @@ GLOBAL_PREFIX = @MONKEYPREFIX@
22# system-level services (and we'll expect a second ARM to be 22# system-level services (and we'll expect a second ARM to be
23# run per-user to run user-level services). Note that in this 23# run per-user to run user-level services). Note that in this
24# case you must have manually created a different configuration 24# case you must have manually created a different configuration
25# file with the user where at least this and the USER_ONLY 25# file with the user where at least this and the START_USER_SERVICES
26# options differ. 26# options differ.
27# SYSTEM_ONLY = YES 27# START_SYSTEM_SERVICES = YES
28 28
29# If set to YES, ARM will only start services that are marked as 29# If set to YES, ARM will only start services that are marked as
30# per-user services (and we'll expect a system user to run ARM to 30# per-user services (and we'll expect a system user to run ARM to
@@ -39,7 +39,7 @@ GLOBAL_PREFIX = @MONKEYPREFIX@
39# USER ARM instances to some free port (counting down from 2085 should 39# USER ARM instances to some free port (counting down from 2085 should
40# be sane). 40# be sane).
41# 41#
42# USER_ONLY = YES 42# START_USER_SERVICES = YES
43 43
44# File where we should log per-service resource consumption on exit. 44# File where we should log per-service resource consumption on exit.
45# RESOURCE_DIAGNOSTICS = resource.log 45# RESOURCE_DIAGNOSTICS = resource.log
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index b56c9c0a8..a6dccf3de 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -235,6 +235,11 @@ static struct GNUNET_DISK_PipeHandle *sigpipe;
235static int in_shutdown; 235static int in_shutdown;
236 236
237/** 237/**
238 * Return value from main
239 */
240static int global_ret;
241
242/**
238 * Are we starting user services? 243 * Are we starting user services?
239 */ 244 */
240static int start_user = GNUNET_YES; 245static int start_user = GNUNET_YES;
@@ -505,7 +510,7 @@ get_server_addresses (const char *service_name,
505 if (GNUNET_YES == 510 if (GNUNET_YES ==
506 GNUNET_CONFIGURATION_get_value_yesno (cfg, 511 GNUNET_CONFIGURATION_get_value_yesno (cfg,
507 service_name, 512 service_name,
508 "AUTOSTART")) 513 "START_ON_DEMAND"))
509 LOG (GNUNET_ERROR_TYPE_ERROR, 514 LOG (GNUNET_ERROR_TYPE_ERROR,
510 _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"), 515 _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
511 service_name); 516 service_name);
@@ -1985,11 +1990,11 @@ setup_service (void *cls,
1985 if ((GNUNET_YES == 1990 if ((GNUNET_YES ==
1986 GNUNET_CONFIGURATION_have_value (cfg, 1991 GNUNET_CONFIGURATION_have_value (cfg,
1987 section, 1992 section,
1988 "USER_SERVICE")) && 1993 "RUN_PER_USER")) &&
1989 (GNUNET_YES == 1994 (GNUNET_YES ==
1990 GNUNET_CONFIGURATION_get_value_yesno (cfg, 1995 GNUNET_CONFIGURATION_get_value_yesno (cfg,
1991 section, 1996 section,
1992 "USER_SERVICE"))) 1997 "RUN_PER_USER")))
1993 { 1998 {
1994 if (GNUNET_NO == start_user) 1999 if (GNUNET_NO == start_user)
1995 { 2000 {
@@ -2071,7 +2076,7 @@ setup_service (void *cls,
2071 if (GNUNET_YES != 2076 if (GNUNET_YES !=
2072 GNUNET_CONFIGURATION_get_value_yesno (cfg, 2077 GNUNET_CONFIGURATION_get_value_yesno (cfg,
2073 section, 2078 section,
2074 "AUTOSTART")) 2079 "START_ON_DEMAND"))
2075 return; 2080 return;
2076 } 2081 }
2077 if (0 >= (ret = get_server_addresses (section, 2082 if (0 >= (ret = get_server_addresses (section,
@@ -2219,21 +2224,20 @@ run (void *cls,
2219 else 2224 else
2220 final_option = GNUNET_CONFIGURATION_expand_dollar (cfg, 2225 final_option = GNUNET_CONFIGURATION_expand_dollar (cfg,
2221 final_option); 2226 final_option);
2222 if (GNUNET_YES == 2227 start_user = GNUNET_CONFIGURATION_get_value_yesno (cfg,
2223 GNUNET_CONFIGURATION_get_value_yesno (cfg,
2224 "ARM", 2228 "ARM",
2225 "USER_ONLY")) 2229 "START_USER_SERVICES");
2226 { 2230 start_system = GNUNET_CONFIGURATION_get_value_yesno (cfg,
2227 GNUNET_break (GNUNET_YES == start_user);
2228 start_system = GNUNET_NO;
2229 }
2230 if (GNUNET_YES ==
2231 GNUNET_CONFIGURATION_get_value_yesno (cfg,
2232 "ARM", 2231 "ARM",
2233 "SYSTEM_ONLY")) 2232 "START_SYSTEM_SERVICES");
2233 if ( (GNUNET_NO == start_user) &&
2234 (GNUNET_NO == start_system) )
2234 { 2235 {
2235 GNUNET_break (GNUNET_YES == start_system); 2236 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
2236 start_user = GNUNET_NO; 2237 "Please configure either START_USER_SERVICES or START_SYSTEM_SERVICES or both.\n");
2238 GNUNET_SCHEDULER_shutdown ();
2239 global_ret = 1;
2240 return;
2237 } 2241 }
2238 GNUNET_CONFIGURATION_iterate_sections (cfg, 2242 GNUNET_CONFIGURATION_iterate_sections (cfg,
2239 &setup_service, 2243 &setup_service,
@@ -2260,7 +2264,6 @@ int
2260main (int argc, 2264main (int argc,
2261 char *const *argv) 2265 char *const *argv)
2262{ 2266{
2263 int ret;
2264 struct GNUNET_SIGNAL_Context *shc_chld; 2267 struct GNUNET_SIGNAL_Context *shc_chld;
2265 struct GNUNET_MQ_MessageHandler handlers[] = { 2268 struct GNUNET_MQ_MessageHandler handlers[] = {
2266 GNUNET_MQ_hd_var_size (start, 2269 GNUNET_MQ_hd_var_size (start,
@@ -2294,7 +2297,7 @@ main (int argc,
2294 shc_chld = 2297 shc_chld =
2295 GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, 2298 GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD,
2296 &sighandler_child_death); 2299 &sighandler_child_death);
2297 ret = GNUNET_SERVICE_run_ (argc, 2300 if ( GNUNET_OK != GNUNET_SERVICE_run_ (argc,
2298 argv, 2301 argv,
2299 "arm", 2302 "arm",
2300 GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN, 2303 GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN,
@@ -2302,7 +2305,8 @@ main (int argc,
2302 &client_connect_cb, 2305 &client_connect_cb,
2303 &client_disconnect_cb, 2306 &client_disconnect_cb,
2304 NULL, 2307 NULL,
2305 handlers); 2308 handlers))
2309 global_ret = 2;
2306#if HAVE_WAIT4 2310#if HAVE_WAIT4
2307 if (NULL != wait_file) 2311 if (NULL != wait_file)
2308 { 2312 {
@@ -2319,7 +2323,7 @@ main (int argc,
2319 shc_chld = NULL; 2323 shc_chld = NULL;
2320 GNUNET_DISK_pipe_close (sigpipe); 2324 GNUNET_DISK_pipe_close (sigpipe);
2321 sigpipe = NULL; 2325 sigpipe = NULL;
2322 return ret; 2326 return global_ret;
2323} 2327}
2324 2328
2325 2329
diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index b032cc95a..276b313b7 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -10,12 +10,12 @@ OPTIONS = -L ERROR
10#PREFIX = valgrind --tool=memcheck --leak-check=yes 10#PREFIX = valgrind --tool=memcheck --leak-check=yes
11 11
12[resolver] 12[resolver]
13AUTOSTART = YES 13START_ON_DEMAND = YES
14PORT = 23355 14PORT = 23355
15# PREFIX = valgrind 15# PREFIX = valgrind
16 16
17[do-nothing] 17[do-nothing]
18AUTOSTART = NO 18START_ON_DEMAND = NO
19PORT = 2223 19PORT = 2223
20HOSTNAME = localhost 20HOSTNAME = localhost
21BINARY = /will/be/overwritten/by/test_exponential_backoff 21BINARY = /will/be/overwritten/by/test_exponential_backoff
@@ -23,16 +23,16 @@ ACCEPT_FROM = 127.0.0.1;
23ACCEPT_FROM6 = ::1; 23ACCEPT_FROM6 = ::1;
24 24
25[statistics] 25[statistics]
26AUTOSTART = YES 26START_ON_DEMAND = YES
27 27
28[core] 28[core]
29AUTOSTART = NO 29START_ON_DEMAND = NO
30 30
31[transport] 31[transport]
32AUTOSTART = NO 32START_ON_DEMAND = NO
33 33
34[ats] 34[ats]
35AUTOSTART = NO 35START_ON_DEMAND = NO
36 36
37[peerinfo] 37[peerinfo]
38AUTOSTART = NO 38START_ON_DEMAND = NO
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index d9e867bde..53c0de0c5 100644
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -1,5 +1,5 @@
1[ats] 1[ats]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@UNIXONLY@ PORT = 2098 3@UNIXONLY@ PORT = 2098
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-ats 5BINARY = gnunet-service-ats
diff --git a/src/auction/auction.conf b/src/auction/auction.conf
index 6ca35896b..deb9ac1fc 100644
--- a/src/auction/auction.conf
+++ b/src/auction/auction.conf
@@ -1,4 +1,4 @@
1[auction] 1[auction]
2AUTOSTART = NO 2START_ON_DEMAND = NO
3BINARY = gnunet-service-auction 3BINARY = gnunet-service-auction
4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-auction.sock 4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-auction.sock
diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in
index d50e168f0..8e4a8b1cf 100644
--- a/src/cadet/cadet.conf.in
+++ b/src/cadet/cadet.conf.in
@@ -1,6 +1,6 @@
1[cadet] 1[cadet]
2FORCESTART = YES 2FORCESTART = YES
3AUTOSTART = @AUTOSTART@ 3START_ON_DEMAND = @START_ON_DEMAND@
4@JAVAPORT@PORT = 2096 4@JAVAPORT@PORT = 2096
5HOSTNAME = localhost 5HOSTNAME = localhost
6BINARY = gnunet-service-cadet 6BINARY = gnunet-service-cadet
diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c
index 0cabb86e9..04a595a7b 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cadet/gnunet-cadet.c
@@ -373,6 +373,7 @@ send_echo (void *cls)
373static void 373static void
374request_dump (void *cls) 374request_dump (void *cls)
375{ 375{
376 job = NULL;
376 GNUNET_CADET_request_dump (mh); 377 GNUNET_CADET_request_dump (mh);
377 GNUNET_SCHEDULER_shutdown (); 378 GNUNET_SCHEDULER_shutdown ();
378} 379}
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index f2308df29..4731617d4 100644
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -69,32 +69,32 @@ WORKBITS = 0
69 69
70[hostlist] 70[hostlist]
71FORCESTART = NO 71FORCESTART = NO
72AUTOSTART = NO 72START_ON_DEMAND = NO
73 73
74[fs] 74[fs]
75FORCESTART = NO 75FORCESTART = NO
76AUTOSTART = NO 76START_ON_DEMAND = NO
77 77
78[vpn] 78[vpn]
79FORCESTART = NO 79FORCESTART = NO
80AUTOSTART = NO 80START_ON_DEMAND = NO
81 81
82[revocation] 82[revocation]
83FORCESTART = NO 83FORCESTART = NO
84AUTOSTART = NO 84START_ON_DEMAND = NO
85 85
86[gns] 86[gns]
87FORCESTART = NO 87FORCESTART = NO
88AUTOSTART = NO 88START_ON_DEMAND = NO
89 89
90[namestore] 90[namestore]
91FORCESTART = NO 91FORCESTART = NO
92AUTOSTART = NO 92START_ON_DEMAND = NO
93 93
94[namecache] 94[namecache]
95FORCESTART = NO 95FORCESTART = NO
96AUTOSTART = NO 96START_ON_DEMAND = NO
97 97
98[topology] 98[topology]
99FORCESTART = NO 99FORCESTART = NO
100AUTOSTART = NO 100START_ON_DEMAND = NO
diff --git a/src/consensus/consensus.conf.in b/src/consensus/consensus.conf.in
index 2afee04db..b0fbcaf5a 100644
--- a/src/consensus/consensus.conf.in
+++ b/src/consensus/consensus.conf.in
@@ -1,5 +1,5 @@
1[consensus] 1[consensus]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@JAVAPORT@PORT = 2103 3@JAVAPORT@PORT = 2103
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-consensus 5BINARY = gnunet-service-consensus
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf
index 6cb0885b0..42e06a66d 100644
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -54,13 +54,13 @@ OPERATION_TIMEOUT = 60 s
54MAX_OPEN_FDS = 4096 54MAX_OPEN_FDS = 4096
55 55
56[hostlist] 56[hostlist]
57AUTOSTART = NO 57START_ON_DEMAND = NO
58 58
59[fs] 59[fs]
60AUTOSTART = NO 60START_ON_DEMAND = NO
61 61
62[revocation] 62[revocation]
63AUTOSTART = NO 63START_ON_DEMAND = NO
64 64
65[nat] 65[nat]
66# Use addresses from the local network interfaces (inluding loopback, but also others) 66# Use addresses from the local network interfaces (inluding loopback, but also others)
diff --git a/src/conversation/conversation.conf.in b/src/conversation/conversation.conf.in
index e966ed6d9..b28fb6e1f 100644
--- a/src/conversation/conversation.conf.in
+++ b/src/conversation/conversation.conf.in
@@ -1,5 +1,5 @@
1[conversation] 1[conversation]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3BINARY = gnunet-service-conversation 3BINARY = gnunet-service-conversation
4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock 4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock
5HOSTNAME = localhost 5HOSTNAME = localhost
diff --git a/src/core/core.conf.in b/src/core/core.conf.in
index 3f388632e..2b20a109a 100644
--- a/src/core/core.conf.in
+++ b/src/core/core.conf.in
@@ -1,5 +1,5 @@
1[core] 1[core]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@JAVAPORT@PORT = 2092 3@JAVAPORT@PORT = 2092
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-core 5BINARY = gnunet-service-core
diff --git a/src/credential/credential.conf.in b/src/credential/credential.conf.in
index 71f3066ca..d5a0b1c88 100644
--- a/src/credential/credential.conf.in
+++ b/src/credential/credential.conf.in
@@ -1,5 +1,5 @@
1[credential] 1[credential]
2BINARY = gnunet-service-credential 2BINARY = gnunet-service-credential
3UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-credential.sock 3UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-credential.sock
4USER_SERVICE = YES 4RUN_PER_USER = YES
5OPTIONS = -L DEBUG \ No newline at end of file 5OPTIONS = -L DEBUG
diff --git a/src/credential/test_credential_lookup.conf b/src/credential/test_credential_lookup.conf
index bd464a1f4..39f68c944 100644
--- a/src/credential/test_credential_lookup.conf
+++ b/src/credential/test_credential_lookup.conf
@@ -4,13 +4,13 @@
4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-peer-1/ 4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-peer-1/
5 5
6[dht] 6[dht]
7AUTOSTART = YES 7START_ON_DEMAND = YES
8 8
9[transport] 9[transport]
10PLUGINS = 10PLUGINS =
11 11
12[credential] 12[credential]
13AUTOSTART = YES 13START_ON_DEMAND = YES
14PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/credlog 14PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/credlog
15 15
16[rest] 16[rest]
@@ -18,7 +18,7 @@ PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/r
18 18
19[gns] 19[gns]
20#PREFIX = valgrind --leak-check=full --track-origins=yes 20#PREFIX = valgrind --leak-check=full --track-origins=yes
21AUTOSTART = YES 21START_ON_DEMAND = YES
22AUTO_IMPORT_PKEY = YES 22AUTO_IMPORT_PKEY = YES
23MAX_PARALLEL_BACKGROUND_QUERIES = 10 23MAX_PARALLEL_BACKGROUND_QUERIES = 10
24DEFAULT_LOOKUP_TIMEOUT = 15 s 24DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in
index 721c865c8..21d24bb52 100644
--- a/src/datastore/datastore.conf.in
+++ b/src/datastore/datastore.conf.in
@@ -1,5 +1,5 @@
1[datastore] 1[datastore]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock 3UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock
4UNIX_MATCH_UID = NO 4UNIX_MATCH_UID = NO
5UNIX_MATCH_GID = YES 5UNIX_MATCH_GID = YES
diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
index 08e630eb0..1f971de8f 100644
--- a/src/datastore/test_defaults.conf
+++ b/src/datastore/test_defaults.conf
@@ -4,7 +4,7 @@
4[datastore] 4[datastore]
5PORT = 22654 5PORT = 22654
6QUOTA = 1 MB 6QUOTA = 1 MB
7AUTOSTART = YES 7START_ON_DEMAND = YES
8 8
9[nse] 9[nse]
10WORKBITS = 1 10WORKBITS = 1
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
index f828b725f..9ae6d630b 100644
--- a/src/dht/dht.conf.in
+++ b/src/dht/dht.conf.in
@@ -1,6 +1,6 @@
1[dht] 1[dht]
2FORCESTART = YES 2FORCESTART = YES
3AUTOSTART = @AUTOSTART@ 3START_ON_DEMAND = @START_ON_DEMAND@
4@JAVAPORT@PORT = 2095 4@JAVAPORT@PORT = 2095
5HOSTNAME = localhost 5HOSTNAME = localhost
6BINARY = gnunet-service-dht 6BINARY = gnunet-service-dht
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index a541e8443..c3621cda5 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -4,7 +4,7 @@
4GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/ 4GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/
5 5
6[dht] 6[dht]
7AUTOSTART = YES 7START_ON_DEMAND = YES
8FORCESTART = YES 8FORCESTART = YES
9 9
10[dhtcache] 10[dhtcache]
@@ -28,7 +28,7 @@ WAN_QUOTA_OUT = 1 GB
28OVERLAY_TOPOLOGY = 2D_TORUS 28OVERLAY_TOPOLOGY = 2D_TORUS
29 29
30[nse] 30[nse]
31AUTOSTART = YES 31START_ON_DEMAND = YES
32WORKDELAY = 500 ms 32WORKDELAY = 500 ms
33INTERVAL = 60 s 33INTERVAL = 60 s
34WORKBITS = 0 34WORKBITS = 0
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index a2c1829c6..3a9857cff 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -36,9 +36,9 @@ INTERNAL_ADDRESS = 127.0.0.1
36EXTERNAL_ADDRESS = 127.0.0.1 36EXTERNAL_ADDRESS = 127.0.0.1
37 37
38[dht] 38[dht]
39AUTOSTART = YES 39START_ON_DEMAND = YES
40FORCESTART = YES 40FORCESTART = YES
41 41
42[nse] 42[nse]
43AUTOSTART = YES 43START_ON_DEMAND = YES
44WORKBITS = 1 44WORKBITS = 1
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index b4164077f..64dc243e0 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -33,9 +33,9 @@ EXTERNAL_ADDRESS = 127.0.0.1
33USE_LOCALADDR = NO 33USE_LOCALADDR = NO
34 34
35[dht] 35[dht]
36AUTOSTART = YES 36START_ON_DEMAND = YES
37FORCESTART = YES 37FORCESTART = YES
38 38
39[nse] 39[nse]
40AUTOSTART = YES 40START_ON_DEMAND = YES
41WORKBITS = 1 41WORKBITS = 1
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 5368b0baf..8e48b1165 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -4,7 +4,7 @@
4GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/ 4GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/
5 5
6[dht] 6[dht]
7AUTOSTART = YES 7START_ON_DEMAND = YES
8FORCESTART = YES 8FORCESTART = YES
9 9
10[dhtcache] 10[dhtcache]
@@ -32,7 +32,7 @@ OVERLAY_TOPOLOGY = LINE
32plugins = unix 32plugins = unix
33 33
34[nse] 34[nse]
35AUTOSTART = YES 35START_ON_DEMAND = YES
36WORKDELAY = 500 ms 36WORKDELAY = 500 ms
37INTERVAL = 60 s 37INTERVAL = 60 s
38WORKBITS = 0 38WORKBITS = 0
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index c0d457e89..26052555e 100644
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -31,9 +31,9 @@ RETURN_LOCAL_ADDRESSES = YES
31 31
32 32
33[dht] 33[dht]
34AUTOSTART = YES 34START_ON_DEMAND = YES
35FORCESTART = YES 35FORCESTART = YES
36 36
37[nse] 37[nse]
38AUTOSTART = YES 38START_ON_DEMAND = YES
39WORKBITS = 1 39WORKBITS = 1
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index 4296d783e..725373900 100644
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.conf
@@ -2,7 +2,7 @@
2@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf 2@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
3 3
4[dht] 4[dht]
5AUTOSTART = YES 5START_ON_DEMAND = YES
6FORCESTART = YES 6FORCESTART = YES
7 7
8[dhtcache] 8[dhtcache]
@@ -34,7 +34,7 @@ EXTERNAL_ADDRESS = 127.0.0.1
34USE_LOCALADDR = YES 34USE_LOCALADDR = YES
35 35
36[nse] 36[nse]
37AUTOSTART = YES 37START_ON_DEMAND = YES
38WORKDELAY = 500 ms 38WORKDELAY = 500 ms
39INTERVAL = 60 s 39INTERVAL = 60 s
40WORKBITS = 0 40WORKBITS = 0
diff --git a/src/dht/test_dht_tools.conf b/src/dht/test_dht_tools.conf
index 46d206448..f13c9a66a 100644
--- a/src/dht/test_dht_tools.conf
+++ b/src/dht/test_dht_tools.conf
@@ -30,93 +30,93 @@ EXTERNAL_ADDRESS = 127.0.0.1
30USE_LOCALADDR = NO 30USE_LOCALADDR = NO
31 31
32[dht] 32[dht]
33AUTOSTART = YES 33START_ON_DEMAND = YES
34FORCESTART = YES 34FORCESTART = YES
35 35
36[nse] 36[nse]
37AUTOSTART = YES 37START_ON_DEMAND = YES
38WORKBITS = 1 38WORKBITS = 1
39# Configuration to disable autostarting of 39# Configuration to disable autostarting of
40# all services above the 'core' level. 40# all services above the 'core' level.
41# (including resolver) 41# (including resolver)
42 42
43[dns] 43[dns]
44AUTOSTART = NO 44START_ON_DEMAND = NO
45 45
46[cadet] 46[cadet]
47AUTOSTART = NO 47START_ON_DEMAND = NO
48 48
49[datastore] 49[datastore]
50AUTOSTART = NO 50START_ON_DEMAND = NO
51 51
52[fs] 52[fs]
53AUTOSTART = NO 53START_ON_DEMAND = NO
54 54
55[dv] 55[dv]
56AUTOSTART = NO 56START_ON_DEMAND = NO
57 57
58[vpn] 58[vpn]
59AUTOSTART = NO 59START_ON_DEMAND = NO
60 60
61[consensus] 61[consensus]
62AUTOSTART = NO 62START_ON_DEMAND = NO
63 63
64[resolver] 64[resolver]
65AUTOSTART = NO 65START_ON_DEMAND = NO
66 66
67[namestore] 67[namestore]
68AUTOSTART = NO 68START_ON_DEMAND = NO
69 69
70[namecache] 70[namecache]
71AUTOSTART = NO 71START_ON_DEMAND = NO
72 72
73[identity] 73[identity]
74AUTOSTART = NO 74START_ON_DEMAND = NO
75 75
76[revocation] 76[revocation]
77AUTOSTART = NO 77START_ON_DEMAND = NO
78 78
79[conversation] 79[conversation]
80AUTOSTART = NO 80START_ON_DEMAND = NO
81 81
82[peerstore] 82[peerstore]
83AUTOSTART = NO 83START_ON_DEMAND = NO
84 84
85[psycstore] 85[psycstore]
86AUTOSTART = NO 86START_ON_DEMAND = NO
87 87
88[gns] 88[gns]
89AUTOSTART = NO 89START_ON_DEMAND = NO
90 90
91[regex] 91[regex]
92AUTOSTART = NO 92START_ON_DEMAND = NO
93 93
94[set] 94[set]
95AUTOSTART = NO 95START_ON_DEMAND = NO
96 96
97[scalarproduct-bob] 97[scalarproduct-bob]
98AUTOSTART = NO 98START_ON_DEMAND = NO
99 99
100[scalarproduct-alice] 100[scalarproduct-alice]
101AUTOSTART = NO 101START_ON_DEMAND = NO
102 102
103[social] 103[social]
104AUTOSTART = NO 104START_ON_DEMAND = NO
105 105
106[psyc] 106[psyc]
107AUTOSTART = NO 107START_ON_DEMAND = NO
108 108
109[rps] 109[rps]
110AUTOSTART = NO 110START_ON_DEMAND = NO
111 111
112[multicast] 112[multicast]
113AUTOSTART = NO 113START_ON_DEMAND = NO
114 114
115[sensordashboard] 115[sensordashboard]
116AUTOSTART = NO 116START_ON_DEMAND = NO
117 117
118[sensor] 118[sensor]
119AUTOSTART = NO 119START_ON_DEMAND = NO
120# Configuration file that can be included to prevent ANY of the usual 120# Configuration file that can be included to prevent ANY of the usual
121# FORCESTART = YES to be set. Also disables NSE POW calculation. 121# FORCESTART = YES to be set. Also disables NSE POW calculation.
122# 122#
@@ -154,4 +154,4 @@ FORCESTART = NO
154FORCESTART = NO 154FORCESTART = NO
155 155
156[zonemaster] 156[zonemaster]
157FORCESTART = NO \ No newline at end of file 157FORCESTART = NO
diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in
index 000b73cf1..39f260813 100644
--- a/src/dns/dns.conf.in
+++ b/src/dns/dns.conf.in
@@ -1,5 +1,5 @@
1[dns] 1[dns]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3HOSTNAME = localhost 3HOSTNAME = localhost
4BINARY = gnunet-service-dns 4BINARY = gnunet-service-dns
5UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dns.sock 5UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dns.sock
diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in
index 5d9a960f5..145c58be6 100644
--- a/src/dv/dv.conf.in
+++ b/src/dv/dv.conf.in
@@ -1,5 +1,5 @@
1[dv] 1[dv]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3ACCEPT_FROM6 = ::1; 3ACCEPT_FROM6 = ::1;
4ACCEPT_FROM = 127.0.0.1; 4ACCEPT_FROM = 127.0.0.1;
5BINARY = gnunet-service-dv 5BINARY = gnunet-service-dv
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index ff02d4a5e..307921ac4 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -6,11 +6,11 @@ PLUGINS = tcp dv
6#PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high 6#PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
7 7
8[dv] 8[dv]
9AUTOSTART = YES 9START_ON_DEMAND = YES
10# PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high 10# PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
11 11
12[set] 12[set]
13AUTOSTART = YES 13START_ON_DEMAND = YES
14# PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high 14# PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
15 15
16[core] 16[core]
diff --git a/src/fragmentation/test_fragmentation_data.conf b/src/fragmentation/test_fragmentation_data.conf
index c236f689c..54ad21ff9 100644
--- a/src/fragmentation/test_fragmentation_data.conf
+++ b/src/fragmentation/test_fragmentation_data.conf
@@ -1,5 +1,5 @@
1 1
2[nse] 2[nse]
3AUTOSTART = NO 3START_ON_DEMAND = NO
4 4
5 5
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index d46de387f..7c483a449 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -1,5 +1,5 @@
1[fs] 1[fs]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3FORCESTART = YES 3FORCESTART = YES
4INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst 4INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
5RESPECT = $GNUNET_DATA_HOME/fs/credit/ 5RESPECT = $GNUNET_DATA_HOME/fs/credit/
diff --git a/src/gns/gns-helper-service-w32.conf b/src/gns/gns-helper-service-w32.conf
index 48652173a..a7b9fdd70 100644
--- a/src/gns/gns-helper-service-w32.conf
+++ b/src/gns/gns-helper-service-w32.conf
@@ -1,4 +1,4 @@
1[gns-helper-service-w32] 1[gns-helper-service-w32]
2AUTOSTART = YES 2START_ON_DEMAND = YES
3BINARY = gnunet-gns-helper-service-w32 3BINARY = gnunet-gns-helper-service-w32
4PORT = 5353 4PORT = 5353
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index de50d1047..addfbf14a 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,5 +1,5 @@
1[gns] 1[gns]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3FORCESTART = YES 3FORCESTART = YES
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-gns 5BINARY = gnunet-service-gns
@@ -30,8 +30,8 @@ INTERCEPT_DNS = NO
30 30
31[gns-proxy] 31[gns-proxy]
32BINARY = gnunet-gns-proxy 32BINARY = gnunet-gns-proxy
33AUTOSTART = NO 33START_ON_DEMAND = NO
34USER_SERVICE = YES 34RUN_PER_USER = YES
35 35
36# Where is the certificate for the GNS proxy stored? 36# Where is the certificate for the GNS proxy stored?
37PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem 37PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem
@@ -40,8 +40,8 @@ PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
40 40
41[dns2gns] 41[dns2gns]
42BINARY = gnunet-dns2gns 42BINARY = gnunet-dns2gns
43AUTOSTART = NO 43START_ON_DEMAND = NO
44USER_SERVICE = YES 44RUN_PER_USER = YES
45 45
46# -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use 46# -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use
47OPTIONS = -d 8.8.8.8 47OPTIONS = -d 8.8.8.8
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 8264bf715..0ec9209da 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -300,17 +300,21 @@ GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
300 * Cancel pending lookup request 300 * Cancel pending lookup request
301 * 301 *
302 * @param lr the lookup request to cancel 302 * @param lr the lookup request to cancel
303 * @return closure from the lookup result processor
303 */ 304 */
304void 305void *
305GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr) 306GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr)
306{ 307{
307 struct GNUNET_GNS_Handle *handle = lr->gns_handle; 308 struct GNUNET_GNS_Handle *handle = lr->gns_handle;
309 void *ret;
308 310
309 GNUNET_CONTAINER_DLL_remove (handle->lookup_head, 311 GNUNET_CONTAINER_DLL_remove (handle->lookup_head,
310 handle->lookup_tail, 312 handle->lookup_tail,
311 lr); 313 lr);
312 GNUNET_MQ_discard (lr->env); 314 GNUNET_MQ_discard (lr->env);
315 ret = lr->proc_cls;
313 GNUNET_free (lr); 316 GNUNET_free (lr);
317 return ret;
314} 318}
315 319
316 320
diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c
index b053aa0c1..825b51d06 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -317,10 +317,13 @@ GNUNET_GNS_lookup_with_tld (struct GNUNET_GNS_Handle *handle,
317 * Cancel pending lookup request 317 * Cancel pending lookup request
318 * 318 *
319 * @param ltr the lookup request to cancel 319 * @param ltr the lookup request to cancel
320 * @return closure from the lookup result processor
320 */ 321 */
321void 322void *
322GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr) 323GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
323{ 324{
325 void *ret = ltr->lookup_proc_cls;
326
324 if (NULL != ltr->id_op) 327 if (NULL != ltr->id_op)
325 { 328 {
326 GNUNET_IDENTITY_ego_lookup_cancel (ltr->id_op); 329 GNUNET_IDENTITY_ego_lookup_cancel (ltr->id_op);
@@ -333,6 +336,7 @@ GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
333 } 336 }
334 GNUNET_free (ltr->name); 337 GNUNET_free (ltr->name);
335 GNUNET_free (ltr); 338 GNUNET_free (ltr);
339 return ret;
336} 340}
337 341
338/* end of gns_tld_api.c */ 342/* end of gns_tld_api.c */
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 9c3c78b76..52291bff0 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -2026,34 +2026,41 @@ create_response (void *cls,
2026 curl_easy_setopt (s5r->curl, 2026 curl_easy_setopt (s5r->curl,
2027 CURLOPT_CUSTOMREQUEST, 2027 CURLOPT_CUSTOMREQUEST,
2028 "OPTIONS"); 2028 "OPTIONS");
2029 curl_easy_setopt (s5r->curl,
2030 CURLOPT_WRITEFUNCTION,
2031 &curl_download_cb);
2032 curl_easy_setopt (s5r->curl,
2033 CURLOPT_WRITEDATA,
2034 s5r);
2035
2029 } 2036 }
2030 else if (0 == strcasecmp (meth, 2037 else if (0 == strcasecmp (meth,
2031 MHD_HTTP_METHOD_GET)) 2038 MHD_HTTP_METHOD_GET))
2032 { 2039 {
2033 s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED; 2040 s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED;
2034 curl_easy_setopt (s5r->curl, 2041 curl_easy_setopt (s5r->curl,
2035 CURLOPT_HTTPGET, 2042 CURLOPT_HTTPGET,
2036 1L); 2043 1L);
2037 curl_easy_setopt (s5r->curl, 2044 curl_easy_setopt (s5r->curl,
2038 CURLOPT_WRITEFUNCTION, 2045 CURLOPT_WRITEFUNCTION,
2039 &curl_download_cb); 2046 &curl_download_cb);
2040 curl_easy_setopt (s5r->curl, 2047 curl_easy_setopt (s5r->curl,
2041 CURLOPT_WRITEDATA, 2048 CURLOPT_WRITEDATA,
2042 s5r); 2049 s5r);
2043 } 2050 }
2044 else if (0 == strcasecmp (meth, 2051 else if (0 == strcasecmp (meth,
2045 MHD_HTTP_METHOD_DELETE)) 2052 MHD_HTTP_METHOD_DELETE))
2046 { 2053 {
2047 s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED; 2054 s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED;
2048 curl_easy_setopt (s5r->curl, 2055 curl_easy_setopt (s5r->curl,
2049 CURLOPT_CUSTOMREQUEST, 2056 CURLOPT_CUSTOMREQUEST,
2050 "DELETE"); 2057 "DELETE");
2051 curl_easy_setopt (s5r->curl, 2058 curl_easy_setopt (s5r->curl,
2052 CURLOPT_WRITEFUNCTION, 2059 CURLOPT_WRITEFUNCTION,
2053 &curl_download_cb); 2060 &curl_download_cb);
2054 curl_easy_setopt (s5r->curl, 2061 curl_easy_setopt (s5r->curl,
2055 CURLOPT_WRITEDATA, 2062 CURLOPT_WRITEDATA,
2056 s5r); 2063 s5r);
2057 } 2064 }
2058 else 2065 else
2059 { 2066 {
@@ -2068,46 +2075,46 @@ create_response (void *cls,
2068 if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_0)) 2075 if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_0))
2069 { 2076 {
2070 curl_easy_setopt (s5r->curl, 2077 curl_easy_setopt (s5r->curl,
2071 CURLOPT_HTTP_VERSION, 2078 CURLOPT_HTTP_VERSION,
2072 CURL_HTTP_VERSION_1_0); 2079 CURL_HTTP_VERSION_1_0);
2073 } 2080 }
2074 else if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_1)) 2081 else if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_1))
2075 { 2082 {
2076 curl_easy_setopt (s5r->curl, 2083 curl_easy_setopt (s5r->curl,
2077 CURLOPT_HTTP_VERSION, 2084 CURLOPT_HTTP_VERSION,
2078 CURL_HTTP_VERSION_1_1); 2085 CURL_HTTP_VERSION_1_1);
2079 } 2086 }
2080 else 2087 else
2081 { 2088 {
2082 curl_easy_setopt (s5r->curl, 2089 curl_easy_setopt (s5r->curl,
2083 CURLOPT_HTTP_VERSION, 2090 CURLOPT_HTTP_VERSION,
2084 CURL_HTTP_VERSION_NONE); 2091 CURL_HTTP_VERSION_NONE);
2085 } 2092 }
2086 2093
2087 if (HTTPS_PORT == s5r->port) 2094 if (HTTPS_PORT == s5r->port)
2088 { 2095 {
2089 curl_easy_setopt (s5r->curl, 2096 curl_easy_setopt (s5r->curl,
2090 CURLOPT_USE_SSL, 2097 CURLOPT_USE_SSL,
2091 CURLUSESSL_ALL); 2098 CURLUSESSL_ALL);
2092 if (NULL != s5r->dane_data) 2099 if (NULL != s5r->dane_data)
2093 curl_easy_setopt (s5r->curl, 2100 curl_easy_setopt (s5r->curl,
2094 CURLOPT_SSL_VERIFYPEER, 2101 CURLOPT_SSL_VERIFYPEER,
2095 0L); 2102 0L);
2096 else 2103 else
2097 curl_easy_setopt (s5r->curl, 2104 curl_easy_setopt (s5r->curl,
2098 CURLOPT_SSL_VERIFYPEER, 2105 CURLOPT_SSL_VERIFYPEER,
2099 1L); 2106 1L);
2100 /* Disable cURL checking the hostname, as we will check ourselves 2107 /* Disable cURL checking the hostname, as we will check ourselves
2101 as only we have the domain name or the LEHO or the DANE record */ 2108 as only we have the domain name or the LEHO or the DANE record */
2102 curl_easy_setopt (s5r->curl, 2109 curl_easy_setopt (s5r->curl,
2103 CURLOPT_SSL_VERIFYHOST, 2110 CURLOPT_SSL_VERIFYHOST,
2104 0L); 2111 0L);
2105 } 2112 }
2106 else 2113 else
2107 { 2114 {
2108 curl_easy_setopt (s5r->curl, 2115 curl_easy_setopt (s5r->curl,
2109 CURLOPT_USE_SSL, 2116 CURLOPT_USE_SSL,
2110 CURLUSESSL_NONE); 2117 CURLUSESSL_NONE);
2111 } 2118 }
2112 2119
2113 if (CURLM_OK != 2120 if (CURLM_OK !=
@@ -2135,14 +2142,14 @@ create_response (void *cls,
2135 { 2142 {
2136 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 2143 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
2137 "Processing %u bytes UPLOAD\n", 2144 "Processing %u bytes UPLOAD\n",
2138 (unsigned int) *upload_data_size); 2145 (unsigned int) *upload_data_size);
2139 2146
2140 /* FIXME: This must be set or a header with Transfer-Encoding: chunked. Else 2147 /* FIXME: This must be set or a header with Transfer-Encoding: chunked. Else
2141 * upload callback is not called! 2148 * upload callback is not called!
2142 */ 2149 */
2143 curl_easy_setopt (s5r->curl, 2150 curl_easy_setopt (s5r->curl,
2144 CURLOPT_POSTFIELDSIZE, 2151 CURLOPT_POSTFIELDSIZE,
2145 *upload_data_size); 2152 *upload_data_size);
2146 2153
2147 left = GNUNET_MIN (*upload_data_size, 2154 left = GNUNET_MIN (*upload_data_size,
2148 sizeof (s5r->io_buf) - s5r->io_len); 2155 sizeof (s5r->io_buf) - s5r->io_len);
@@ -2156,7 +2163,7 @@ create_response (void *cls,
2156 { 2163 {
2157 s5r->curl_paused = GNUNET_NO; 2164 s5r->curl_paused = GNUNET_NO;
2158 curl_easy_pause (s5r->curl, 2165 curl_easy_pause (s5r->curl,
2159 CURLPAUSE_CONT); 2166 CURLPAUSE_CONT);
2160 } 2167 }
2161 return MHD_YES; 2168 return MHD_YES;
2162 } 2169 }
@@ -2536,9 +2543,9 @@ load_file (const char* filename,
2536 2543
2537 if (GNUNET_OK != 2544 if (GNUNET_OK !=
2538 GNUNET_DISK_file_size (filename, 2545 GNUNET_DISK_file_size (filename,
2539 &fsize, 2546 &fsize,
2540 GNUNET_YES, 2547 GNUNET_YES,
2541 GNUNET_YES)) 2548 GNUNET_YES))
2542 return NULL; 2549 return NULL;
2543 if (fsize > MAX_PEM_SIZE) 2550 if (fsize > MAX_PEM_SIZE)
2544 return NULL; 2551 return NULL;
@@ -2571,7 +2578,7 @@ load_key_from_file (gnutls_x509_privkey_t key,
2571 int ret; 2578 int ret;
2572 2579
2573 key_data.data = load_file (keyfile, 2580 key_data.data = load_file (keyfile,
2574 &key_data.size); 2581 &key_data.size);
2575 if (NULL == key_data.data) 2582 if (NULL == key_data.data)
2576 return GNUNET_SYSERR; 2583 return GNUNET_SYSERR;
2577 ret = gnutls_x509_privkey_import (key, &key_data, 2584 ret = gnutls_x509_privkey_import (key, &key_data,
@@ -2602,17 +2609,17 @@ load_cert_from_file (gnutls_x509_crt_t crt,
2602 int ret; 2609 int ret;
2603 2610
2604 cert_data.data = load_file (certfile, 2611 cert_data.data = load_file (certfile,
2605 &cert_data.size); 2612 &cert_data.size);
2606 if (NULL == cert_data.data) 2613 if (NULL == cert_data.data)
2607 return GNUNET_SYSERR; 2614 return GNUNET_SYSERR;
2608 ret = gnutls_x509_crt_import (crt, 2615 ret = gnutls_x509_crt_import (crt,
2609 &cert_data, 2616 &cert_data,
2610 GNUTLS_X509_FMT_PEM); 2617 GNUTLS_X509_FMT_PEM);
2611 if (GNUTLS_E_SUCCESS != ret) 2618 if (GNUTLS_E_SUCCESS != ret)
2612 { 2619 {
2613 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 2620 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
2614 _("Unable to import certificate from `%s'\n"), 2621 _("Unable to import certificate from `%s'\n"),
2615 certfile); 2622 certfile);
2616 } 2623 }
2617 GNUNET_free_non_null (cert_data.data); 2624 GNUNET_free_non_null (cert_data.data);
2618 return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK; 2625 return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
@@ -2643,26 +2650,26 @@ generate_gns_certificate (const char *name)
2643 GNUNET_break (GNUTLS_E_SUCCESS == gnutls_x509_crt_set_key (request, proxy_ca.key)); 2650 GNUNET_break (GNUTLS_E_SUCCESS == gnutls_x509_crt_set_key (request, proxy_ca.key));
2644 pgc = GNUNET_new (struct ProxyGNSCertificate); 2651 pgc = GNUNET_new (struct ProxyGNSCertificate);
2645 gnutls_x509_crt_set_dn_by_oid (request, 2652 gnutls_x509_crt_set_dn_by_oid (request,
2646 GNUTLS_OID_X520_COUNTRY_NAME, 2653 GNUTLS_OID_X520_COUNTRY_NAME,
2647 0, 2654 0,
2648 "ZZ", 2655 "ZZ",
2649 strlen ("ZZ")); 2656 strlen ("ZZ"));
2650 gnutls_x509_crt_set_dn_by_oid (request, 2657 gnutls_x509_crt_set_dn_by_oid (request,
2651 GNUTLS_OID_X520_ORGANIZATION_NAME, 2658 GNUTLS_OID_X520_ORGANIZATION_NAME,
2652 0, 2659 0,
2653 "GNU Name System", 2660 "GNU Name System",
2654 strlen ("GNU Name System")); 2661 strlen ("GNU Name System"));
2655 gnutls_x509_crt_set_dn_by_oid (request, 2662 gnutls_x509_crt_set_dn_by_oid (request,
2656 GNUTLS_OID_X520_COMMON_NAME, 2663 GNUTLS_OID_X520_COMMON_NAME,
2657 0, 2664 0,
2658 name, 2665 name,
2659 strlen (name)); 2666 strlen (name));
2660 GNUNET_break (GNUTLS_E_SUCCESS == 2667 GNUNET_break (GNUTLS_E_SUCCESS ==
2661 gnutls_x509_crt_set_version (request, 2668 gnutls_x509_crt_set_version (request,
2662 3)); 2669 3));
2663 gnutls_rnd (GNUTLS_RND_NONCE, 2670 gnutls_rnd (GNUTLS_RND_NONCE,
2664 &serial, 2671 &serial,
2665 sizeof (serial)); 2672 sizeof (serial));
2666 gnutls_x509_crt_set_serial (request, 2673 gnutls_x509_crt_set_serial (request,
2667 &serial, 2674 &serial,
2668 sizeof (serial)); 2675 sizeof (serial));
@@ -2677,20 +2684,20 @@ generate_gns_certificate (const char *name)
2677 gnutls_x509_crt_set_expiration_time (request, 2684 gnutls_x509_crt_set_expiration_time (request,
2678 etime); 2685 etime);
2679 gnutls_x509_crt_sign2 (request, 2686 gnutls_x509_crt_sign2 (request,
2680 proxy_ca.cert, 2687 proxy_ca.cert,
2681 proxy_ca.key, 2688 proxy_ca.key,
2682 GNUTLS_DIG_SHA512, 2689 GNUTLS_DIG_SHA512,
2683 0); 2690 0);
2684 key_buf_size = sizeof (pgc->key); 2691 key_buf_size = sizeof (pgc->key);
2685 cert_buf_size = sizeof (pgc->cert); 2692 cert_buf_size = sizeof (pgc->cert);
2686 gnutls_x509_crt_export (request, 2693 gnutls_x509_crt_export (request,
2687 GNUTLS_X509_FMT_PEM, 2694 GNUTLS_X509_FMT_PEM,
2688 pgc->cert, 2695 pgc->cert,
2689 &cert_buf_size); 2696 &cert_buf_size);
2690 gnutls_x509_privkey_export (proxy_ca.key, 2697 gnutls_x509_privkey_export (proxy_ca.key,
2691 GNUTLS_X509_FMT_PEM, 2698 GNUTLS_X509_FMT_PEM,
2692 pgc->key, 2699 pgc->key,
2693 &key_buf_size); 2700 &key_buf_size);
2694 gnutls_x509_crt_deinit (request); 2701 gnutls_x509_crt_deinit (request);
2695 return pgc; 2702 return pgc;
2696} 2703}
@@ -3134,7 +3141,7 @@ do_s5r_read (void *cls)
3134 tc = GNUNET_SCHEDULER_get_task_context (); 3141 tc = GNUNET_SCHEDULER_get_task_context ();
3135 if ( (NULL != tc->read_ready) && 3142 if ( (NULL != tc->read_ready) &&
3136 (GNUNET_NETWORK_fdset_isset (tc->read_ready, 3143 (GNUNET_NETWORK_fdset_isset (tc->read_ready,
3137 s5r->sock)) ) 3144 s5r->sock)) )
3138 { 3145 {
3139 rlen = GNUNET_NETWORK_socket_recv (s5r->sock, 3146 rlen = GNUNET_NETWORK_socket_recv (s5r->sock,
3140 &s5r->rbuf[s5r->rbuf_len], 3147 &s5r->rbuf[s5r->rbuf_len],
@@ -3261,7 +3268,7 @@ do_s5r_read (void *cls)
3261 *dom_len); 3268 *dom_len);
3262 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3269 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3263 "Requested connection is to http%s://%s:%d\n", 3270 "Requested connection is to http%s://%s:%d\n",
3264 (HTTPS_PORT == s5r->port) ? "s" : "", 3271 (HTTPS_PORT == s5r->port) ? "s" : "",
3265 s5r->domain, 3272 s5r->domain,
3266 ntohs (*port)); 3273 ntohs (*port));
3267 s5r->state = SOCKS5_RESOLVING; 3274 s5r->state = SOCKS5_RESOLVING;
@@ -3333,21 +3340,21 @@ do_accept (void *cls)
3333 ltask4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, 3340 ltask4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
3334 lsock, 3341 lsock,
3335 &do_accept, 3342 &do_accept,
3336 lsock); 3343 lsock);
3337 else if (lsock == lsock6) 3344 else if (lsock == lsock6)
3338 ltask6 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, 3345 ltask6 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
3339 lsock, 3346 lsock,
3340 &do_accept, 3347 &do_accept,
3341 lsock); 3348 lsock);
3342 else 3349 else
3343 GNUNET_assert (0); 3350 GNUNET_assert (0);
3344 s = GNUNET_NETWORK_socket_accept (lsock, 3351 s = GNUNET_NETWORK_socket_accept (lsock,
3345 NULL, 3352 NULL,
3346 NULL); 3353 NULL);
3347 if (NULL == s) 3354 if (NULL == s)
3348 { 3355 {
3349 GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, 3356 GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
3350 "accept"); 3357 "accept");
3351 return; 3358 return;
3352 } 3359 }
3353 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3360 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3361,7 +3368,7 @@ do_accept (void *cls)
3361 s5r->rtask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, 3368 s5r->rtask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
3362 s5r->sock, 3369 s5r->sock,
3363 &do_s5r_read, 3370 &do_s5r_read,
3364 s5r); 3371 s5r);
3365} 3372}
3366 3373
3367 3374
@@ -3459,7 +3466,7 @@ bind_v4 ()
3459 return NULL; 3466 return NULL;
3460 if (GNUNET_OK != 3467 if (GNUNET_OK !=
3461 GNUNET_NETWORK_socket_bind (ls, 3468 GNUNET_NETWORK_socket_bind (ls,
3462 (const struct sockaddr *) &sa4, 3469 (const struct sockaddr *) &sa4,
3463 sizeof (sa4))) 3470 sizeof (sa4)))
3464 { 3471 {
3465 eno = errno; 3472 eno = errno;
@@ -3496,7 +3503,7 @@ bind_v6 ()
3496 return NULL; 3503 return NULL;
3497 if (GNUNET_OK != 3504 if (GNUNET_OK !=
3498 GNUNET_NETWORK_socket_bind (ls, 3505 GNUNET_NETWORK_socket_bind (ls,
3499 (const struct sockaddr *) &sa6, 3506 (const struct sockaddr *) &sa6,
3500 sizeof (sa6))) 3507 sizeof (sa6)))
3501 { 3508 {
3502 eno = errno; 3509 eno = errno;
@@ -3551,8 +3558,8 @@ run (void *cls,
3551 cafile = cafile_cfg; 3558 cafile = cafile_cfg;
3552 } 3559 }
3553 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3560 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3554 "Using `%s' as CA\n", 3561 "Using `%s' as CA\n",
3555 cafile); 3562 cafile);
3556 3563
3557 gnutls_global_init (); 3564 gnutls_global_init ();
3558 gnutls_x509_crt_init (&proxy_ca.cert); 3565 gnutls_x509_crt_init (&proxy_ca.cert);
@@ -3692,19 +3699,19 @@ main (int argc,
3692{ 3699{
3693 struct GNUNET_GETOPT_CommandLineOption options[] = { 3700 struct GNUNET_GETOPT_CommandLineOption options[] = {
3694 GNUNET_GETOPT_option_uint16 ('p', 3701 GNUNET_GETOPT_option_uint16 ('p',
3695 "port", 3702 "port",
3696 NULL, 3703 NULL,
3697 gettext_noop ("listen on specified port (default: 7777)"), 3704 gettext_noop ("listen on specified port (default: 7777)"),
3698 &port), 3705 &port),
3699 GNUNET_GETOPT_option_string ('a', 3706 GNUNET_GETOPT_option_string ('a',
3700 "authority", 3707 "authority",
3701 NULL, 3708 NULL,
3702 gettext_noop ("pem file to use as CA"), 3709 gettext_noop ("pem file to use as CA"),
3703 &cafile_opt), 3710 &cafile_opt),
3704 GNUNET_GETOPT_option_flag ('6', 3711 GNUNET_GETOPT_option_flag ('6',
3705 "disable-ivp6", 3712 "disable-ivp6",
3706 gettext_noop ("disable use of IPv6"), 3713 gettext_noop ("disable use of IPv6"),
3707 &disable_v6), 3714 &disable_v6),
3708 3715
3709 GNUNET_GETOPT_OPTION_END 3716 GNUNET_GETOPT_OPTION_END
3710 }; 3717 };
@@ -3715,7 +3722,7 @@ main (int argc,
3715 3722
3716 if (GNUNET_OK != 3723 if (GNUNET_OK !=
3717 GNUNET_STRINGS_get_utf8_args (argc, argv, 3724 GNUNET_STRINGS_get_utf8_args (argc, argv,
3718 &argc, &argv)) 3725 &argc, &argv))
3719 return 2; 3726 return 2;
3720 GNUNET_log_setup ("gnunet-gns-proxy", 3727 GNUNET_log_setup ("gnunet-gns-proxy",
3721 "WARNING", 3728 "WARNING",
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index a7b842302..0d9d2b49a 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -4,14 +4,14 @@
4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/ 4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
5 5
6[dht] 6[dht]
7AUTOSTART = YES 7START_ON_DEMAND = YES
8 8
9[transport] 9[transport]
10PLUGINS = 10PLUGINS =
11 11
12[gns] 12[gns]
13# PREFIX = valgrind --leak-check=full --track-origins=yes 13# PREFIX = valgrind --leak-check=full --track-origins=yes
14AUTOSTART = YES 14START_ON_DEMAND = YES
15AUTO_IMPORT_PKEY = YES 15AUTO_IMPORT_PKEY = YES
16MAX_PARALLEL_BACKGROUND_QUERIES = 10 16MAX_PARALLEL_BACKGROUND_QUERIES = 10
17DEFAULT_LOOKUP_TIMEOUT = 15 s 17DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/gns/test_gns_nick_shorten.conf b/src/gns/test_gns_nick_shorten.conf
index 210159fc8..317477c80 100644
--- a/src/gns/test_gns_nick_shorten.conf
+++ b/src/gns/test_gns_nick_shorten.conf
@@ -4,14 +4,14 @@
4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/ 4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
5 5
6[dht] 6[dht]
7AUTOSTART = YES 7START_ON_DEMAND = YES
8 8
9[transport] 9[transport]
10PLUGINS = 10PLUGINS =
11 11
12[gns] 12[gns]
13#PREFIX = valgrind --leak-check=full --track-origins=yes 13#PREFIX = valgrind --leak-check=full --track-origins=yes
14AUTOSTART = YES 14START_ON_DEMAND = YES
15AUTO_IMPORT_PKEY = YES 15AUTO_IMPORT_PKEY = YES
16MAX_PARALLEL_BACKGROUND_QUERIES = 10 16MAX_PARALLEL_BACKGROUND_QUERIES = 10
17DEFAULT_LOOKUP_TIMEOUT = 15 s 17DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index 875c0a5e3..51edd5a0c 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -13,7 +13,7 @@ WEAKRANDOM = YES
13HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat 13HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
14 14
15[gns] 15[gns]
16AUTOSTART = YES 16START_ON_DEMAND = YES
17ZONEKEY = $GNUNET_TEST_HOME/.zonekey 17ZONEKEY = $GNUNET_TEST_HOME/.zonekey
18HIJACK_DNS = YES 18HIJACK_DNS = YES
19 19
@@ -22,7 +22,7 @@ PROXY_CACERT = proxy/test_cert.pem
22PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock 22PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
23 23
24[namestore] 24[namestore]
25AUTOSTART = YES 25START_ON_DEMAND = YES
26 26
27[dns] 27[dns]
28PROVIDE_EXIT = NO 28PROVIDE_EXIT = NO
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index 5bf6f8e63..374731377 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -1,13 +1,13 @@
1@INLINE@ test_gns_defaults.conf 1@INLINE@ test_gns_defaults.conf
2[fs] 2[fs]
3AUTOSTART = NO 3START_ON_DEMAND = NO
4 4
5[resolver] 5[resolver]
6AUTOSTART = YES 6START_ON_DEMAND = YES
7HOSTNAME = localhost 7HOSTNAME = localhost
8 8
9[dht] 9[dht]
10AUTOSTART = YES 10START_ON_DEMAND = YES
11ACCEPT_FROM6 = ::1; 11ACCEPT_FROM6 = ::1;
12ACCEPT_FROM = 127.0.0.1; 12ACCEPT_FROM = 127.0.0.1;
13HOSTNAME = localhost 13HOSTNAME = localhost
@@ -54,12 +54,12 @@ EXTERNAL_ADDRESS = 127.0.0.1
54USE_LOCALADDR = NO 54USE_LOCALADDR = NO
55 55
56[dns] 56[dns]
57AUTOSTART = YES 57START_ON_DEMAND = YES
58DNS_EXIT = 8.8.8.8 58DNS_EXIT = 8.8.8.8
59 59
60[gns] 60[gns]
61#PREFIX = valgrind --leak-check=full --track-origins=yes 61#PREFIX = valgrind --leak-check=full --track-origins=yes
62AUTOSTART = YES 62START_ON_DEMAND = YES
63BINARY = gnunet-service-gns 63BINARY = gnunet-service-gns
64ZONEKEY = zonefiles/test_zonekey 64ZONEKEY = zonefiles/test_zonekey
65PRIVATE_ZONE = private 65PRIVATE_ZONE = private
@@ -75,14 +75,14 @@ DEFAULT_LOOKUP_TIMEOUT = 15 s
75RECORD_PUT_INTERVAL = 1 h 75RECORD_PUT_INTERVAL = 1 h
76 76
77[nse] 77[nse]
78AUTOSTART = NO 78START_ON_DEMAND = NO
79 79
80[statistics] 80[statistics]
81AUTOSTART = NO 81START_ON_DEMAND = NO
82 82
83[namestore] 83[namestore]
84PORT = 22371 84PORT = 22371
85AUTOSTART = YES 85START_ON_DEMAND = YES
86UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore-default.sock 86UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore-default.sock
87UNIX_MATCH_UID = YES 87UNIX_MATCH_UID = YES
88UNIX_MATCH_GID = YES 88UNIX_MATCH_GID = YES
diff --git a/src/identity-provider/identity-provider.conf b/src/identity-provider/identity-provider.conf
index f2c24c32d..cc50152a1 100644
--- a/src/identity-provider/identity-provider.conf
+++ b/src/identity-provider/identity-provider.conf
@@ -1,6 +1,6 @@
1[identity-provider] 1[identity-provider]
2AUTOSTART = NO 2START_ON_DEMAND = NO
3USER_SERVICE = YES 3RUN_PER_USER = YES
4#PORT = 2108 4#PORT = 2108
5HOSTNAME = localhost 5HOSTNAME = localhost
6BINARY = gnunet-service-identity-provider 6BINARY = gnunet-service-identity-provider
diff --git a/src/identity-provider/test_idp.conf b/src/identity-provider/test_idp.conf
index 3559dd767..3e4df561a 100644
--- a/src/identity-provider/test_idp.conf
+++ b/src/identity-provider/test_idp.conf
@@ -4,22 +4,22 @@
4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-peer-1/ 4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-peer-1/
5 5
6[dht] 6[dht]
7AUTOSTART = YES 7START_ON_DEMAND = YES
8 8
9[rest] 9[rest]
10AUTOSTART = YES 10START_ON_DEMAND = YES
11PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/restlog 11PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/restlog
12 12
13[transport] 13[transport]
14PLUGINS = 14PLUGINS =
15 15
16[identity-provider] 16[identity-provider]
17AUTOSTART = YES 17START_ON_DEMAND = YES
18#PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --log-file=$GNUNET_TMP/idplog 18#PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --log-file=$GNUNET_TMP/idplog
19 19
20[gns] 20[gns]
21#PREFIX = valgrind --leak-check=full --track-origins=yes 21#PREFIX = valgrind --leak-check=full --track-origins=yes
22AUTOSTART = YES 22START_ON_DEMAND = YES
23AUTO_IMPORT_PKEY = YES 23AUTO_IMPORT_PKEY = YES
24MAX_PARALLEL_BACKGROUND_QUERIES = 10 24MAX_PARALLEL_BACKGROUND_QUERIES = 10
25DEFAULT_LOOKUP_TIMEOUT = 15 s 25DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in
index 4af3a6261..f5d454323 100644
--- a/src/identity/identity.conf.in
+++ b/src/identity/identity.conf.in
@@ -1,6 +1,6 @@
1[identity] 1[identity]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3USER_SERVICE = YES 3RUN_PER_USER = YES
4@JAVAPORT@PORT = 2108 4@JAVAPORT@PORT = 2108
5HOSTNAME = localhost 5HOSTNAME = localhost
6BINARY = gnunet-service-identity 6BINARY = gnunet-service-identity
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index 13f920937..b6fac6111 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -150,8 +150,9 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
150 * Cancel pending lookup request 150 * Cancel pending lookup request
151 * 151 *
152 * @param lr the lookup request to cancel 152 * @param lr the lookup request to cancel
153 * @return closure from the lookup result processor
153 */ 154 */
154void 155void *
155GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr); 156GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr);
156 157
157 158
@@ -198,8 +199,9 @@ GNUNET_GNS_lookup_with_tld (struct GNUNET_GNS_Handle *handle,
198 * Cancel pending lookup request 199 * Cancel pending lookup request
199 * 200 *
200 * @param ltr the lookup request to cancel 201 * @param ltr the lookup request to cancel
202 * @return closure from the lookup result processor
201 */ 203 */
202void 204void *
203GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr); 205GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr);
204 206
205 207
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index b3f1eb632..20846238b 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -499,10 +499,10 @@ GNUNET_GNSRECORD_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
499 499
500 500
501/** 501/**
502 * Convert an absolute domain name in the ".zkey" pTLD to the 502 * Convert an absolute domain name to the
503 * respective public key. 503 * respective public key.
504 * 504 *
505 * @param zkey string "X.zkey" where X is the public 505 * @param zkey string "X" where X is the public
506 * key in an encoding suitable for DNS labels. 506 * key in an encoding suitable for DNS labels.
507 * @param pkey set to a public key on the eliptic curve 507 * @param pkey set to a public key on the eliptic curve
508 * @return #GNUNET_SYSERR if @a zkey has the wrong syntax 508 * @return #GNUNET_SYSERR if @a zkey has the wrong syntax
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 26e816267..38a7d7fbc 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -32,13 +32,13 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
32PORT = 20022 32PORT = 20022
33 33
34[namestore] 34[namestore]
35AUTOSTART = YES 35START_ON_DEMAND = YES
36 36
37[dns] 37[dns]
38UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 38UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
39 39
40[consensus] 40[consensus]
41AUTOSTART = YES 41START_ON_DEMAND = YES
42 42
43[core] 43[core]
44UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 44UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
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 0cd6fc4f9..6c8f07632 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -33,16 +33,16 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
33PORT = 20022 33PORT = 20022
34 34
35[namestore] 35[namestore]
36AUTOSTART = YES 36START_ON_DEMAND = YES
37 37
38[dns] 38[dns]
39UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 39UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
40 40
41[consensus] 41[consensus]
42AUTOSTART = YES 42START_ON_DEMAND = YES
43 43
44[lockmanager] 44[lockmanager]
45AUTOSTART = YES 45START_ON_DEMAND = YES
46 46
47[core] 47[core]
48UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 48UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index 39020515f..8114aeabd 100644
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -5,16 +5,16 @@
5FORCESTART = YES 5FORCESTART = YES
6 6
7[datastore] 7[datastore]
8AUTOSTART = YES 8START_ON_DEMAND = YES
9 9
10[dht] 10[dht]
11AUTOSTART = YES 11START_ON_DEMAND = YES
12 12
13[nse] 13[nse]
14AUTOSTART = YES 14START_ON_DEMAND = YES
15 15
16[cadet] 16[cadet]
17AUTOSTART = YES 17START_ON_DEMAND = YES
18 18
19[hostlist] 19[hostlist]
20FORCESTART = YES 20FORCESTART = YES
diff --git a/src/multicast/multicast.conf.in b/src/multicast/multicast.conf.in
index f4a6daa1e..97a541336 100644
--- a/src/multicast/multicast.conf.in
+++ b/src/multicast/multicast.conf.in
@@ -1,5 +1,5 @@
1[multicast] 1[multicast]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3BINARY = gnunet-service-multicast 3BINARY = gnunet-service-multicast
4 4
5UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock 5UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf
index 1b50e0893..c8c7b4300 100644
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@ -10,7 +10,7 @@ GLOBAL_POSTFIX=-L ERROR
10UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock 10UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
11 11
12[vpn] 12[vpn]
13AUTOSTART = NO 13START_ON_DEMAND = NO
14 14
15[peerinfo] 15[peerinfo]
16# Do not use shipped gnunet HELLOs 16# Do not use shipped gnunet HELLOs
@@ -22,35 +22,35 @@ NO_IO = YES
22 22
23[hostlist] 23[hostlist]
24FORCESTART = NO 24FORCESTART = NO
25AUTOSTART = NO 25START_ON_DEMAND = NO
26 26
27[nat] 27[nat]
28ENABLE_UPNP = NO 28ENABLE_UPNP = NO
29 29
30[fs] 30[fs]
31FORCESTART = NO 31FORCESTART = NO
32AUTOSTART = NO 32START_ON_DEMAND = NO
33 33
34[vpn] 34[vpn]
35FORCESTART = NO 35FORCESTART = NO
36AUTOSTART = NO 36START_ON_DEMAND = NO
37 37
38[revocation] 38[revocation]
39FORCESTART = NO 39FORCESTART = NO
40AUTOSTART = NO 40START_ON_DEMAND = NO
41 41
42[gns] 42[gns]
43FORCESTART = NO 43FORCESTART = NO
44AUTOSTART = NO 44START_ON_DEMAND = NO
45 45
46[namestore] 46[namestore]
47FORCESTART = NO 47FORCESTART = NO
48AUTOSTART = NO 48START_ON_DEMAND = NO
49 49
50[namecache] 50[namecache]
51FORCESTART = NO 51FORCESTART = NO
52AUTOSTART = NO 52START_ON_DEMAND = NO
53 53
54[topology] 54[topology]
55FORCESTART = NO 55FORCESTART = NO
56AUTOSTART = NO 56START_ON_DEMAND = NO
diff --git a/src/multicast/test_multicast_line.conf b/src/multicast/test_multicast_line.conf
index 1047205cb..3535d8399 100644
--- a/src/multicast/test_multicast_line.conf
+++ b/src/multicast/test_multicast_line.conf
@@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock 11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
12 12
13[vpn] 13[vpn]
14AUTOSTART = NO 14START_ON_DEMAND = NO
15 15
16[peerinfo] 16[peerinfo]
17# Do not use shipped gnunet HELLOs 17# Do not use shipped gnunet HELLOs
@@ -26,38 +26,38 @@ ID_ANNOUNCE_TIME = 5 s
26 26
27[hostlist] 27[hostlist]
28FORCESTART = NO 28FORCESTART = NO
29AUTOSTART = NO 29START_ON_DEMAND = NO
30 30
31[nat] 31[nat]
32ENABLE_UPNP = NO 32ENABLE_UPNP = NO
33 33
34[fs] 34[fs]
35FORCESTART = NO 35FORCESTART = NO
36AUTOSTART = NO 36START_ON_DEMAND = NO
37 37
38[vpn] 38[vpn]
39FORCESTART = NO 39FORCESTART = NO
40AUTOSTART = NO 40START_ON_DEMAND = NO
41 41
42[revocation] 42[revocation]
43FORCESTART = NO 43FORCESTART = NO
44AUTOSTART = NO 44START_ON_DEMAND = NO
45 45
46[gns] 46[gns]
47FORCESTART = NO 47FORCESTART = NO
48AUTOSTART = NO 48START_ON_DEMAND = NO
49 49
50[namestore] 50[namestore]
51FORCESTART = NO 51FORCESTART = NO
52AUTOSTART = NO 52START_ON_DEMAND = NO
53 53
54[namecache] 54[namecache]
55FORCESTART = NO 55FORCESTART = NO
56AUTOSTART = NO 56START_ON_DEMAND = NO
57 57
58[topology] 58[topology]
59FORCESTART = NO 59FORCESTART = NO
60AUTOSTART = NO 60START_ON_DEMAND = NO
61 61
62[nse] 62[nse]
63WORKBITS = 0 63WORKBITS = 0
diff --git a/src/multicast/test_multicast_star.conf b/src/multicast/test_multicast_star.conf
index ed690d95d..f80e36679 100644
--- a/src/multicast/test_multicast_star.conf
+++ b/src/multicast/test_multicast_star.conf
@@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR
11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock 11UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
12 12
13[vpn] 13[vpn]
14AUTOSTART = NO 14START_ON_DEMAND = NO
15 15
16[peerinfo] 16[peerinfo]
17# Do not use shipped gnunet HELLOs 17# Do not use shipped gnunet HELLOs
@@ -26,38 +26,38 @@ ID_ANNOUNCE_TIME = 5 s
26 26
27[hostlist] 27[hostlist]
28FORCESTART = NO 28FORCESTART = NO
29AUTOSTART = NO 29START_ON_DEMAND = NO
30 30
31[nat] 31[nat]
32ENABLE_UPNP = NO 32ENABLE_UPNP = NO
33 33
34[fs] 34[fs]
35FORCESTART = NO 35FORCESTART = NO
36AUTOSTART = NO 36START_ON_DEMAND = NO
37 37
38[vpn] 38[vpn]
39FORCESTART = NO 39FORCESTART = NO
40AUTOSTART = NO 40START_ON_DEMAND = NO
41 41
42[revocation] 42[revocation]
43FORCESTART = NO 43FORCESTART = NO
44AUTOSTART = NO 44START_ON_DEMAND = NO
45 45
46[gns] 46[gns]
47FORCESTART = NO 47FORCESTART = NO
48AUTOSTART = NO 48START_ON_DEMAND = NO
49 49
50[namestore] 50[namestore]
51FORCESTART = NO 51FORCESTART = NO
52AUTOSTART = NO 52START_ON_DEMAND = NO
53 53
54[namecache] 54[namecache]
55FORCESTART = NO 55FORCESTART = NO
56AUTOSTART = NO 56START_ON_DEMAND = NO
57 57
58[topology] 58[topology]
59FORCESTART = NO 59FORCESTART = NO
60AUTOSTART = NO 60START_ON_DEMAND = NO
61 61
62[nse] 62[nse]
63WORKBITS = 0 63WORKBITS = 0
diff --git a/src/namecache/namecache.conf.in b/src/namecache/namecache.conf.in
index becd34187..cf1340846 100644
--- a/src/namecache/namecache.conf.in
+++ b/src/namecache/namecache.conf.in
@@ -1,6 +1,6 @@
1[namecache] 1[namecache]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3USER_SERVICE = NO 3RUN_PER_USER = NO
4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock 4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock
5UNIX_MATCH_UID = NO 5UNIX_MATCH_UID = NO
6UNIX_MATCH_GID = YES 6UNIX_MATCH_GID = YES
diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in
index 8b5e440b8..eb95f95be 100644
--- a/src/namestore/namestore.conf.in
+++ b/src/namestore/namestore.conf.in
@@ -1,6 +1,6 @@
1[namestore] 1[namestore]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3USER_SERVICE = YES 3RUN_PER_USER = YES
4UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock 4UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock
5UNIX_MATCH_UID = NO 5UNIX_MATCH_UID = NO
6UNIX_MATCH_GID = YES 6UNIX_MATCH_GID = YES
@@ -42,7 +42,7 @@ gns = gnunet-namestore
42[fcfsd] 42[fcfsd]
43# Name of the fcfs registration service binary (for ARM) 43# Name of the fcfs registration service binary (for ARM)
44BINARY = gnunet-namestore-fcfsd 44BINARY = gnunet-namestore-fcfsd
45AUTOSTART = NO 45START_ON_DEMAND = NO
46UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-fcfsd.sock 46UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-fcfsd.sock
47 47
48# On what port does the FCFS daemon listen for HTTP clients? 48# On what port does the FCFS daemon listen for HTTP clients?
diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index 5e96eab7c..3e75c2ded 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -6,14 +6,14 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namestore/
6 6
7[namestore] 7[namestore]
8DATABASE = sqlite 8DATABASE = sqlite
9AUTOSTART = YES 9START_ON_DEMAND = YES
10 10
11[namecache] 11[namecache]
12DATABASE = sqlite 12DATABASE = sqlite
13AUTOSTART = YES 13START_ON_DEMAND = YES
14 14
15[identity] 15[identity]
16AUTOSTART = YES 16START_ON_DEMAND = YES
17 17
18[nse] 18[nse]
19WORKBITS = 0 19WORKBITS = 0
diff --git a/src/nat-auto/nat-auto.conf.in b/src/nat-auto/nat-auto.conf.in
index 9461ffcc8..d5f5c4eef 100644
--- a/src/nat-auto/nat-auto.conf.in
+++ b/src/nat-auto/nat-auto.conf.in
@@ -1,5 +1,5 @@
1[nat-auto] 1[nat-auto]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@UNIXONLY@ PORT = 2124 3@UNIXONLY@ PORT = 2124
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-nat-auto 5BINARY = gnunet-service-nat-auto
diff --git a/src/nat/nat.conf.in b/src/nat/nat.conf.in
index 87fe29d9c..a8dbee953 100644
--- a/src/nat/nat.conf.in
+++ b/src/nat/nat.conf.in
@@ -1,5 +1,5 @@
1[nat] 1[nat]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@UNIXONLY@ PORT = 2121 3@UNIXONLY@ PORT = 2121
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-nat 5BINARY = gnunet-service-nat
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index c0174bf53..84de6159e 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -42,6 +42,6 @@ DISABLEV6 = YES
42 42
43 43
44[nse] 44[nse]
45AUTOSTART = NO 45START_ON_DEMAND = NO
46 46
47 47
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index e8d7bd2ea..7b234451c 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -1,5 +1,5 @@
1[nse] 1[nse]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3FORCESTART = YES 3FORCESTART = YES
4@JAVAPORT@PORT = 2097 4@JAVAPORT@PORT = 2097
5HOSTNAME = localhost 5HOSTNAME = localhost
diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf
index 9904ca711..816427bac 100644
--- a/src/nse/nse_infiniband.conf
+++ b/src/nse/nse_infiniband.conf
@@ -2,7 +2,7 @@
2GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/ 2GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/
3 3
4[testbed] 4[testbed]
5AUTOSTART = NO 5START_ON_DEMAND = NO
6ORT = 12113 6ORT = 12113
7ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16; 7ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16;
8HOSTNAME = localhost 8HOSTNAME = localhost
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index ad5da536b..4f55fe4a1 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -2,7 +2,7 @@
2GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/ 2GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/
3 3
4[testbed] 4[testbed]
5AUTOSTART = NO 5START_ON_DEMAND = NO
6PORT = 12113 6PORT = 12113
7ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 7ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16;
8HOSTNAME = localhost 8HOSTNAME = localhost
@@ -13,7 +13,7 @@ OPERATION_TIMEOUT = 45 s
13 13
14[nse] 14[nse]
15FORCESTART = YES 15FORCESTART = YES
16AUTOSTART = NO 16START_ON_DEMAND = NO
17# Overriding network settings for faster testing (do NOT use 17# Overriding network settings for faster testing (do NOT use
18# these values in production just because they are here) 18# these values in production just because they are here)
19WORKDELAY = 60 s 19WORKDELAY = 60 s
diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in
index 8615a8866..14a41655b 100644
--- a/src/peerinfo/peerinfo.conf.in
+++ b/src/peerinfo/peerinfo.conf.in
@@ -1,5 +1,5 @@
1[peerinfo] 1[peerinfo]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@JAVAPORT@PORT = 2090 3@JAVAPORT@PORT = 2090
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-peerinfo 5BINARY = gnunet-service-peerinfo
diff --git a/src/peerinfo/test_peerinfo_api_data.conf b/src/peerinfo/test_peerinfo_api_data.conf
index 1522d4dfe..e632c341f 100644
--- a/src/peerinfo/test_peerinfo_api_data.conf
+++ b/src/peerinfo/test_peerinfo_api_data.conf
@@ -5,11 +5,11 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerinfo/
5PORT = 22354 5PORT = 22354
6 6
7[dns] 7[dns]
8AUTOSTART = NO 8START_ON_DEMAND = NO
9 9
10 10
11 11
12[nse] 12[nse]
13AUTOSTART = NO 13START_ON_DEMAND = NO
14 14
15 15
diff --git a/src/peerstore/peerstore.conf.in b/src/peerstore/peerstore.conf.in
index a39b61887..a3a7c672b 100644
--- a/src/peerstore/peerstore.conf.in
+++ b/src/peerstore/peerstore.conf.in
@@ -1,5 +1,5 @@
1[peerstore] 1[peerstore]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@JAVAPORT@PORT = 2110 3@JAVAPORT@PORT = 2110
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-peerstore 5BINARY = gnunet-service-peerstore
diff --git a/src/peerstore/test_peerstore_api_data.conf b/src/peerstore/test_peerstore_api_data.conf
index 802418fa0..3ebda50eb 100644
--- a/src/peerstore/test_peerstore_api_data.conf
+++ b/src/peerstore/test_peerstore_api_data.conf
@@ -2,7 +2,7 @@
2GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerstore 2GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerstore
3 3
4[peerstore] 4[peerstore]
5AUTOSTART = YES 5START_ON_DEMAND = YES
6BINARY = gnunet-service-peerstore 6BINARY = gnunet-service-peerstore
7UNIXPATH = $GNUNET_TMP/gnunet-service-peerstore.sock 7UNIXPATH = $GNUNET_TMP/gnunet-service-peerstore.sock
8HOME = $SERVICEHOME 8HOME = $SERVICEHOME
diff --git a/src/psyc/psyc.conf.in b/src/psyc/psyc.conf.in
index 4a4a96954..764ccfa84 100644
--- a/src/psyc/psyc.conf.in
+++ b/src/psyc/psyc.conf.in
@@ -1,5 +1,5 @@
1[psyc] 1[psyc]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3BINARY = gnunet-service-psyc 3BINARY = gnunet-service-psyc
4 4
5UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psyc.sock 5UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psyc.sock
diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf
index 4e2563a8a..8b2ab9639 100644
--- a/src/psyc/test_psyc.conf
+++ b/src/psyc/test_psyc.conf
@@ -17,12 +17,12 @@ ENABLE_UPNP = NO
17 17
18[psyc] 18[psyc]
19FORCESTART = YES 19FORCESTART = YES
20AUTOSTART = YES 20START_ON_DEMAND = YES
21 21
22[multicast] 22[multicast]
23FORCESTART = YES 23FORCESTART = YES
24AUTOSTART = YES 24START_ON_DEMAND = YES
25 25
26[psycstore] 26[psycstore]
27FORCESTART = YES 27FORCESTART = YES
28AUTOSTART = YES 28START_ON_DEMAND = YES
diff --git a/src/psycstore/psycstore.conf.in b/src/psycstore/psycstore.conf.in
index 82e9e67c2..3905db173 100644
--- a/src/psycstore/psycstore.conf.in
+++ b/src/psycstore/psycstore.conf.in
@@ -1,5 +1,5 @@
1[psycstore] 1[psycstore]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3BINARY = gnunet-service-psycstore 3BINARY = gnunet-service-psycstore
4 4
5UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psycstore.sock 5UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psycstore.sock
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index c603b7422..4fd4d8b8a 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -7,8 +7,8 @@ PLUGINS = tcp
7[arm] 7[arm]
8PORT = 0 8PORT = 0
9ALLOW_SHUTDOWN = YES 9ALLOW_SHUTDOWN = YES
10SYSTEM_ONLY = NO 10START_SYSTEM_SERVICES = NO
11USER_ONLY = NO 11START_USER_SERVICES = NO
12 12
13[exit] 13[exit]
14FORCESTART = YES 14FORCESTART = YES
@@ -28,15 +28,15 @@ DNS_EXIT = 8.8.8.8
28FORCESTART = YES 28FORCESTART = YES
29 29
30[identity] 30[identity]
31AUTOSTART = YES 31START_ON_DEMAND = YES
32FORCESTART = YES 32FORCESTART = YES
33 33
34[hostlist] 34[hostlist]
35AUTOSTART = NO 35START_ON_DEMAND = NO
36FORCESTART = NO 36FORCESTART = NO
37 37
38[zonemaster] 38[zonemaster]
39AUTOSTART = YES 39START_ON_DEMAND = YES
40FORCESTART = YES 40FORCESTART = YES
41 41
42#[vpn] 42#[vpn]
@@ -61,7 +61,7 @@ TCP_REDIRECTS = 80:localhost4:8080
61TTL = 3600000 61TTL = 3600000
62 62
63[gns] 63[gns]
64AUTOSTART = YES 64START_ON_DEMAND = YES
65ZONEKEY = $GNUNET_TEST_HOME/.zonekey 65ZONEKEY = $GNUNET_TEST_HOME/.zonekey
66 66
67# Delays starting of GNS, as we need to first 67# Delays starting of GNS, as we need to first
@@ -69,7 +69,7 @@ ZONEKEY = $GNUNET_TEST_HOME/.zonekey
69FORCESTART = NO 69FORCESTART = NO
70 70
71[namestore] 71[namestore]
72AUTOSTART = YES 72START_ON_DEMAND = YES
73 73
74[nat] 74[nat]
75USE_LOCALADDR = YES 75USE_LOCALADDR = YES
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index c22cd3409..dfe553784 100644
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -21,7 +21,7 @@ IPV4MASK = 255.255.255.0
21EXIT_IFNAME = eth1 21EXIT_IFNAME = eth1
22 22
23[hostlist] 23[hostlist]
24AUTOSTART = NO 24START_ON_DEMAND = NO
25FORCESTART = NO 25FORCESTART = NO
26 26
27[nse] 27[nse]
@@ -38,11 +38,11 @@ IPV4MASK = 255.255.255.0
38 38
39 39
40[gns] 40[gns]
41AUTOSTART = NO 41START_ON_DEMAND = NO
42 42
43[nat] 43[nat]
44USE_LOCALADDR = YES 44USE_LOCALADDR = YES
45RETURN_LOCAL_ADDRESSES = YES 45RETURN_LOCAL_ADDRESSES = YES
46 46
47[consensus] 47[consensus]
48AUTOSTART = NO 48START_ON_DEMAND = NO
diff --git a/src/regex/regex.conf.in b/src/regex/regex.conf.in
index 8a75881f9..5e68a43da 100644
--- a/src/regex/regex.conf.in
+++ b/src/regex/regex.conf.in
@@ -1,5 +1,5 @@
1[regex] 1[regex]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@UNIXONLY@ PORT = 2107 3@UNIXONLY@ PORT = 2107
4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock 4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock
5HOSTNAME = localhost 5HOSTNAME = localhost
diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf
index 60dcdc0b6..40fee1e54 100644
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -19,11 +19,11 @@ WAN_QUOTA_IN = 1 GB
19WAN_QUOTA_OUT = 1 GB 19WAN_QUOTA_OUT = 1 GB
20 20
21[dht] 21[dht]
22AUTOSTART = YES 22START_ON_DEMAND = YES
23PORT = 12370 23PORT = 12370
24 24
25[regex] 25[regex]
26AUTOSTART = YES 26START_ON_DEMAND = YES
27 27
28[transport] 28[transport]
29plugins = tcp 29plugins = tcp
diff --git a/src/revocation/revocation.conf.in b/src/revocation/revocation.conf.in
index 333f2e488..fe2318286 100644
--- a/src/revocation/revocation.conf.in
+++ b/src/revocation/revocation.conf.in
@@ -1,5 +1,5 @@
1[revocation] 1[revocation]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3FORCESTART = YES 3FORCESTART = YES
4@JAVAPORT@PORT = 2112 4@JAVAPORT@PORT = 2112
5HOSTNAME = localhost 5HOSTNAME = localhost
diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in
index 733b72601..7f0a419bd 100644
--- a/src/rps/rps.conf.in
+++ b/src/rps/rps.conf.in
@@ -1,5 +1,5 @@
1[rps] 1[rps]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3BINARY = gnunet-service-rps 3BINARY = gnunet-service-rps
4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-rps.sock 4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-rps.sock
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index e4ed111e2..3d856c693 100644
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -6,7 +6,7 @@ HOME = $SERVICEHOME
6# PORT = 2106 6# PORT = 2106
7#@UNIXONLY@ PORT = 2087 7#@UNIXONLY@ PORT = 2087
8FORCESTART = YES 8FORCESTART = YES
9AUTOSTART = NO 9START_ON_DEMAND = NO
10NOARMBIND = YES 10NOARMBIND = YES
11#OPTIONS=-l /tmp/rps_profiler_logs/rps-[]-%Y-%m-%d.log 11#OPTIONS=-l /tmp/rps_profiler_logs/rps-[]-%Y-%m-%d.log
12 12
@@ -81,43 +81,43 @@ DISABLE_TRY_CONNECT = YES
81 81
82#[statistics] 82#[statistics]
83#FORCESTART = NO 83#FORCESTART = NO
84#AUTOSTART = NO 84#START_ON_DEMAND = NO
85 85
86[peerinfo] 86[peerinfo]
87NO_IO = YES 87NO_IO = YES
88 88
89[hostlist] 89[hostlist]
90FORCESTART = NO 90FORCESTART = NO
91AUTOSTART = NO 91START_ON_DEMAND = NO
92 92
93[zonemaster] 93[zonemaster]
94FORCESTART = NO 94FORCESTART = NO
95AUTOSTART = NO 95START_ON_DEMAND = NO
96 96
97[namecache] 97[namecache]
98FORCESTART = NO 98FORCESTART = NO
99AUTOSTART = NO 99START_ON_DEMAND = NO
100 100
101[namestore] 101[namestore]
102FORCESTART = NO 102FORCESTART = NO
103AUTOSTART = NO 103START_ON_DEMAND = NO
104 104
105[topology] 105[topology]
106FORCESTART = NO 106FORCESTART = NO
107AUTOSTART = NO 107START_ON_DEMAND = NO
108 108
109[vpn] 109[vpn]
110FORCESTART = NO 110FORCESTART = NO
111AUTOSTART = NO 111START_ON_DEMAND = NO
112 112
113[revocation] 113[revocation]
114FORCESTART = NO 114FORCESTART = NO
115AUTOSTART = NO 115START_ON_DEMAND = NO
116 116
117[gns] 117[gns]
118FORCESTART = NO 118FORCESTART = NO
119AUTOSTART = NO 119START_ON_DEMAND = NO
120 120
121[fs] 121[fs]
122FORCESTART = NO 122FORCESTART = NO
123AUTOSTART = NO 123START_ON_DEMAND = NO
diff --git a/src/scalarproduct/scalarproduct.conf.in b/src/scalarproduct/scalarproduct.conf.in
index e2a0c7ad7..e2286b076 100644
--- a/src/scalarproduct/scalarproduct.conf.in
+++ b/src/scalarproduct/scalarproduct.conf.in
@@ -1,5 +1,5 @@
1[scalarproduct-alice] 1[scalarproduct-alice]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3BINARY = gnunet-service-scalarproduct-ecc-alice 3BINARY = gnunet-service-scalarproduct-ecc-alice
4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-alice.sock 4UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-alice.sock
5@UNIXONLY@ PORT = 2117 5@UNIXONLY@ PORT = 2117
@@ -12,7 +12,7 @@ UNIX_MATCH_GID = YES
12 12
13 13
14[scalarproduct-bob] 14[scalarproduct-bob]
15AUTOSTART = @AUTOSTART@ 15START_ON_DEMAND = @START_ON_DEMAND@
16HOSTNAME = localhost 16HOSTNAME = localhost
17BINARY = gnunet-service-scalarproduct-ecc-bob 17BINARY = gnunet-service-scalarproduct-ecc-bob
18UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-bob.sock 18UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-bob.sock
diff --git a/src/secretsharing/secretsharing.conf.in b/src/secretsharing/secretsharing.conf.in
index 0834235d4..bd8da6177 100644
--- a/src/secretsharing/secretsharing.conf.in
+++ b/src/secretsharing/secretsharing.conf.in
@@ -1,5 +1,5 @@
1[secretsharing] 1[secretsharing]
2AUTOSTART = NO 2START_ON_DEMAND = NO
3@JAVAPORT@PORT = 2114 3@JAVAPORT@PORT = 2114
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-secretsharing 5BINARY = gnunet-service-secretsharing
diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf
index 9980666cd..3391c88db 100644
--- a/src/secretsharing/test_secretsharing.conf
+++ b/src/secretsharing/test_secretsharing.conf
@@ -1,10 +1,10 @@
1[secretsharing] 1[secretsharing]
2AUTOSTART = YES 2START_ON_DEMAND = YES
3#PREFIX = valgrind --leak-check=full 3#PREFIX = valgrind --leak-check=full
4OPTIONS = -LINFO 4OPTIONS = -LINFO
5 5
6[consensus] 6[consensus]
7AUTOSTART = YES 7START_ON_DEMAND = YES
8 8
9[transport] 9[transport]
10OPTIONS = -LERROR 10OPTIONS = -LERROR
@@ -12,7 +12,7 @@ PLUGINS = unix
12 12
13[set] 13[set]
14OPTIONS = -L INFO 14OPTIONS = -L INFO
15AUTOSTART = YES 15START_ON_DEMAND = YES
16#PREFIX = valgrind --leak-check=full 16#PREFIX = valgrind --leak-check=full
17 17
18[testbed] 18[testbed]
@@ -32,5 +32,5 @@ DISABLEV6 = NO
32RETURN_LOCAL_ADDRESSES = YES 32RETURN_LOCAL_ADDRESSES = YES
33 33
34[nse] 34[nse]
35AUTOSTART = NO 35START_ON_DEMAND = NO
36 36
diff --git a/src/set/set.conf.in b/src/set/set.conf.in
index deaa07efb..66bcfa169 100644
--- a/src/set/set.conf.in
+++ b/src/set/set.conf.in
@@ -1,5 +1,5 @@
1[set] 1[set]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@UNIXONLY@PORT = 2106 3@UNIXONLY@PORT = 2106
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-set 5BINARY = gnunet-service-set
diff --git a/src/set/test_set.conf b/src/set/test_set.conf
index 02afd2ec5..21fe984f8 100644
--- a/src/set/test_set.conf
+++ b/src/set/test_set.conf
@@ -4,7 +4,7 @@
4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/ 4GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/
5 5
6[set] 6[set]
7AUTOSTART = YES 7START_ON_DEMAND = YES
8#PREFIX = valgrind --leak-check=full 8#PREFIX = valgrind --leak-check=full
9#PREFIX = gdbserver :1234 9#PREFIX = gdbserver :1234
10OPTIONS = -L INFO 10OPTIONS = -L INFO
diff --git a/src/social/social.conf.in b/src/social/social.conf.in
index 33b14e5b4..3fe754c80 100644
--- a/src/social/social.conf.in
+++ b/src/social/social.conf.in
@@ -1,7 +1,7 @@
1[social] 1[social]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3BINARY = gnunet-service-social 3BINARY = gnunet-service-social
4USER_SERVICE = YES 4RUN_PER_USER = YES
5 5
6UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-social.sock 6UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-social.sock
7UNIX_MATCH_UID = YES 7UNIX_MATCH_UID = YES
diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in
index 2d0011372..36aca538f 100644
--- a/src/statistics/statistics.conf.in
+++ b/src/statistics/statistics.conf.in
@@ -1,5 +1,5 @@
1[statistics] 1[statistics]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@JAVAPORT@PORT = 2088 3@JAVAPORT@PORT = 2088
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-statistics 5BINARY = gnunet-service-statistics
diff --git a/src/template/template.conf b/src/template/template.conf
index 8c8c179f7..e5f675a5d 100644
--- a/src/template/template.conf
+++ b/src/template/template.conf
@@ -1,5 +1,5 @@
1[template] 1[template]
2AUTOSTART = NO 2START_ON_DEMAND = NO
3PORT = 9999 3PORT = 9999
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-template 5BINARY = gnunet-service-template
diff --git a/src/testbed-logger/testbed-logger.conf.in b/src/testbed-logger/testbed-logger.conf.in
index 05ef782ae..288bbed72 100644
--- a/src/testbed-logger/testbed-logger.conf.in
+++ b/src/testbed-logger/testbed-logger.conf.in
@@ -1,5 +1,5 @@
1[testbed] 1[testbed]
2AUTOSTART = NO 2START_ON_DEMAND = NO
3@JAVAPORT@ PORT = 2101 3@JAVAPORT@ PORT = 2101
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-testbed 5BINARY = gnunet-service-testbed
@@ -90,7 +90,7 @@ SHARED_SERVICES =
90 90
91 91
92[testbed-logger] 92[testbed-logger]
93AUTOSTART = NO 93START_ON_DEMAND = NO
94@UNIXONLY@ PORT = 2102 94@UNIXONLY@ PORT = 2102
95HOSTNAME = localhost 95HOSTNAME = localhost
96BINARY = gnunet-service-testbed-logger 96BINARY = gnunet-service-testbed-logger
@@ -101,7 +101,7 @@ UNIX_MATCH_GID = YES
101 101
102 102
103[testbed-barrier] 103[testbed-barrier]
104AUTOSTART = NO 104START_ON_DEMAND = NO
105@UNIXONLY@ PORT = 2103 105@UNIXONLY@ PORT = 2103
106HOSTNAME = localhost 106HOSTNAME = localhost
107UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock 107UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock
@@ -112,7 +112,7 @@ UNIX_MATCH_GID = YES
112# This section is related to configuring underlay restrictions to simulate 112# This section is related to configuring underlay restrictions to simulate
113# connectivity restrictions of NAT boxes 113# connectivity restrictions of NAT boxes
114[testbed-underlay] 114[testbed-underlay]
115AUTOSTART = NO 115START_ON_DEMAND = NO
116NOARMBIND = YES 116NOARMBIND = YES
117BINARY = gnunet-daemon-testbed-underlay 117BINARY = gnunet-daemon-testbed-underlay
118# The sqlite3 database file containing information about what underlay 118# The sqlite3 database file containing information about what underlay
@@ -120,8 +120,8 @@ BINARY = gnunet-daemon-testbed-underlay
120# DBFILE = 120# DBFILE =
121 121
122[latency-logger] 122[latency-logger]
123AUTOSTART = NO 123START_ON_DEMAND = NO
124NOARMBIND = YES 124NOARMBIND = YES
125BINARY = gnunet-daemon-latency-logger 125BINARY = gnunet-daemon-latency-logger
126# The sqlite3 database file where the latency values are to be stored 126# The sqlite3 database file where the latency values are to be stored
127# DBFILE = \ No newline at end of file 127# DBFILE =
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 8cad6df09..846b894c7 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -1,5 +1,5 @@
1[testbed] 1[testbed]
2AUTOSTART = NO 2START_ON_DEMAND = NO
3PORT = 12113 3PORT = 12113
4ACCEPT_FROM = 127.0.0.1; 4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost 5HOSTNAME = localhost
@@ -10,25 +10,25 @@ TOPOLOGY = RANDOM
10PORT = 12366 10PORT = 12366
11 11
12[test-barriers] 12[test-barriers]
13AUTOSTART = NO 13START_ON_DEMAND = NO
14PORT = 12114 14PORT = 12114
15BINARY = /will/be/overwriten/in/test_testbed_api_barriers/ 15BINARY = /will/be/overwriten/in/test_testbed_api_barriers/
16FORCESTART = YES 16FORCESTART = YES
17 17
18[fs] 18[fs]
19AUTOSTART = NO 19START_ON_DEMAND = NO
20FORCESTART = NO 20FORCESTART = NO
21 21
22[resolver] 22[resolver]
23HOSTNAME = localhost 23HOSTNAME = localhost
24AUTOSTART = NO 24START_ON_DEMAND = NO
25 25
26[cadet] 26[cadet]
27AUTOSTART = NO 27START_ON_DEMAND = NO
28FORCESTART = NO 28FORCESTART = NO
29 29
30[dht] 30[dht]
31AUTOSTART = NO 31START_ON_DEMAND = NO
32FORCESTART = NO 32FORCESTART = NO
33 33
34[dhtcache] 34[dhtcache]
@@ -49,7 +49,7 @@ WAN_QUOTA_IN = 3932160
49 49
50[core] 50[core]
51PORT = 12092 51PORT = 12092
52AUTOSTART = YES 52START_ON_DEMAND = YES
53FORCESTART = YES 53FORCESTART = YES
54USE_EPHEMERAL_KEYS = NO 54USE_EPHEMERAL_KEYS = NO
55 55
@@ -61,15 +61,15 @@ PORT = 12368
61GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/ 61GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
62 62
63[dns] 63[dns]
64AUTOSTART = NO 64START_ON_DEMAND = NO
65FORCESTART = NO 65FORCESTART = NO
66 66
67[nse] 67[nse]
68AUTOSTART = NO 68START_ON_DEMAND = NO
69FORCESTART = NO 69FORCESTART = NO
70 70
71[vpn] 71[vpn]
72AUTOSTART = NO 72START_ON_DEMAND = NO
73FORCESTART = NO 73FORCESTART = NO
74 74
75[nat] 75[nat]
@@ -77,27 +77,27 @@ RETURN_LOCAL_ADDRESSES = YES
77FORCESTART = NO 77FORCESTART = NO
78 78
79[gns-helper-service-w32] 79[gns-helper-service-w32]
80AUTOSTART = NO 80START_ON_DEMAND = NO
81 81
82[consensus] 82[consensus]
83AUTOSTART = NO 83START_ON_DEMAND = NO
84FORCESTART = NO 84FORCESTART = NO
85 85
86[gns] 86[gns]
87AUTOSTART = NO 87START_ON_DEMAND = NO
88FORCESTART = NO 88FORCESTART = NO
89 89
90[statistics] 90[statistics]
91AUTOSTART = NO 91START_ON_DEMAND = NO
92FORCESTART = NO 92FORCESTART = NO
93 93
94[peerinfo] 94[peerinfo]
95NO_IO = YES 95NO_IO = YES
96 96
97[set] 97[set]
98AUTOSTART = NO 98START_ON_DEMAND = NO
99FORCESTART = NO 99FORCESTART = NO
100 100
101[revocation] 101[revocation]
102AUTOSTART = NO 102START_ON_DEMAND = NO
103FORCESTART = NO \ No newline at end of file 103FORCESTART = NO
diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf
index 65366835d..50d3f2c04 100644
--- a/src/testbed/test_testbed_api_statistics.conf
+++ b/src/testbed/test_testbed_api_statistics.conf
@@ -5,5 +5,5 @@ OVERLAY_TOPOLOGY = 2D_TORUS
5MAX_PARALLEL_SERVICE_CONNECTIONS = 2 5MAX_PARALLEL_SERVICE_CONNECTIONS = 2
6 6
7[statistics] 7[statistics]
8AUTOSTART = YES 8START_ON_DEMAND = YES
9PORT = 30 9PORT = 30
diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index 049829842..d893ba143 100644
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -2,7 +2,7 @@
2@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf 2@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
3 3
4[testbed] 4[testbed]
5AUTOSTART = NO 5START_ON_DEMAND = NO
6PORT = 12113 6PORT = 12113
7ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
8HOSTNAME = localhost 8HOSTNAME = localhost
@@ -22,7 +22,7 @@ FORCESTART = YES
22 22
23# Transport requires resolver when connecting to a peer, so enable it 23# Transport requires resolver when connecting to a peer, so enable it
24[resolver] 24[resolver]
25AUTOSTART = YES 25START_ON_DEMAND = YES
26 26
27[ats] 27[ats]
28WAN_QUOTA_OUT = 3932160 28WAN_QUOTA_OUT = 3932160
diff --git a/src/testbed/test_testbed_underlay.conf.in b/src/testbed/test_testbed_underlay.conf.in
index 5799b5253..b46716cde 100644
--- a/src/testbed/test_testbed_underlay.conf.in
+++ b/src/testbed/test_testbed_underlay.conf.in
@@ -5,9 +5,9 @@ OVERLAY_TOPOLOGY = LINE
5OPERATION_TIMEOUT = 5 s 5OPERATION_TIMEOUT = 5 s
6 6
7[testbed-underlay] 7[testbed-underlay]
8AUTOSTART = NO 8START_ON_DEMAND = NO
9DBFILE = /will/be/overwritten/by/testcase 9DBFILE = /will/be/overwritten/by/testcase
10FORCESTART = YES 10FORCESTART = YES
11 11
12[dv] 12[dv]
13AUTOSTART = NO 13START_ON_DEMAND = NO
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 86044fbfb..c1d64b324 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -1,5 +1,5 @@
1[testbed] 1[testbed]
2AUTOSTART = NO 2START_ON_DEMAND = NO
3@JAVAPORT@ PORT = 2101 3@JAVAPORT@ PORT = 2101
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-testbed 5BINARY = gnunet-service-testbed
@@ -90,7 +90,7 @@ SHARED_SERVICES =
90 90
91 91
92[testbed-barrier] 92[testbed-barrier]
93AUTOSTART = NO 93START_ON_DEMAND = NO
94@UNIXONLY@ PORT = 2103 94@UNIXONLY@ PORT = 2103
95HOSTNAME = localhost 95HOSTNAME = localhost
96UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock 96UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock
@@ -101,7 +101,7 @@ UNIX_MATCH_GID = YES
101# This section is related to configuring underlay restrictions to simulate 101# This section is related to configuring underlay restrictions to simulate
102# connectivity restrictions of NAT boxes 102# connectivity restrictions of NAT boxes
103[testbed-underlay] 103[testbed-underlay]
104AUTOSTART = NO 104START_ON_DEMAND = NO
105NOARMBIND = YES 105NOARMBIND = YES
106BINARY = gnunet-daemon-testbed-underlay 106BINARY = gnunet-daemon-testbed-underlay
107# The sqlite3 database file containing information about what underlay 107# The sqlite3 database file containing information about what underlay
@@ -109,8 +109,8 @@ BINARY = gnunet-daemon-testbed-underlay
109# DBFILE = 109# DBFILE =
110 110
111[latency-logger] 111[latency-logger]
112AUTOSTART = NO 112START_ON_DEMAND = NO
113NOARMBIND = YES 113NOARMBIND = YES
114BINARY = gnunet-daemon-latency-logger 114BINARY = gnunet-daemon-latency-logger
115# The sqlite3 database file where the latency values are to be stored 115# The sqlite3 database file where the latency values are to be stored
116# DBFILE = \ No newline at end of file 116# DBFILE =
diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c
index 4cab84066..350dc8eab 100644
--- a/src/transport/test_transport_api_manipulation_cfg.c
+++ b/src/transport/test_transport_api_manipulation_cfg.c
@@ -168,6 +168,7 @@ main (int argc,
168 168
169 ccc = &my_ccc; 169 ccc = &my_ccc;
170 sc.ccc = ccc; 170 sc.ccc = ccc;
171 start_request = GNUNET_TIME_absolute_get ();
171 if (GNUNET_OK != 172 if (GNUNET_OK !=
172 GNUNET_TRANSPORT_TESTING_main (2, 173 GNUNET_TRANSPORT_TESTING_main (2,
173 &GNUNET_TRANSPORT_TESTING_connect_check, 174 &GNUNET_TRANSPORT_TESTING_connect_check,
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index 1f56a2fa7..4185acc29 100644
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -1,5 +1,5 @@
1[transport] 1[transport]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@JAVAPORT@PORT = 2091 3@JAVAPORT@PORT = 2091
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-transport 5BINARY = gnunet-service-transport
diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in
index 9c5df32bc..6e2b9a869 100644
--- a/src/util/resolver.conf.in
+++ b/src/util/resolver.conf.in
@@ -1,5 +1,5 @@
1[resolver] 1[resolver]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@JAVAPORT@PORT = 2089 3@JAVAPORT@PORT = 2089
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-resolver 5BINARY = gnunet-service-resolver
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index b2e6a4986..afebabf08 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -180,6 +180,11 @@ check_config ()
180 struct sockaddr_in v4; 180 struct sockaddr_in v4;
181 struct sockaddr_in6 v6; 181 struct sockaddr_in6 v6;
182 182
183 if (GNUNET_OK ==
184 GNUNET_CONFIGURATION_have_value (resolver_cfg,
185 "resolver",
186 "UNIXPATH"))
187 return GNUNET_OK;
183 memset (&v4, 0, sizeof (v4)); 188 memset (&v4, 0, sizeof (v4));
184 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK); 189 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
185 v4.sin_family = AF_INET; 190 v4.sin_family = AF_INET;
diff --git a/src/util/util.conf b/src/util/util.conf
index f2e5bee28..dbc2b2e0d 100644
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -25,7 +25,7 @@ GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache}/gnunet/
25 25
26# Runtime data (i.e UNIX domain sockets, locks, always lost on system boot) 26# Runtime data (i.e UNIX domain sockets, locks, always lost on system boot)
27# This is the variable for system-wide services; use GNUNET_USER_RUNTIME_DIR 27# This is the variable for system-wide services; use GNUNET_USER_RUNTIME_DIR
28# for per-user services (where USER_SERVICE=YES is set) 28# for per-user services (where RUN_PER_USER=YES is set)
29# Note that the 'gnunet'/system user must have $TMPDIR/$TMP set to 29# Note that the 'gnunet'/system user must have $TMPDIR/$TMP set to
30# exactly the same values as 'normal' users, otherwise this will fail. 30# exactly the same values as 'normal' users, otherwise this will fail.
31# If $TMPDIR or $TMP are set to different directories for different 31# If $TMPDIR or $TMP are set to different directories for different
diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in
index 585131554..c0f4c59ed 100644
--- a/src/vpn/vpn.conf.in
+++ b/src/vpn/vpn.conf.in
@@ -1,5 +1,5 @@
1[vpn] 1[vpn]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3@UNIXONLY@ PORT = 2105 3@UNIXONLY@ PORT = 2105
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-vpn 5BINARY = gnunet-service-vpn
diff --git a/src/zonemaster/zonemaster.conf.in b/src/zonemaster/zonemaster.conf.in
index 6179b87be..057e43f29 100644
--- a/src/zonemaster/zonemaster.conf.in
+++ b/src/zonemaster/zonemaster.conf.in
@@ -1,5 +1,5 @@
1[zonemaster] 1[zonemaster]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3FORCESTART = YES 3FORCESTART = YES
4HOSTNAME = localhost 4HOSTNAME = localhost
5BINARY = gnunet-service-zonemaster 5BINARY = gnunet-service-zonemaster
@@ -27,7 +27,7 @@ ZONE_PUBLISH_TIME_WINDOW = 4 h
27 27
28 28
29[zonemaster-monitor] 29[zonemaster-monitor]
30AUTOSTART = @AUTOSTART@ 30START_ON_DEMAND = @START_ON_DEMAND@
31FORCESTART = YES 31FORCESTART = YES
32HOSTNAME = localhost 32HOSTNAME = localhost
33BINARY = gnunet-service-zonemaster-monitor 33BINARY = gnunet-service-zonemaster-monitor
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 06:10:05 +0000