add units to time, use configuration time api where appropriate, fixing Mantis #1875

6 files changed, 13 insertions, 19 deletions

diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index b619591b8..bf4d4dfe7 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -47,7 +47,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 
 [TESTING]
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf
index 35d69f02b..90ebd73af 100644
--- a/src/mesh/test_mesh_2dtorus.conf
+++ b/src/mesh/test_mesh_2dtorus.conf
@@ -69,13 +69,13 @@ CONNECT_TOPOLOGY = 2D_TORUS
 #PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 600
+CONNECT_TIMEOUT = 600 s
 CONNECT_ATTEMPTS = 2
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = mesh_topo_initial
 MAX_OUTSTANDING_CONNECTIONS = 75
 #SINGLE_PEERINFO_PER_HOST = YES
diff --git a/src/mesh/test_mesh_path.conf b/src/mesh/test_mesh_path.conf
index b619591b8..bf4d4dfe7 100644
--- a/src/mesh/test_mesh_path.conf
+++ b/src/mesh/test_mesh_path.conf
@@ -47,7 +47,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 
 [TESTING]
diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c
index 54c5eb45f..2757da47c 100644
--- a/src/mesh/test_mesh_small.c
+++ b/src/mesh/test_mesh_small.c
@@ -769,8 +769,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   mesh_peers = GNUNET_malloc (sizeof (uint16_t) * (num_peers + 1));
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
-                                             "wait_time", &temp_wait))
+      GNUNET_CONFIGURATION_get_value_time (testing_cfg, "test_mesh_small",
+                                           "WAIT_TIME", &wait_time))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Option test_mesh_small:wait_time is required!\n");
@@ -806,9 +806,6 @@ run (void *cls, char *const *args, const char *cfgfile,
     }
   }
 
-  wait_time =
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
-
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
                                              "output_file", &temp_str))
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index ee5649498..20e13b863 100644
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -40,8 +40,8 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
 [core]
-TOTAL_QUOTA_IN = 999111999
-TOTAL_QUOTA_OUT = 999111999
+TOTAL_QUOTA_IN = 1 GB
+TOTAL_QUOTA_OUT = 1 GB
 AUTOSTART = YES
 PORT = 10003
 
@@ -69,13 +69,13 @@ CONNECT_TOPOLOGY = 2D_TORUS
 #PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 660
+CONNECT_TIMEOUT = 660 s
 CONNECT_ATTEMPTS = 2
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = mesh_topo_initial
 MAX_OUTSTANDING_CONNECTIONS = 75
 #SINGLE_PEERINFO_PER_HOST = YES
@@ -85,6 +85,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75
 DELETE_FILES = YES
 
 [test_mesh_small]
-WAIT_TIME = 300
+WAIT_TIME = 300 s
 CONNECTION_LIMIT = 16
 #DATA_OUTPUT_FILE=data_output
diff --git a/src/mesh/test_mesh_small_unicast_far.c b/src/mesh/test_mesh_small_unicast_far.c
index cc9995b48..1708e96cd 100644
--- a/src/mesh/test_mesh_small_unicast_far.c
+++ b/src/mesh/test_mesh_small_unicast_far.c
@@ -479,8 +479,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   mesh_peers = GNUNET_malloc (sizeof (GNUNET_PEER_Id) * (num_peers + 1));
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
-                                             "wait_time", &temp_wait))
+      GNUNET_CONFIGURATION_get_value_time (testing_cfg, "test_mesh_small",
+                                           "WAIT_TIME", &wait_time))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Option test_mesh_small:wait_time is required!\n");
@@ -516,9 +516,6 @@ run (void *cls, char *const *args, const char *cfgfile,
     }
   }
 
-  wait_time =
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
-
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
                                              "output_file", &temp_str))