syn

diff --git a/configure.ac b/configure.ac
index 634ef34a16be7a56616aa168e0a2732fc5d55101..b4a294b17c2072d0bea751160a5f61c023309e0e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -768,6 +768,7 @@ src/peerinfo/Makefile
 src/resolver/Makefile
 src/statistics/Makefile
 src/template/Makefile
+src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/util/Makefile

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index a7ca884d7d141b4992c9c82f00a17e13f53913fb..d3eb190fca8069bbaea4f57009021af868261f2f 100644 (file)
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -149,13 +149,17 @@ FRIENDS = $SERVICEHOME/friends
 
 
 [hostlist]
+# port for hostlist http server
+HTTPPORT = 8080
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-hostlist
 # consider having "-e" as default as well once implemented
 OPTIONS = -b
 SERVERS = http://gnunet.org:8080/
 # proxy for downloading hostlists
 HTTP-PROXY = 
-# port for hostlist server
-PORT = 8080
 
 
 [datastore]

diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 459e433148f32e8b70045b911d6d1d804db97a30..41dc21f75cf2d98f4b5755fd844d5adbd96d9c54 100644 (file)
--- 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,
  *        list; va only contains anything if hostname != NULL.
  */
 void
-GNUNET_TESTING_daemons_start_Va (struct GNUNET_SCHEDULER_Handle *sched,
+GNUNET_TESTING_daemons_start_va (struct GNUNET_SCHEDULER_Handle *sched,
                                 struct GNUNET_CONFIGURATION_Handle *cfg,
                                 unsigned int total,
                                 const char *service_home_prefix,