diff options
Diffstat (limited to 'src/include/gnunet_testing_lib.h')
-rw-r--r-- | src/include/gnunet_testing_lib.h | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h index dbd8a3d3f..8de354853 100644 --- a/src/include/gnunet_testing_lib.h +++ b/src/include/gnunet_testing_lib.h | |||
@@ -85,7 +85,7 @@ typedef void (*GNUNET_TESTING_NotifyDaemonRunning)(void *cls, | |||
85 | */ | 85 | */ |
86 | struct GNUNET_TESTING_Daemon * | 86 | struct GNUNET_TESTING_Daemon * |
87 | GNUNET_TESTING_daemon_start (struct GNUNET_SCHEDULER_Handle *sched, | 87 | GNUNET_TESTING_daemon_start (struct GNUNET_SCHEDULER_Handle *sched, |
88 | struct GNUNET_CONFIGURATION_Handle *cfg, | 88 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
89 | const char *hostname, | 89 | const char *hostname, |
90 | GNUNET_TESTING_NotifyDaemonRunning cb, | 90 | GNUNET_TESTING_NotifyDaemonRunning cb, |
91 | void *cb_cls); | 91 | void *cb_cls); |
@@ -163,50 +163,17 @@ struct GNUNET_TESTING_PeerGroup; | |||
163 | * @param total number of daemons to start | 163 | * @param total number of daemons to start |
164 | * @param cb function to call on each daemon that was started | 164 | * @param cb function to call on each daemon that was started |
165 | * @param cb_cls closure for cb | 165 | * @param cb_cls closure for cb |
166 | * @param hostname where to run the peers; can be NULL (to run | 166 | * @param hostnames space-separated list of hostnames to use, |
167 | * everything on localhost). | 167 | * NULL to use localhost only |
168 | * @param va Additional hosts can be specified using a NULL-terminated list of | ||
169 | * varargs, hosts will then be used round-robin from that | ||
170 | * list; va only contains anything if hostname != NULL. | ||
171 | * @return NULL on error, otherwise handle to control peer group | ||
172 | */ | ||
173 | struct GNUNET_TESTING_PeerGroup * | ||
174 | GNUNET_TESTING_daemons_start_va (struct GNUNET_SCHEDULER_Handle *sched, | ||
175 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
176 | unsigned int total, | ||
177 | GNUNET_TESTING_NotifyDaemonRunning cb, | ||
178 | void *cb_cls, | ||
179 | const char *hostname, | ||
180 | va_list va); | ||
181 | |||
182 | |||
183 | /** | ||
184 | * Start count gnunetd processes with the same set of | ||
185 | * transports and applications. The port numbers will | ||
186 | * be computed by adding delta each time (zero | ||
187 | * times for the first peer). | ||
188 | * | ||
189 | * @param sched scheduler to use | ||
190 | * @param cfg configuration template to use | ||
191 | * @param total number of daemons to start | ||
192 | * @param timeout how long is this allowed to take? | ||
193 | * @param cb function to call on each daemon that was started | ||
194 | * @param cb_cls closure for cb | ||
195 | * @param hostname where to run the peers; can be NULL (to run | ||
196 | * everything on localhost). Additional | ||
197 | * hosts can be specified using a NULL-terminated list of | ||
198 | * varargs, hosts will then be used round-robin from that | ||
199 | * list. | ||
200 | * @return NULL on error, otherwise handle to control peer group | 168 | * @return NULL on error, otherwise handle to control peer group |
201 | */ | 169 | */ |
202 | struct GNUNET_TESTING_PeerGroup * | 170 | struct GNUNET_TESTING_PeerGroup * |
203 | GNUNET_TESTING_daemons_start (struct GNUNET_SCHEDULER_Handle *sched, | 171 | GNUNET_TESTING_daemons_start (struct GNUNET_SCHEDULER_Handle *sched, |
204 | struct GNUNET_CONFIGURATION_Handle *cfg, | 172 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
205 | unsigned int total, | 173 | unsigned int total, |
206 | GNUNET_TESTING_NotifyDaemonRunning cb, | 174 | GNUNET_TESTING_NotifyDaemonRunning cb, |
207 | void *cb_cls, | 175 | void *cb_cls, |
208 | const char *hostname, | 176 | const char *hostnames); |
209 | ...); | ||
210 | 177 | ||
211 | 178 | ||
212 | /** | 179 | /** |