aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--contrib/defaults.conf8
-rw-r--r--src/include/gnunet_testing_lib.h2
3 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 634ef34a1..b4a294b17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -768,6 +768,7 @@ src/peerinfo/Makefile
768src/resolver/Makefile 768src/resolver/Makefile
769src/statistics/Makefile 769src/statistics/Makefile
770src/template/Makefile 770src/template/Makefile
771src/testing/Makefile
771src/topology/Makefile 772src/topology/Makefile
772src/transport/Makefile 773src/transport/Makefile
773src/util/Makefile 774src/util/Makefile
diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index a7ca884d7..d3eb190fc 100644
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -149,13 +149,17 @@ FRIENDS = $SERVICEHOME/friends
149 149
150 150
151[hostlist] 151[hostlist]
152# port for hostlist http server
153HTTPPORT = 8080
154HOSTNAME = localhost
155HOME = $SERVICEHOME
156CONFIG = $DEFAULTCONFIG
157BINARY = gnunet-daemon-hostlist
152# consider having "-e" as default as well once implemented 158# consider having "-e" as default as well once implemented
153OPTIONS = -b 159OPTIONS = -b
154SERVERS = http://gnunet.org:8080/ 160SERVERS = http://gnunet.org:8080/
155# proxy for downloading hostlists 161# proxy for downloading hostlists
156HTTP-PROXY = 162HTTP-PROXY =
157# port for hostlist server
158PORT = 8080
159 163
160 164
161[datastore] 165[datastore]
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 459e43314..41dc21f75 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -150,7 +150,7 @@ void GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
150 * list; va only contains anything if hostname != NULL. 150 * list; va only contains anything if hostname != NULL.
151 */ 151 */
152void 152void
153GNUNET_TESTING_daemons_start_Va (struct GNUNET_SCHEDULER_Handle *sched, 153GNUNET_TESTING_daemons_start_va (struct GNUNET_SCHEDULER_Handle *sched,
154 struct GNUNET_CONFIGURATION_Handle *cfg, 154 struct GNUNET_CONFIGURATION_Handle *cfg,
155 unsigned int total, 155 unsigned int total,
156 const char *service_home_prefix, 156 const char *service_home_prefix,