diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/testbed/sample_hosts.txt | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_hosts.c | 4 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/testbed/sample_hosts.txt b/src/testbed/sample_hosts.txt index 5b661696b..d0ce5cb45 100644 --- a/src/testbed/sample_hosts.txt +++ b/src/testbed/sample_hosts.txt | |||
@@ -13,3 +13,5 @@ totakura@192.168.0.12:22 | |||
13 | totakura@192.168.0.13:22 | 13 | totakura@192.168.0.13:22 |
14 | totakura@192.168.0.14:22 | 14 | totakura@192.168.0.14:22 |
15 | totakura@192.168.0.15:22 | 15 | totakura@192.168.0.15:22 |
16 | totakura@opt01:22 | ||
17 | totakura@i19-n015:22 | ||
diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c index bf72a326c..17ccc7050 100644 --- 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, | |||
110 | GNUNET_assert (host == GNUNET_TESTBED_host_lookup_by_id_ (0)); | 110 | GNUNET_assert (host == GNUNET_TESTBED_host_lookup_by_id_ (0)); |
111 | hosts = NULL; | 111 | hosts = NULL; |
112 | num_hosts = GNUNET_TESTBED_hosts_load_from_file ("sample_hosts.txt", cfg, &hosts); | 112 | num_hosts = GNUNET_TESTBED_hosts_load_from_file ("sample_hosts.txt", cfg, &hosts); |
113 | GNUNET_assert (15 == num_hosts); | 113 | GNUNET_assert (17 == num_hosts); |
114 | GNUNET_assert (NULL != hosts); | 114 | GNUNET_assert (NULL != hosts); |
115 | status = GNUNET_YES; | 115 | status = GNUNET_YES; |
116 | shutdown_id = | 116 | shutdown_id = |
117 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (2), &do_shutdown, NULL); | 117 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (0), &do_shutdown, NULL); |
118 | } | 118 | } |
119 | 119 | ||
120 | 120 | ||
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index e76dada88..374fee8ef 100644 --- 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, | |||
486 | { | 486 | { |
487 | data[offset] = '\0'; | 487 | data[offset] = '\0'; |
488 | ret = | 488 | ret = |
489 | SSCANF (buf, "%255[a-zA-Z0-9_]@%255[a-zA-Z0-9.]:%5hd", username, | 489 | SSCANF (buf, "%255[a-zA-Z0-9_]@%255[a-zA-Z0-9.-]:%5hd", username, |
490 | hostname, &port); | 490 | hostname, &port); |
491 | if (3 == ret) | 491 | if (3 == ret) |
492 | { | 492 | { |