[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23229 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23229 - gnunet/src/testbed |
Date: |
Tue, 14 Aug 2012 16:25:43 +0200 |
Author: harsha
Date: 2012-08-14 16:25:43 +0200 (Tue, 14 Aug 2012)
New Revision: 23229
Modified:
gnunet/src/testbed/gnunet-service-testbed.c
gnunet/src/testbed/test_testbed_api_controllerlink.c
Log:
fixes
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-08-14 14:23:34 UTC (rev
23228)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-08-14 14:25:43 UTC (rev
23229)
@@ -1108,7 +1108,11 @@
LOG_DEBUG ("-------host id: %u\n", host_id);
if (NULL != hostname) LOG_DEBUG ("-------hostname: %s\n", hostname);
if (0 != username_length) LOG_DEBUG ("-------username: %s\n", username);
- else LOG_DEBUG ("-------username: NULL\n");
+ else
+ {
+ LOG_DEBUG ("-------username: NULL\n");
+ username = NULL;
+ }
LOG_DEBUG ("-------ssh port: %u\n", ntohs (msg->ssh_port));
host = GNUNET_TESTBED_host_create_with_id (host_id, hostname, username,
ntohs (msg->ssh_port));
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-14
14:23:34 UTC (rev 23228)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-14
14:25:43 UTC (rev 23229)
@@ -126,16 +126,16 @@
{
if (GNUNET_SCHEDULER_NO_TASK != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
- if (NULL != mc)
- GNUNET_TESTBED_controller_disconnect (mc);
- if (NULL != cp)
- GNUNET_TESTBED_controller_stop (cp);
- if (NULL != slave)
+ if (NULL != slave)
GNUNET_TESTBED_host_destroy (slave);
if (NULL != host)
GNUNET_TESTBED_host_destroy (host);
+ if (NULL != mc)
+ GNUNET_TESTBED_controller_disconnect (mc);
if (NULL != cfg)
GNUNET_CONFIGURATION_destroy (cfg);
+ if (NULL != cp)
+ GNUNET_TESTBED_controller_stop (cp);
if (NULL != rh)
GNUNET_TESTBED_cancel_registration (rh);
@@ -250,7 +250,7 @@
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *config)
{
- host = GNUNET_TESTBED_host_create ("127.0.0.1", NULL, 0);
+ host = GNUNET_TESTBED_host_create (NULL, NULL, 0);
GNUNET_assert (NULL != host);
cfg = GNUNET_CONFIGURATION_dup (config);
cp =
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23229 - gnunet/src/testbed,
gnunet <=