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

[gnunet]

Author: harsha
Date: 2013-05-13 16:29:54 +0200 (Mon, 13 May 2013)
New Revision: 27105

Modified:
   gnunet/src/testbed/sample_hosts.txt
   gnunet/src/testbed/test_testbed_api_hosts.c
   gnunet/src/testbed/testbed_api_hosts.c
Log:
- allow reading hostnames with dashes/hyphens


Modified: gnunet/src/testbed/sample_hosts.txt
===================================================================
--- gnunet/src/testbed/sample_hosts.txt 2013-05-13 14:03:32 UTC (rev 27104)
+++ gnunet/src/testbed/sample_hosts.txt 2013-05-13 14:29:54 UTC (rev 27105)
@@ -13,3 +13,5 @@
 address@hidden:22
 address@hidden:22
 address@hidden:22
address@hidden:22
address@hidden:22

Modified: gnunet/src/testbed/test_testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_hosts.c 2013-05-13 14:03:32 UTC (rev 
27104)
+++ gnunet/src/testbed/test_testbed_api_hosts.c 2013-05-13 14:29:54 UTC (rev 
27105)
@@ -110,11 +110,11 @@
   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);
 }
 
 

Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c      2013-05-13 14:03:32 UTC (rev 
27104)
+++ gnunet/src/testbed/testbed_api_hosts.c      2013-05-13 14:29:54 UTC (rev 
27105)
@@ -486,7 +486,7 @@
     {
       data[offset] = '\0';
       ret =
-          SSCANF (buf, "address@hidden:%5hd", username,
+          SSCANF (buf, "address@hidden:%5hd", username,
                   hostname, &port);
       if (3 == ret)
       {