[GNUnet-SVN] r24400 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-10-18 16:52:25 +0200 (Thu, 18 Oct 2012)
New Revision: 24400

Modified:
   gnunet/src/testbed/testbed_api.c
Log:
use controller's host when slave host is NULL

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2012-10-18 14:26:30 UTC (rev 24399)
+++ gnunet/src/testbed/testbed_api.c    2012-10-18 14:52:25 UTC (rev 24400)
@@ -2054,8 +2054,9 @@
 
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_TESTBED_is_host_registered_ (delegated_host, master));
-  slave_host_id = (NULL == slave_host) ?
-      0 : GNUNET_TESTBED_host_get_id_ (slave_host);
+  slave_host_id = 
+      GNUNET_TESTBED_host_get_id_ ((NULL != slave_host)
+                                   ? slave_host : master->host);
   delegated_host_id = GNUNET_TESTBED_host_get_id_ (delegated_host);
   if ((NULL != slave_host) && (0 != slave_host_id))
     GNUNET_assert (GNUNET_YES ==