fixes

5 files changed, 10 insertions, 6 deletions

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index e66802dca..c9f8436e6 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -2253,7 +2253,7 @@ testbed_run (void *cls,
  */
 int main (int argc, char *const *argv)
 {
-  //sleep (30);                 /* Debugging */
+  //sleep (15);                 /* Debugging */
   return
     (GNUNET_OK ==
      GNUNET_SERVICE_run (argc,
diff --git a/src/testbed/gnunet-testbed-helper.c b/src/testbed/gnunet-testbed-helper.c
index 215f680b3..94a384ab2 100644
--- a/src/testbed/gnunet-testbed-helper.c
+++ b/src/testbed/gnunet-testbed-helper.c
@@ -422,7 +422,6 @@ int main (int argc, char **argv)
 
   status = GNUNET_OK;
   in_shutdown = GNUNET_NO;
-  //sleep (60);
   shc_chld =
     GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
   ret = GNUNET_PROGRAM_run (argc, argv, "gnunet-testbed-helper",
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index e9ef4dac9..bda27d8cf 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -191,7 +191,7 @@ registration_cont (void *cls, const char *emsg)
     GNUNET_TESTBED_controller_link (mc, slave, NULL, cfg, GNUNET_YES);
     result = SUCCESS;
     GNUNET_SCHEDULER_add_delayed 
-      (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3),
+      (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10),
        &do_shutdown, NULL);
     break;
   case INIT:
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 691ab5a17..afac22fba 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);
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 817abd8e9..27731caf8 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -242,8 +242,8 @@ GNUNET_TESTBED_host_create_with_id (uint32_t id,
     return NULL;
   }
   host = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host));
-  host->hostname = hostname;
-  host->username = username;
+  host->hostname = (NULL != hostname) ? GNUNET_strdup (hostname) : NULL;
+  host->username = (NULL != username) ? GNUNET_strdup (username) : NULL;
   host->id = id;
   host->port = (0 == port) ? 22 : port;
   new_size = host_list_size;
@@ -326,6 +326,8 @@ GNUNET_TESTBED_host_destroy (struct GNUNET_TESTBED_Host *host)
     GNUNET_CONTAINER_DLL_remove (host->rc_head, host->rc_tail, rc);
     GNUNET_free (rc);
   }
+  GNUNET_free_non_null ((char *) host->username);
+  GNUNET_free_non_null ((char *) host->hostname);
   GNUNET_free (host);
   while (host_list_size >= HOST_LIST_GROW_STEP)
   {