diff options
author | t3sserakt <t3ss@posteo.de> | 2021-07-02 20:31:52 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2021-07-02 20:31:52 +0200 |
commit | c4240e04b4cd3956f88c3b1da988345fcd4414fc (patch) | |
tree | 3fbba7dc63f729eb55b778846ccaf1cda2c6f81d /src/include | |
parent | 13dbe5418c1e61bb3c433efa7c2dc412e08b356d (diff) | |
download | gnunet-c4240e04b4cd3956f88c3b1da988345fcd4414fc.tar.gz gnunet-c4240e04b4cd3956f88c3b1da988345fcd4414fc.zip |
- stopping testbed, starting testbed for every node, fixing bugs, implement traits to start peers on nodes
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_testbed_ng_service.h | 31 | ||||
-rw-r--r-- | src/include/gnunet_testing_ng_lib.h | 2 |
2 files changed, 23 insertions, 10 deletions
diff --git a/src/include/gnunet_testbed_ng_service.h b/src/include/gnunet_testbed_ng_service.h index b19a6e958..9845b3be6 100644 --- a/src/include/gnunet_testbed_ng_service.h +++ b/src/include/gnunet_testbed_ng_service.h | |||
@@ -197,11 +197,7 @@ GNUNET_TESTBED_get_trait_controller (const struct GNUNET_TESTING_Command *cmd, | |||
197 | 197 | ||
198 | struct GNUNET_TESTING_Command | 198 | struct GNUNET_TESTING_Command |
199 | GNUNET_TESTBED_cmd_controller (const char *label, | 199 | GNUNET_TESTBED_cmd_controller (const char *label, |
200 | const char *trusted_ip, | 200 | const char *host, |
201 | const char *hostname, | ||
202 | const char *username, | ||
203 | uint16_t port, | ||
204 | struct GNUNET_CONFIGURATION_Handle *cfg, | ||
205 | uint64_t event_mask); | 201 | uint64_t event_mask); |
206 | 202 | ||
207 | void | 203 | void |
@@ -225,6 +221,7 @@ GNUNET_TESTBED_cmd_netjail_start (const char *label, | |||
225 | char *local_m, | 221 | char *local_m, |
226 | char *global_n); | 222 | char *global_n); |
227 | 223 | ||
224 | |||
228 | /** | 225 | /** |
229 | * Create command. | 226 | * Create command. |
230 | * | 227 | * |
@@ -234,11 +231,9 @@ GNUNET_TESTBED_cmd_netjail_start (const char *label, | |||
234 | */ | 231 | */ |
235 | struct GNUNET_TESTING_Command | 232 | struct GNUNET_TESTING_Command |
236 | GNUNET_TESTBED_cmd_netjail_start_testbed (const char *label, | 233 | GNUNET_TESTBED_cmd_netjail_start_testbed (const char *label, |
237 | char *const binary_argv[], | ||
238 | char *local_m, | 234 | char *local_m, |
239 | char *global_n, | 235 | char *global_n); |
240 | GNUNET_MessageTokenizerCallback cb, | 236 | |
241 | GNUNET_HELPER_ExceptionCallback exp_cb); | ||
242 | 237 | ||
243 | /** | 238 | /** |
244 | * Create command. | 239 | * Create command. |
@@ -252,4 +247,22 @@ GNUNET_TESTBED_cmd_netjail_stop (const char *label, | |||
252 | char *local_m, | 247 | char *local_m, |
253 | char *global_n); | 248 | char *global_n); |
254 | 249 | ||
250 | |||
251 | struct GNUNET_TESTING_Command | ||
252 | GNUNET_TESTBED_cmd_stop_testbed (const char *label, | ||
253 | const char *helper_start_label, | ||
254 | char *local_m, | ||
255 | char *global_n); | ||
256 | |||
257 | |||
258 | int | ||
259 | GNUNET_TESTBED_get_trait_helper_handles (const struct | ||
260 | GNUNET_TESTING_Command *cmd, | ||
261 | struct GNUNET_HELPER_Handle ***helper); | ||
262 | |||
263 | |||
264 | int | ||
265 | GNUNET_TESTBED_get_trait_hosts (const struct | ||
266 | GNUNET_TESTING_Command *cmd, | ||
267 | struct GNUNET_TESTBED_Host ***hosts); | ||
255 | #endif | 268 | #endif |
diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h index dd83bbe82..a794562a9 100644 --- a/src/include/gnunet_testing_ng_lib.h +++ b/src/include/gnunet_testing_ng_lib.h | |||
@@ -240,7 +240,7 @@ GNUNET_TESTING_interpreter_get_current_label ( | |||
240 | * @param is interpreter state. | 240 | * @param is interpreter state. |
241 | */ | 241 | */ |
242 | void | 242 | void |
243 | GNUNET_TESTING_interpreter_fail (struct GNUNET_TESTING_Interpreter *is); | 243 | GNUNET_TESTING_interpreter_fail (); |
244 | 244 | ||
245 | 245 | ||
246 | /** | 246 | /** |