diff options
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | contrib/defaults.conf | 8 | ||||
-rw-r--r-- | src/include/gnunet_testing_lib.h | 2 |
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 | |||
768 | src/resolver/Makefile | 768 | src/resolver/Makefile |
769 | src/statistics/Makefile | 769 | src/statistics/Makefile |
770 | src/template/Makefile | 770 | src/template/Makefile |
771 | src/testing/Makefile | ||
771 | src/topology/Makefile | 772 | src/topology/Makefile |
772 | src/transport/Makefile | 773 | src/transport/Makefile |
773 | src/util/Makefile | 774 | src/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 | ||
153 | HTTPPORT = 8080 | ||
154 | HOSTNAME = localhost | ||
155 | HOME = $SERVICEHOME | ||
156 | CONFIG = $DEFAULTCONFIG | ||
157 | BINARY = gnunet-daemon-hostlist | ||
152 | # consider having "-e" as default as well once implemented | 158 | # consider having "-e" as default as well once implemented |
153 | OPTIONS = -b | 159 | OPTIONS = -b |
154 | SERVERS = http://gnunet.org:8080/ | 160 | SERVERS = http://gnunet.org:8080/ |
155 | # proxy for downloading hostlists | 161 | # proxy for downloading hostlists |
156 | HTTP-PROXY = | 162 | HTTP-PROXY = |
157 | # port for hostlist server | ||
158 | PORT = 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 | */ |
152 | void | 152 | void |
153 | GNUNET_TESTING_daemons_start_Va (struct GNUNET_SCHEDULER_Handle *sched, | 153 | GNUNET_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, |