[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23286 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23286 - gnunet/src/testbed |
Date: |
Fri, 17 Aug 2012 14:32:44 +0200 |
Author: harsha
Date: 2012-08-17 14:32:44 +0200 (Fri, 17 Aug 2012)
New Revision: 23286
Modified:
gnunet/src/testbed/gnunet-service-testbed.c
gnunet/src/testbed/gnunet-testbed-helper.c
gnunet/src/testbed/test_testbed_api_controllerlink.c
gnunet/src/testbed/testbed_api.c
gnunet/src/testbed/testbed_api_hosts.c
Log:
fixes
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-08-17 12:02:52 UTC (rev
23285)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-08-17 12:32:44 UTC (rev
23286)
@@ -2253,7 +2253,7 @@
*/
int main (int argc, char *const *argv)
{
- //sleep (30); /* Debugging */
+ //sleep (15); /* Debugging */
return
(GNUNET_OK ==
GNUNET_SERVICE_run (argc,
Modified: gnunet/src/testbed/gnunet-testbed-helper.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-helper.c 2012-08-17 12:02:52 UTC (rev
23285)
+++ gnunet/src/testbed/gnunet-testbed-helper.c 2012-08-17 12:32:44 UTC (rev
23286)
@@ -422,7 +422,6 @@
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",
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-17
12:02:52 UTC (rev 23285)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-17
12:32:44 UTC (rev 23286)
@@ -191,7 +191,7 @@
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:
Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c 2012-08-17 12:02:52 UTC (rev 23285)
+++ gnunet/src/testbed/testbed_api.c 2012-08-17 12:32:44 UTC (rev 23286)
@@ -945,6 +945,7 @@
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_asprintf (&cp->dst, "%s", hostname);
else
GNUNET_asprintf (&cp->dst, "address@hidden", 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 @@
{
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);
Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c 2012-08-17 12:02:52 UTC (rev
23285)
+++ gnunet/src/testbed/testbed_api_hosts.c 2012-08-17 12:32:44 UTC (rev
23286)
@@ -242,8 +242,8 @@
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_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)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23286 - gnunet/src/testbed,
gnunet <=