diff options
| author | harsha <harsha@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-08-17 12:32:44 +0000 |
|---|---|---|
| committer | harsha <harsha@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-08-17 12:32:44 +0000 |
| commit | 6e67fb52b10251b0750622a1d72db48a63e9766f (patch) | |
| tree | 07f12cb35c32734f25a3a0e4317ee0559168b2d7 /src/testbed/testbed_api.c | |
| parent | 095ffdad1dc5bdfa41943f3fd25aa70a67df3e7f (diff) | |
fixes
git-svn-id: https://gnunet.org/svn/gnunet@23286 140774ce-b5e7-0310-ab8b-a85725594a96
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 691ab5a17a..afac22fbaa 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c @@ -945,6 +945,7 @@ helper_exp_cb (void *cls) cb = cp->cb; cb_cls = cp->cls; + cp->helper = NULL; GNUNET_TESTBED_controller_stop (cp); if (NULL != cb) cb (cb_cls, NULL, GNUNET_SYSERR); @@ -1006,6 +1007,7 @@ GNUNET_TESTBED_controller_start (const char *controller_ip, GNUNET_asprintf (&cp->dst, "%s", hostname); else GNUNET_asprintf (&cp->dst, "%s@%s", username, hostname); + LOG_DEBUG ("Starting SSH to destination %s\n", cp->dst); argp = 0; remote_args[argp++] = "ssh"; remote_args[argp++] = "-p"; @@ -1054,7 +1056,8 @@ GNUNET_TESTBED_controller_stop (struct GNUNET_TESTBED_ControllerProc *cproc) { if (NULL != cproc->shandle) GNUNET_HELPER_send_cancel (cproc->shandle); - GNUNET_HELPER_stop (cproc->helper); + if (NULL != cproc->helper) + GNUNET_HELPER_stop (cproc->helper); if (NULL != cproc->cfg) GNUNET_CONFIGURATION_destroy (cproc->cfg); GNUNET_free_non_null (cproc->port); |