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

[gnunet]

Author: harsha
Date: 2013-05-17 09:56:37 +0200 (Fri, 17 May 2013)
New Revision: 27190

Modified:
   gnunet/src/testbed/testbed_api_hosts.c
   gnunet/src/testbed/testbed_api_hosts.h
   gnunet/src/testbed/testbed_api_testbed.c
Log:
- fallback to using ip addresses for hosts


Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c      2013-05-17 07:30:19 UTC (rev 
27189)
+++ gnunet/src/testbed/testbed_api_hosts.c      2013-05-17 07:56:37 UTC (rev 
27190)
@@ -1887,4 +1887,27 @@
   return GNUNET_OK;
 }
 
+
+/**
+ * Resolves the hostname of the host to an ip address
+ *
+ * @param host the host whose hostname is to be resolved
+ */
+void
+GNUNET_TESTBED_host_resolve_ (struct GNUNET_TESTBED_Host *host)
+{
+  char *hostname;
+
+  hostname = (char *) host->hostname;
+  host->hostname = simple_resolve (hostname);
+  if (NULL == host->hostname)
+  {
+    GNUNET_break (0);
+    host->hostname = hostname;
+    return;
+  }
+  GNUNET_free (hostname);
+  host->hostname = GNUNET_strdup (hostname);
+}
+
 /* end of testbed_api_hosts.c */

Modified: gnunet/src/testbed/testbed_api_hosts.h
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.h      2013-05-17 07:30:19 UTC (rev 
27189)
+++ gnunet/src/testbed/testbed_api_hosts.h      2013-05-17 07:56:37 UTC (rev 
27190)
@@ -253,5 +253,14 @@
                                     *cproc);
 
 
+/**
+ * Resolves the hostname of the host to an ip address
+ *
+ * @param host the host whose hostname is to be resolved
+ */
+void
+GNUNET_TESTBED_host_resolve_ (struct GNUNET_TESTBED_Host *host);
+
+
 #endif
 /* end of testbed_api_hosts.h */

Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c    2013-05-17 07:30:19 UTC (rev 
27189)
+++ gnunet/src/testbed/testbed_api_testbed.c    2013-05-17 07:56:37 UTC (rev 
27190)
@@ -1349,6 +1349,9 @@
 #if ENABLE_LL
   parse_islands (rc);
 #endif
+  GNUNET_TESTBED_host_resolve_ (rc->h);
+  for (nhost = 0; nhost < rc->num_hosts; nhost++)
+    GNUNET_TESTBED_host_resolve_ (rc->hosts[nhost]);
   GNUNET_OS_network_interfaces_list (netint_proc, rc);
   if (NULL == rc->trusted_ip)
     rc->trusted_ip = GNUNET_strdup ("127.0.0.1");