- allow reading hostnames with dashes/hyphens

diff --git a/src/testbed/sample_hosts.txt b/src/testbed/sample_hosts.txt
index 5b661696bc13c2ca71980fafdbab2ff3df0bc24c..d0ce5cb45ca2bbedf86f6a94c5f0bd3c9ad4285d 100644 (file)
--- a/src/testbed/sample_hosts.txt
+++ b/src/testbed/sample_hosts.txt
@@ -13,3 +13,5 @@ totakura@192.168.0.12:22
 totakura@192.168.0.13:22
 totakura@192.168.0.14:22
 totakura@192.168.0.15:22
+totakura@opt01:22
+totakura@i19-n015:22

diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c
index bf72a326ce1ca042705fa7b960a307da52d3c209..17ccc7050c21fb6b2c41d8c2e8517893d1c5c179 100644 (file)
--- a/src/testbed/test_testbed_api_hosts.c
+++ b/src/testbed/test_testbed_api_hosts.c
@@ -110,11 +110,11 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_assert (host == GNUNET_TESTBED_host_lookup_by_id_ (0));
   hosts = NULL;
   num_hosts = GNUNET_TESTBED_hosts_load_from_file ("sample_hosts.txt", cfg, &hosts);
-  GNUNET_assert (15 == num_hosts);
+  GNUNET_assert (17 == num_hosts);
   GNUNET_assert (NULL != hosts);
   status = GNUNET_YES;
   shutdown_id =
-      GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (2), &do_shutdown, NULL);
+      GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (0), &do_shutdown, NULL);
 }
 
 

diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index e76dada8891b3db31a400e18f2d49feeb3aa45ae..374fee8ef1302c25d4fa9acf4f3ee5982c031123 100644 (file)
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -486,7 +486,7 @@ 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)
       {