-avoid side-effect in assertion

[oweals/gnunet.git] / src / testbed / testbed_api_hosts.c

diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 4b9d12f80b81af8551f038122ee20485e1910815..2593f5ff80383956f9dc8bfb0a013df3715bcd40 100644 (file)
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -486,13 +486,13 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
     {
       data[offset] = '\0';
       ret =
-          SSCANF (buf, "%255[a-zA-Z0-9_]@%255[a-zA-Z0-9.-]:%5hd", username,
+          SSCANF (buf, "%255[a-zA-Z0-9_]@%255[.a-zA-Z0-9-]:%5hd", username,
                   hostname, &port);
       if (3 == ret)
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Successfully read host %s, port %d and user %s from file\n",
-                    hostname, port, username);
+        LOG (GNUNET_ERROR_TYPE_DEBUG,
+             "Successfully read host %s, port %d and user %s from file\n",
+             hostname, port, username);
         /* We store hosts in a static list; hence we only require the starting
          * host pointer in that list to access the newly created list of hosts */
         if (NULL == starting_host)
@@ -1062,7 +1062,6 @@ helper_mst (void *cls, void *client, const struct GNUNET_MessageHeader *message)
   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;
@@ -1090,12 +1089,9 @@ helper_mst (void *cls, void *client, const struct GNUNET_MessageHeader *message)
   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",
-                                         hostip);
+                                         hostname);
   cp->host->locked = GNUNET_NO;
   cp->host->controller_started = GNUNET_YES;
   cp->cb (cp->cls, cp->host->cfg, GNUNET_OK);
@@ -1907,7 +1903,7 @@ GNUNET_TESTBED_host_resolve_ (struct GNUNET_TESTBED_Host *host)
     return;
   }
   GNUNET_free (hostname);
-  host->hostname = GNUNET_strdup (hostname);
+  host->hostname = GNUNET_strdup (host->hostname);
 }
 
 /* end of testbed_api_hosts.c */