{
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)
return hostip;
}
+#if ENABLE_LL
+static int
+cmpstringp(const void *p1, const void *p2)
+{
+ /* The actual arguments to this function are "pointers to
+ pointers to char", but strcmp(3) arguments are "pointers
+ to char", hence the following cast plus dereference */
+
+ return strcmp(* (char * const *) p1, * (char * const *) p2);
+}
+#endif
/**
* Loads the set of host allocated by the LoadLeveler Job Scheduler. This
return 0;
if (NULL == hosts)
goto cleanup;
- qsort (hostnames, nhosts, sizeof (hostnames[0]),
- (int (*)(const void *, const void *))&strcmp);
+ qsort (hostnames, nhosts, sizeof (hostnames[0]), cmpstringp);
host_list = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host *) * nhosts);
for (host = 0; host < nhosts; host++)
host_list[host] = GNUNET_TESTBED_host_create (hostnames[host], NULL, cfg, 0);
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;
GNUNET_assert (GNUNET_CONFIGURATION_deserialize
(cp->host->cfg, config, config_size, GNUNET_NO));
GNUNET_free (config);
- if ((NULL == cp->host) ||
- (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host))))
+ if (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);
}
GNUNET_assert (nvals >= h->num_parallel_connects);
avg = GNUNET_TIME_relative_divide (avg, nvals);
- GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != avg.rel_value);
- sd = GNUNET_TESTBED_SD_deviation_factor_ (h->poc_sd, (unsigned int) avg.rel_value);
+ GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != avg.rel_value_us);
+ sd = GNUNET_TESTBED_SD_deviation_factor_ (h->poc_sd, (unsigned int) avg.rel_value_us);
if ( (sd <= 5) ||
(0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
h->num_parallel_connects)) )
- GNUNET_TESTBED_SD_add_data_ (h->poc_sd, (unsigned int) avg.rel_value);
+ GNUNET_TESTBED_SD_add_data_ (h->poc_sd, (unsigned int) avg.rel_value_us);
if (GNUNET_SYSERR == sd)
{
GNUNET_TESTBED_set_num_parallel_overlay_connects_ (h,
return;
slot = &h->tslots[index];
slot->nvals++;
- if (GNUNET_TIME_UNIT_ZERO.rel_value == slot->time.rel_value)
+ if (GNUNET_TIME_UNIT_ZERO.rel_value_us == slot->time.rel_value_us)
{
slot->time = time;
h->tslots_filled++;
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 (host->hostname);
+}
+
/* end of testbed_api_hosts.c */