diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:40:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:40:46 +0000 |
commit | 6035da499e4311aefda6f1c6ba1acef9cf3ded7e (patch) | |
tree | f097bc43a0bd4465ba635aff06137009229dadcd | |
parent | 545f6353d401d62fec33c9c2367e01ed13fb598d (diff) | |
download | gnunet-6035da499e4311aefda6f1c6ba1acef9cf3ded7e.tar.gz gnunet-6035da499e4311aefda6f1c6ba1acef9cf3ded7e.zip |
-fixes
-rw-r--r-- | src/testbed/gnunet-helper-testbed.c | 6 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_3peers_3controllers.c | 1 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_controllerlink.c | 1 | ||||
-rw-r--r-- | src/testbed/testbed_api.c | 5 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.c | 1 |
5 files changed, 12 insertions, 2 deletions
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 0e70645c7..0f9a76699 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c | |||
@@ -225,6 +225,7 @@ tokenizer_cb (void *cls, void *client, | |||
225 | struct GNUNET_TESTBED_HelperReply *reply; | 225 | struct GNUNET_TESTBED_HelperReply *reply; |
226 | struct GNUNET_CONFIGURATION_Handle *cfg; | 226 | struct GNUNET_CONFIGURATION_Handle *cfg; |
227 | struct WriteContext *wc; | 227 | struct WriteContext *wc; |
228 | char *binary; | ||
228 | char *controller; | 229 | char *controller; |
229 | char *hostname; | 230 | char *hostname; |
230 | char *config; | 231 | char *config; |
@@ -312,11 +313,14 @@ tokenizer_cb (void *cls, void *client, | |||
312 | goto error; | 313 | goto error; |
313 | } | 314 | } |
314 | LOG_DEBUG ("Staring testbed with config: %s\n", config); | 315 | LOG_DEBUG ("Staring testbed with config: %s\n", config); |
316 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed"); | ||
315 | testbed = | 317 | testbed = |
316 | GNUNET_OS_start_process (GNUNET_YES, | 318 | GNUNET_OS_start_process (GNUNET_YES, |
317 | GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL, | 319 | GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL, |
318 | NULL, "gnunet-service-testbed", | 320 | NULL, |
321 | binary, | ||
319 | "gnunet-service-testbed", "-c", config, NULL); | 322 | "gnunet-service-testbed", "-c", config, NULL); |
323 | GNUNET_free (binary); | ||
320 | GNUNET_free (config); | 324 | GNUNET_free (config); |
321 | if (NULL == testbed) | 325 | if (NULL == testbed) |
322 | { | 326 | { |
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index 691e04727..206944ae8 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c | |||
@@ -707,6 +707,7 @@ check_ssh (char *host_str) | |||
707 | "-o", "NoHostAuthenticationForLocalhost=yes", "-q", | 707 | "-o", "NoHostAuthenticationForLocalhost=yes", "-q", |
708 | host_str, "which", "gnunet-helper-testbed", NULL | 708 | host_str, "which", "gnunet-helper-testbed", NULL |
709 | }; | 709 | }; |
710 | // FIXME: the above no longer works with libexec/-installation! | ||
710 | struct GNUNET_OS_Process *auxp; | 711 | struct GNUNET_OS_Process *auxp; |
711 | enum GNUNET_OS_ProcessStatusType type; | 712 | enum GNUNET_OS_ProcessStatusType type; |
712 | unsigned long code; | 713 | unsigned long code; |
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 703815a2d..abde65166 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c | |||
@@ -660,6 +660,7 @@ check_ssh (char *host_str) | |||
660 | "-o", "NoHostAuthenticationForLocalhost=yes", "-q", | 660 | "-o", "NoHostAuthenticationForLocalhost=yes", "-q", |
661 | host_str, "which", "gnunet-helper-testbed", NULL | 661 | host_str, "which", "gnunet-helper-testbed", NULL |
662 | }; | 662 | }; |
663 | // FIXME: the above no longer works with libexec/-installation! | ||
663 | struct GNUNET_OS_Process *auxp; | 664 | struct GNUNET_OS_Process *auxp; |
664 | enum GNUNET_OS_ProcessStatusType type; | 665 | enum GNUNET_OS_ProcessStatusType type; |
665 | unsigned long code; | 666 | unsigned long code; |
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); |
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 1663f8962..387da99e0 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c | |||
@@ -518,6 +518,7 @@ GNUNET_TESTBED_is_host_habitable (const struct GNUNET_TESTBED_Host *host) | |||
518 | remote_args[argp++] = "-o"; | 518 | remote_args[argp++] = "-o"; |
519 | remote_args[argp++] = "NoHostAuthenticationForLocalhost=yes"; | 519 | remote_args[argp++] = "NoHostAuthenticationForLocalhost=yes"; |
520 | remote_args[argp++] = ssh_addr; | 520 | remote_args[argp++] = ssh_addr; |
521 | // FIXME: this no longer works with 'libexec/' paths! | ||
521 | remote_args[argp++] = "which"; | 522 | remote_args[argp++] = "which"; |
522 | remote_args[argp++] = "gnunet-helper-testbed"; | 523 | remote_args[argp++] = "gnunet-helper-testbed"; |
523 | remote_args[argp++] = NULL; | 524 | remote_args[argp++] = NULL; |