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

[gnunet]

Author: harsha
Date: 2013-05-14 09:47:59 +0200 (Tue, 14 May 2013)
New Revision: 27109

Modified:
   gnunet/src/testbed/testbed_api_hosts.c
Log:
- use hostip instead of hostname to avoid dependency on resolver


Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c      2013-05-13 20:22:01 UTC (rev 
27108)
+++ gnunet/src/testbed/testbed_api_hosts.c      2013-05-14 07:47:59 UTC (rev 
27109)
@@ -1069,6 +1069,7 @@
   struct GNUNET_TESTBED_ControllerProc *cp = cls;
   const struct GNUNET_TESTBED_HelperReply *msg;
   const char *hostname;
+  const char *hostip;
   char *config;
   uLongf config_size;
   uLongf xconfig_size;
@@ -1096,9 +1097,12 @@
   if ((NULL == cp->host) ||
       (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host))))
     hostname = "localhost";
+  hostip = simple_resolve (hostname);
+  if (NULL == hostip)
+    hostip = "127.0.0.1";  
   /* Change the hostname so that we can connect to it */
   GNUNET_CONFIGURATION_set_value_string (cp->host->cfg, "testbed", "hostname",
-                                         hostname);
+                                         hostip);
   cp->host->locked = GNUNET_NO;
   cp->host->controller_started = GNUNET_YES;
   cp->cb (cp->cls, cp->host->cfg, GNUNET_OK);