From a4b74ef335873379d374d372bcce7c4228095bd5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 29 Aug 2012 13:09:25 +0000 Subject: only use control pipe with helpers IF the helper actually supports it --- src/testbed/test_gnunet_testbed_helper.c | 3 ++- src/testbed/testbed_api.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/testbed') diff --git a/src/testbed/test_gnunet_testbed_helper.c b/src/testbed/test_gnunet_testbed_helper.c index a0e1dd619..0026b4923 100644 --- a/src/testbed/test_gnunet_testbed_helper.c +++ b/src/testbed/test_gnunet_testbed_helper.c @@ -204,7 +204,8 @@ run (void *cls, char *const *args, const char *cfgfile, }; const char *controller_name = "127.0.0.1"; - helper = GNUNET_HELPER_start ("gnunet-testbed-helper", + helper = GNUNET_HELPER_start (GNUNET_YES, + "gnunet-testbed-helper", binary_argv, &mst_cb, &exp_cb, NULL); GNUNET_assert (NULL != helper); diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index f302cb57b..7012be775 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c @@ -1054,7 +1054,8 @@ GNUNET_TESTBED_controller_start (const char *controller_ip, "gnunet-testbed-helper", NULL }; - cp->helper = GNUNET_HELPER_start ("gnunet-testbed-helper", binary_argv, + cp->helper = GNUNET_HELPER_start (GNUNET_YES, + "gnunet-testbed-helper", binary_argv, &helper_mst, &helper_exp_cb, cp); } else @@ -1082,7 +1083,8 @@ GNUNET_TESTBED_controller_start (const char *controller_ip, remote_args[argp++] = "gnunet-testbed-helper"; remote_args[argp++] = NULL; GNUNET_assert (argp == 8); - cp->helper = GNUNET_HELPER_start ("ssh", remote_args, + cp->helper = GNUNET_HELPER_start (GNUNET_NO, + "ssh", remote_args, &helper_mst, &helper_exp_cb, cp); } if (NULL == cp->helper) -- cgit v1.2.3