diff options
Diffstat (limited to 'src/testbed/testbed_api_cmd_netjail_start_testbed.c')
-rw-r--r-- | src/testbed/testbed_api_cmd_netjail_start_testbed.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/testbed/testbed_api_cmd_netjail_start_testbed.c b/src/testbed/testbed_api_cmd_netjail_start_testbed.c index 67f0ef55c..de3926696 100644 --- a/src/testbed/testbed_api_cmd_netjail_start_testbed.c +++ b/src/testbed/testbed_api_cmd_netjail_start_testbed.c | |||
@@ -328,8 +328,7 @@ start_testbed (struct NetJailState *ns, struct | |||
328 | char *const script_argv[] = {NETJAIL_EXEC_SCRIPT, | 328 | char *const script_argv[] = {NETJAIL_EXEC_SCRIPT, |
329 | m_char, | 329 | m_char, |
330 | n_char, | 330 | n_char, |
331 | GNUNET_OS_get_libexec_binary_path ( | 331 | HELPER_CMDS_BINARY, |
332 | HELPER_CMDS_BINARY), | ||
333 | ns->global_n, | 332 | ns->global_n, |
334 | ns->local_m, | 333 | ns->local_m, |
335 | NULL}; | 334 | NULL}; |
@@ -373,6 +372,9 @@ start_testbed (struct NetJailState *ns, struct | |||
373 | &exp_cb, | 372 | &exp_cb, |
374 | tbc)); | 373 | tbc)); |
375 | 374 | ||
375 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
376 | "First using helper %d\n", | ||
377 | tbc->count - 1); | ||
376 | struct GNUNET_HELPER_Handle *helper = ns->helper[tbc->count - 1]; | 378 | struct GNUNET_HELPER_Handle *helper = ns->helper[tbc->count - 1]; |
377 | 379 | ||
378 | msg = create_helper_init_msg_ (m_char, | 380 | msg = create_helper_init_msg_ (m_char, |
@@ -469,7 +471,12 @@ netjail_start_finish (void *cls, | |||
469 | tbc = GNUNET_new (struct TestbedCount); | 471 | tbc = GNUNET_new (struct TestbedCount); |
470 | tbc->ns = ns; | 472 | tbc->ns = ns; |
471 | // TODO This needs to be more generic. As we send more messages back and forth, we can not grow the arrays again and again, because this is to error prone. | 473 | // TODO This needs to be more generic. As we send more messages back and forth, we can not grow the arrays again and again, because this is to error prone. |
472 | tbc->count = (j - 1) * atoi (ns->local_m) + i + total_number; | 474 | tbc->count = (i - 1) * atoi (ns->local_m) + j + total_number; |
475 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
476 | "Second using helper %d %d %d\n", | ||
477 | tbc->count - 1 - total_number, | ||
478 | i, | ||
479 | j); | ||
473 | helper = ns->helper[tbc->count - 1 - total_number]; | 480 | helper = ns->helper[tbc->count - 1 - total_number]; |
474 | msg_length = sizeof(struct GNUNET_CMDS_ALL_PEERS_STARTED); | 481 | msg_length = sizeof(struct GNUNET_CMDS_ALL_PEERS_STARTED); |
475 | reply = GNUNET_new (struct GNUNET_CMDS_ALL_PEERS_STARTED); | 482 | reply = GNUNET_new (struct GNUNET_CMDS_ALL_PEERS_STARTED); |