diff options
Diffstat (limited to 'src/testbed/testbed_api.c')
-rw-r--r-- | src/testbed/testbed_api.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index c55e7373a..9696785f3 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -1453,13 +1453,15 @@ GNUNET_TESTBED_controller_start (const char *controller_ip, | |||
1453 | static char *const binary_argv[] = { | 1453 | static char *const binary_argv[] = { |
1454 | HELPER_TESTBED_BINARY, NULL | 1454 | HELPER_TESTBED_BINARY, NULL |
1455 | }; | 1455 | }; |
1456 | 1456 | ||
1457 | hostname = NULL; | 1457 | hostname = NULL; |
1458 | cp = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_ControllerProc)); | 1458 | cp = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_ControllerProc)); |
1459 | if ((NULL == host) || (0 == GNUNET_TESTBED_host_get_id_ (host))) | 1459 | if ((NULL == host) || (0 == GNUNET_TESTBED_host_get_id_ (host))) |
1460 | { | ||
1460 | cp->helper = | 1461 | cp->helper = |
1461 | GNUNET_HELPER_start (GNUNET_YES, HELPER_TESTBED_BINARY, binary_argv, | 1462 | GNUNET_HELPER_start (GNUNET_YES, HELPER_TESTBED_BINARY, binary_argv, |
1462 | &helper_mst, &helper_exp_cb, cp); | 1463 | &helper_mst, &helper_exp_cb, cp); |
1464 | } | ||
1463 | else | 1465 | else |
1464 | { | 1466 | { |
1465 | char *remote_args[10]; | 1467 | char *remote_args[10]; |
@@ -1483,6 +1485,7 @@ GNUNET_TESTBED_controller_start (const char *controller_ip, | |||
1483 | remote_args[argp++] = "-o"; | 1485 | remote_args[argp++] = "-o"; |
1484 | remote_args[argp++] = "NoHostAuthenticationForLocalhost=yes"; | 1486 | remote_args[argp++] = "NoHostAuthenticationForLocalhost=yes"; |
1485 | remote_args[argp++] = cp->dst; | 1487 | remote_args[argp++] = cp->dst; |
1488 | // FIXME: lib/gnunet/libexec/-prefix missing here!!! | ||
1486 | remote_args[argp++] = HELPER_TESTBED_BINARY_SSH; | 1489 | remote_args[argp++] = HELPER_TESTBED_BINARY_SSH; |
1487 | remote_args[argp++] = NULL; | 1490 | remote_args[argp++] = NULL; |
1488 | GNUNET_assert (argp == 10); | 1491 | GNUNET_assert (argp == 10); |