summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-11-17 19:18:52 +0000
committerChristian Grothoff <christian@grothoff.org>2011-11-17 19:18:52 +0000
commit7dfd634b17df4e1505c62f2224380a0d38da2e8d (patch)
treedc8846d3455b9aa73f242ab79328bc943749de2c
parent775613176d9e33ccdc8bcd468cfb9aab288458c2 (diff)
add units to time, use configuration time api where appropriate, fixing Mantis #1875
-rw-r--r--src/ats-test/test_transport_ats_4addr.conf2
-rw-r--r--src/ats/gnunet-service-ats_reservations.c1
-rw-r--r--src/dht/test_dht_2dtorus.conf8
-rw-r--r--src/dht/test_dht_api_data.conf6
-rw-r--r--src/dht/test_dht_api_peer1.conf6
-rw-r--r--src/dht/test_dht_multipeer_data.conf8
-rw-r--r--src/dht/test_dht_twopeer_data.conf6
-rw-r--r--src/fs/fs.conf2
-rw-r--r--src/mesh/test_mesh.conf2
-rw-r--r--src/mesh/test_mesh_2dtorus.conf4
-rw-r--r--src/mesh/test_mesh_path.conf2
-rw-r--r--src/mesh/test_mesh_small.c7
-rw-r--r--src/mesh/test_mesh_small.conf10
-rw-r--r--src/mesh/test_mesh_small_unicast_far.c7
-rw-r--r--src/nse/gnunet-nse-profiler.c7
-rw-r--r--src/nse/nse.conf6
-rw-r--r--src/nse/nse_profiler_test.conf10
-rw-r--r--src/nse/test_nse.conf8
-rw-r--r--src/testing/test_testing_2dtorus.conf8
-rw-r--r--src/testing/test_testing_data_topology_clique.conf4
-rw-r--r--src/testing/test_testing_data_topology_stability.conf2
-rw-r--r--src/testing/test_testing_large_topology.c25
-rw-r--r--src/testing/test_testing_peergroup_data.conf2
-rw-r--r--src/testing/test_testing_topology.c27
-rw-r--r--src/testing/test_testing_topology_blacklist.c12
-rw-r--r--src/testing/testing.conf2
-rw-r--r--src/testing/testing_peergroup.c31
-rw-r--r--src/transport/template_cfg_peer1.conf2
-rw-r--r--src/transport/template_cfg_peer2.conf2
-rw-r--r--src/transport/test_plugin_transport_data.conf2
-rw-r--r--src/transport/test_quota_compliance_data.conf2
-rw-r--r--src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf2
-rw-r--r--src/transport/test_quota_compliance_tcp_peer2.conf2
-rw-r--r--src/transport/test_transport_api_bidirectional_connect_peer1.conf2
-rw-r--r--src/transport/test_transport_api_bidirectional_connect_peer2.conf2
-rw-r--r--src/transport/test_transport_api_disconnect_tcp_peer1.conf2
-rw-r--r--src/transport/test_transport_api_disconnect_tcp_peer2.conf2
-rw-r--r--src/transport/test_transport_api_limited_sockets_tcp_peer1.conf2
-rw-r--r--src/transport/test_transport_api_limited_sockets_tcp_peer2.conf2
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf2
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf2
-rw-r--r--src/transport/test_transport_api_reliability_http_peer1.conf2
-rw-r--r--src/transport/test_transport_api_reliability_tcp_nat_peer1.conf6
-rw-r--r--src/transport/test_transport_api_reliability_tcp_nat_peer2.conf6
-rw-r--r--src/transport/test_transport_api_reliability_tcp_peer1.conf6
-rw-r--r--src/transport/test_transport_api_reliability_tcp_peer2.conf6
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer1.conf2
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer2.conf2
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf2
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf2
-rw-r--r--src/transport/test_transport_api_timeout_tcp_peer1.conf2
-rw-r--r--src/transport/test_transport_defaults.conf2
-rw-r--r--src/transport/transport.conf2
-rw-r--r--src/util/test_service_data.conf4
-rw-r--r--src/vpn/test-conf.conf2
55 files changed, 135 insertions, 154 deletions
diff --git a/src/ats-test/test_transport_ats_4addr.conf b/src/ats-test/test_transport_ats_4addr.conf
index 2fb476ced..830cd8810 100644
--- a/src/ats-test/test_transport_ats_4addr.conf
+++ b/src/ats-test/test_transport_ats_4addr.conf
@@ -10,7 +10,7 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
ALLOW_NAT = NO
[transport-tcp]
-TIMEOUT = 5000
+TIMEOUT = 5 s
[transport-udp]
PORT = 2571
diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c
index f40e54516..cb92ac748 100644
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -92,6 +92,7 @@ GAS_reservations_set_bandwidth (const struct GNUNET_PeerIdentity *peer,
struct GNUNET_BANDWIDTH_Tracker *tracker;
tracker = GNUNET_CONTAINER_multihashmap_get (trackers, &peer->hashPubKey);
+ GNUNET_break (NULL != tracker);
if (0 == ntohl (bandwidth_in.value__))
{
GNUNET_assert (GNUNET_YES ==
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 20ca30e3f..0d7b94879 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -37,8 +37,8 @@ INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
[core]
-TOTAL_QUOTA_IN = 91024000
-TOTAL_QUOTA_OUT = 91024000
+TOTAL_QUOTA_IN = 1 GB
+TOTAL_QUOTA_OUT = 1 GB
AUTOSTART = YES
PORT = 10003
@@ -58,13 +58,13 @@ CONNECT_TOPOLOGY = NONE
#PERCENTAGE = 3
#PROBABILITY = .1
F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
CONNECT_ATTEMPTS = 3
DEBUG = YES
HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 10
USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
TOPOLOGY_OUTPUT_FILE = 2dtorus_topo_initial
MAX_OUTSTANDING_CONNECTIONS = 75
#SINGLE_PEERINFO_PER_HOST = YES
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index bd73dbfb8..610733399 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -21,8 +21,8 @@ FRIENDS-ONLY = NO
MINIMUM-FRIENDS = 0
[core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
PORT = 2092
[dht]
@@ -52,7 +52,7 @@ DEFAULTSERVICES =
PORT = 2087
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 2094
[TESTING]
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 6bd5a8920..075234232 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -29,8 +29,8 @@ NEIGHBOUR_LIMIT = 50
PORT = 12365
[core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
PORT = 12092
[arm]
@@ -39,7 +39,7 @@ PORT = 12366
DEBUG = NO
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 12368
BINDTO = 127.0.0.1
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 9268153d7..941d5bf67 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -46,8 +46,8 @@ PORT = 12365
PLUGIN = mysql_dump
[core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-core
@@ -69,7 +69,7 @@ PORT = 12366
DEBUG = NO
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 12368
BINDTO = 127.0.0.1
@@ -89,7 +89,7 @@ CONNECT_TOPOLOGY = NONE
TOPOLOGY_FILE = multipeer_topo.dat
MAX_CONCURRENT_SSH = 1
-PEERGROUP_TIMEOUT = 10000
+PEERGROUP_TIMEOUT = 10 s
USE_PROGRESSBARS = YES
#CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
#CONNECT_TOPOLOGY_OPTION_MODIFIER = 2
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 0cb0f18ab..418772fc7 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -26,8 +26,8 @@ NEIGHBOUR_LIMIT = 50
PORT = 12365
[core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
HOSTNAME = localhost
PORT = 12092
@@ -37,7 +37,7 @@ PORT = 12366
DEBUG = NO
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 12368
BINDTO = 127.0.0.1
diff --git a/src/fs/fs.conf b/src/fs/fs.conf
index 7e3fecd7b..2f65859b4 100644
--- a/src/fs/fs.conf
+++ b/src/fs/fs.conf
@@ -26,7 +26,7 @@ MAX_PENDING_REQUESTS = 65536
# Maximum frequency we're allowed to poll the datastore
# for content for migration (can be used to reduce
# GNUnet's disk-IO rate)
-MIN_MIGRATION_DELAY = 100
+MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
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))
diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c
index 4ad689be9..d097b96aa 100644
--- a/src/nse/gnunet-nse-profiler.c
+++ b/src/nse/gnunet-nse-profiler.c
@@ -557,8 +557,8 @@ run (void *cls, char *const *args, const char *cfgfile,
}
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (testing_cfg, "nse-profiler",
- "wait_time", &temp_wait))
+ GNUNET_CONFIGURATION_get_value_time (testing_cfg, "nse-profiler",
+ "WAIT_TIME", &wait_time))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Option nse-profiler:wait_time is required!\n");
@@ -611,9 +611,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, "nse-profiler", "output_file",
&temp_str))
diff --git a/src/nse/nse.conf b/src/nse/nse.conf
index 318fd15fd..5a7835e82 100644
--- a/src/nse/nse.conf
+++ b/src/nse/nse.conf
@@ -14,11 +14,11 @@ PROOFFILE = $SERVICEHOME/.nse-proof
HISTOGRAM = $SERVICEHOME/nse-history.log
# How 'slowly' should the proof-of-work be constructed (delay
-# between rounds in ms); sane values between 0 and ~1000.
-WORKDELAY = 5
+# between rounds); sane values between 0 and ~1000.
+WORKDELAY = 5 ms
# Note: changing any of the values below will make this peer
# completely incompatible with other peers!
-INTERVAL = 3600000
+INTERVAL = 1 h
WORKBITS = 20
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 411bad9f0..c0f584ce4 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -13,8 +13,8 @@ DEBUG = NO
CONFIG = $DEFAULTCONFIG
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
-WORKDELAY = 10000
-INTERVAL = 15000
+WORKDELAY = 10 s
+INTERVAL = 15 s
WORKBITS = 0
PROOFFILE = $SERVICEHOME/nse.proof
@@ -80,13 +80,13 @@ CONNECT_TOPOLOGY = SMALL_WORLD_RING
PERCENTAGE = 3
#PROBABILITY = .1
F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
CONNECT_ATTEMPTS = 3
#DEBUG = YES
HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 20
USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000
+PEERGROUP_TIMEOUT = 1000 s
TOPOLOGY_OUTPUT_FILE = nse_topo_1000_peers_initial
MAX_OUTSTANDING_CONNECTIONS = 200
#SINGLE_PEERINFO_PER_HOST = YES
@@ -105,5 +105,5 @@ TOPOLOGY_OUTPUT_FILE = nse_topo_100_peers
#ROUND3 = 100
#ROUND2 = 500
#ROUND3 = 1000
-WAIT_TIME = 120
+WAIT_TIME = 120 s
CONNECTION_LIMIT = 10
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index ba33f7fc5..48944c119 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -14,8 +14,8 @@ CONFIG = $DEFAULTCONFIG
PROOFFILE = $SERVICEHOME/proof.nse
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
-WORKDELAY = 1
-INTERVAL = 60000
+WORKDELAY = 1 ms
+INTERVAL = 60 s
WORKBITS = 1
HISTOGRAM = $SERVICEHOME/nse-histogram
@@ -64,13 +64,13 @@ TOPOLOGY = NONE
CONNECT_TOPOLOGY = SMALL_WORLD_RING
PERCENTAGE = 3
F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
CONNECT_ATTEMPTS = 3
#DEBUG = YES
HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 20
USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000
+PEERGROUP_TIMEOUT = 1000 s
DELETE_FILES = NO
diff --git a/src/testing/test_testing_2dtorus.conf b/src/testing/test_testing_2dtorus.conf
index 8cf2f8f62..da5f90c9c 100644
--- a/src/testing/test_testing_2dtorus.conf
+++ b/src/testing/test_testing_2dtorus.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
@@ -61,13 +61,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 = testing_topo_initial
MAX_OUTSTANDING_CONNECTIONS = 75
#SINGLE_PEERINFO_PER_HOST = YES
diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index 168af17f4..69cecb7e9 100644
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -3,8 +3,8 @@
DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING]
-CONNECT_TIMEOUT = 180
+CONNECT_TIMEOUT = 180 s
CONNECT_ATTEMPTS = 14
NUM_PEERS = 4
TOPOLOGY = CLIQUE
-
+SETTLE_TIME = 0
diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf
index fc35fc8ab..1bfcd1bde 100644
--- a/src/testing/test_testing_data_topology_stability.conf
+++ b/src/testing/test_testing_data_topology_stability.conf
@@ -3,7 +3,7 @@
DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING]
-SETTLE_TIME = 600
+SETTLE_TIME = 600 s
NUM_PEERS = 2
TOPOLOGY = CLIQUE
diff --git a/src/testing/test_testing_large_topology.c b/src/testing/test_testing_large_topology.c
index 78d91fa3d..a27154507 100644
--- a/src/testing/test_testing_large_topology.c
+++ b/src/testing/test_testing_large_topology.c
@@ -1043,26 +1043,25 @@ run (void *cls, char *const *args, const char *cfgfile,
GNUNET_free_non_null (topology_str);
GNUNET_free_non_null (blacklist_topology_str);
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time",
- &temp_settle))
- settle_time =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
-
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SETTLE_TIME",
+ &settle_time))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
+ "testing", "SETTLE_TIME");
+ return;
+ }
if (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
&num_peers))
num_peers = DEFAULT_NUM_PEERS;
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout",
- &temp_settle))
- connect_timeout =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
- else
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "CONNECT_TIMEOUT",
+ &connect_timeout))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
- "testing", "connect_timeout");
+ "testing", "CONNECT_TIMEOUT");
return;
}
diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf
index be734c7d2..6eadede95 100644
--- a/src/testing/test_testing_peergroup_data.conf
+++ b/src/testing/test_testing_peergroup_data.conf
@@ -6,7 +6,7 @@ DEFAULTCONFIG = test_testing_peergroup_data.conf
CONNECT_ATTEMPTS = 2
MAX_OUTSTANDING_CONNECTIONS = 20
MAX_CONCURRENT_SSH = 1
-PEERGROUP_TIMEOUT = 300
+PEERGROUP_TIMEOUT = 300 s
TOPOLOGY = CLIQUE
PERCENTAGE = 0.5
PROBABILITY = 0.5
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c
index deaeae457..ba092220a 100644
--- a/src/testing/test_testing_topology.c
+++ b/src/testing/test_testing_topology.c
@@ -999,7 +999,6 @@ run (void *cls, char *const *args, const char *cfgfile,
char *blacklist_topology_str;
char *connect_topology_option_str;
char *connect_topology_option_modifier_string;
- unsigned long long temp_settle;
unsigned long long max_outstanding_connections;
ok = 1;
@@ -1101,21 +1100,21 @@ run (void *cls, char *const *args, const char *cfgfile,
GNUNET_free_non_null (topology_str);
GNUNET_free_non_null (blacklist_topology_str);
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time",
- &temp_settle))
- settle_time =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
-
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout",
- &temp_settle))
- connect_timeout =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
- else
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SETTLE_TIME",
+ &settle_time))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
+ "testing", "SETTLE_TIME");
+ return;
+ }
+
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "CONNECT_TIMEOUT",
+ &connect_timeout))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
- "testing", "connect_timeout");
+ "testing", "CONNECT_TIMEOUT");
return;
}
diff --git a/src/testing/test_testing_topology_blacklist.c b/src/testing/test_testing_topology_blacklist.c
index 046cb2ca5..d53fc8cbe 100644
--- a/src/testing/test_testing_topology_blacklist.c
+++ b/src/testing/test_testing_topology_blacklist.c
@@ -390,7 +390,6 @@ run (void *cls, char *const *args, const char *cfgfile,
unsigned long long connect_topology_num;
unsigned long long blacklist_topology_num;
unsigned long long connect_topology_option_num;
- unsigned long long temp_connect;
char *connect_topology_option_modifier_string;
ok = 1;
@@ -485,15 +484,12 @@ run (void *cls, char *const *args, const char *cfgfile,
&num_peers))
num_peers = DEFAULT_NUM_PEERS;
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout",
- &temp_connect))
- connect_timeout =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_connect);
- else
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "CONNECT_TIMEOUT",
+ &connect_timeout))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
- "testing", "connect_timeout");
+ "testing", "CONNECT_TIMEOUT");
return;
}
diff --git a/src/testing/testing.conf b/src/testing/testing.conf
index 1604ebc3a..7e25f8c13 100644
--- a/src/testing/testing.conf
+++ b/src/testing/testing.conf
@@ -1,6 +1,6 @@
[TESTING]
# How long before failing a connection?
-CONNECT_TIMEOUT = 30
+CONNECT_TIMEOUT = 30 s
# How many connect attempts should we make?
CONNECT_ATTEMPTS = 3
# How many connections can happen simultaneously?
diff --git a/src/testing/testing_peergroup.c b/src/testing/testing_peergroup.c
index 837b50c08..0923dfc50 100644
--- a/src/testing/testing_peergroup.c
+++ b/src/testing/testing_peergroup.c
@@ -33,7 +33,7 @@
#include "gnunet_disk_lib.h"
/** Globals **/
-#define DEFAULT_CONNECT_TIMEOUT 30 // FIXME: use fancy time
+#define DEFAULT_CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
#define DEFAULT_CONNECT_ATTEMPTS 2
@@ -55,7 +55,7 @@ struct PeerGroupStartupContext
/**
* How long to spend trying to establish all the connections?
*/
- unsigned long long connect_timeout; // FIXME: use fancy time
+ struct GNUNET_TIME_Relative connect_timeout;
unsigned long long max_concurrent_ssh;
struct GNUNET_TIME_Absolute timeout;
@@ -508,10 +508,7 @@ internal_peers_started_callback (void *cls,
pg_start_ctx->connect_topology,
pg_start_ctx->connect_topology_option,
pg_start_ctx->connect_topology_option_modifier,
- // FIXME: use fancy time
- GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- pg_start_ctx->connect_timeout),
+ pg_start_ctx->connect_timeout,
pg_start_ctx->connect_attempts, NULL,
NULL);
@@ -740,6 +737,7 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
unsigned long long temp_config_number;
char *temp_str;
int temp;
+ struct GNUNET_TIME_Relative rtimeout;
GNUNET_assert (total > 0);
GNUNET_assert (cfg != NULL);
@@ -757,10 +755,10 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
}
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout",
- &pg_start_ctx->connect_timeout))
+ GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "CONNECT_TIMEOUT",
+ &pg_start_ctx->connect_timeout))
{
- pg_start_ctx->connect_timeout = DEFAULT_CONNECT_TIMEOUT;
+ pg_start_ctx->connect_timeout = DEFAULT_CONNECT_TIMEOUT;
}
if (GNUNET_OK !=
@@ -796,21 +794,18 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
return NULL;
}
- if (GNUNET_OK ==
+ if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg, "testing",
- "peergroup_timeout",
- &temp_config_number))
- pg_start_ctx->timeout =
- GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS,
- temp_config_number));
- else
+ "PEERGROUP_TIMEOUT",
+ &rtimeout))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
- "testing", "peergroup_timeout");
+ "testing", "PEERGROUP_TIMEOUT");
GNUNET_free (pg_start_ctx);
return NULL;
}
+ pg_start_ctx->timeout =
+ GNUNET_TIME_relative_to_absolute (rtimeout);
/* Read topology related options from the configuration file */
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index 90ad9ab06..961c98b8f 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -12,7 +12,7 @@ DISABLEV6 = NO
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index cb5935f81..e46f0b8a1 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -12,7 +12,7 @@ DISABLEV6 = NO
[transport-tcp]
PORT = 12100
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index e3e619fb3..adc7a59bf 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_plugin_transport_data.conf
[transport-tcp]
PORT = 2368
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 2366
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
index 7f93a15ba..93f75dd0b 100644
--- a/src/transport/test_quota_compliance_data.conf
+++ b/src/transport/test_quota_compliance_data.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_quota_compliance_data.conf
[transport-tcp]
PORT = 2368
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 2366
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
index 18295ac60..75a4fe9cf 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 476507588..18b199c42 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
index b66c6c441..21591b5ab 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer1.conf
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
index c959b5179..db3ba8cd7 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer2.conf
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
index 2df5a6175..8bfa37402 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
index 04500ea17..6bb7fadff 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
index 90e329f0d..dee44f63f 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
index 153176907..04324f46e 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
[transport-tcp]
PORT = 0
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 272d19c41..a7c57fc3b 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_multi_peer1.conf
[transport-tcp]
PORT = 12140
-TIMEOUT = 5000
+TIMEOUT = 5 s
[transport-udp]
PORT = 12141
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 86f51e394..8008e7ff2 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -8,7 +8,7 @@ ALLOW_NAT = NO
[transport-tcp]
PORT = 12150
-TIMEOUT = 5000
+TIMEOUT = 5 s
[transport-udp]
PORT = 12151
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf
index 9c4c73251..b0641e1a2 100644
--- a/src/transport/test_transport_api_reliability_http_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_peer1.conf
@@ -8,7 +8,7 @@ TOTAL_QUOTA_OUT = 1073741824
TOTAL_QUOTA_IN = 1073741824
[transport-tcp]
-TIMEOUT = 5000
+TIMEOUT = 5 s
[transport-http]
PORT = 12180
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
index 2ab9c8218..2efaef33a 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
@@ -4,8 +4,8 @@ SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf
[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
[nat]
BEHIND_NAT = YES
@@ -14,7 +14,7 @@ DISABLEV6 = YES
[transport-tcp]
PORT = 0
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 1204
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
index 366ed186c..19ac0bcda 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
@@ -4,8 +4,8 @@ SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf
[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
[nat]
DISABLEV6 = YES
@@ -13,7 +13,7 @@ ENABLE_NAT_CLIENT = YES
[transport-tcp]
PORT = 12030
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12034
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf
index 04e5935e3..123357e39 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf
@@ -4,12 +4,12 @@ SERVICEHOME = /tmp/test-transport/api-tcp-p1/
DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf
[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf
index 506aad2dc..7d6aea04b 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf
@@ -4,12 +4,12 @@ SERVICEHOME = /tmp/test-transport/api-tcp-p2/
DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf
[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 7e191dc51..78afb3db8 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -10,7 +10,7 @@ DISABLEV6 = YES
[transport-tcp]
PORT = 0
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 1204
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index 50f9fb580..d94ebb174 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -9,7 +9,7 @@ ENABLE_NAT_CLIENT = YES
[transport-tcp]
PORT = 12030
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12034
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 2df5a6175..8bfa37402 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 04500ea17..6bb7fadff 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf
index 0b47db9e7..89beecb52 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf
@@ -5,7 +5,7 @@ DEFAULTCONFIG = test_transport_api_timeout_tcp_peer1.conf
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
index 60a65dec5..72e62746f 100644
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -3,7 +3,7 @@ SERVICEHOME = /tmp/test-transport-api/
DEFAULTCONFIG = test_transport_defaults.conf
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
[arm]
DEFAULTSERVICES =
diff --git a/src/transport/transport.conf b/src/transport/transport.conf
index ded8e304d..7bd9de95e 100644
--- a/src/transport/transport.conf
+++ b/src/transport/transport.conf
@@ -32,7 +32,7 @@ ADVERTISED_PORT = 2086
# Maximum number of open TCP connections allowed
MAX_CONNECTIONS = 128
-TIMEOUT = 5000
+TIMEOUT = 5 s
# ACCEPT_FROM =
# ACCEPT_FROM6 =
# REJECT_FROM =
diff --git a/src/util/test_service_data.conf b/src/util/test_service_data.conf
index 9d283f955..7f6baaab1 100644
--- a/src/util/test_service_data.conf
+++ b/src/util/test_service_data.conf
@@ -2,7 +2,7 @@
PORT=12435
BINDTO=localhost
PIDFILE=/tmp/test-service.pid
-TIMEOUT=30000
+TIMEOUT=30 s
MAXBUF=1024
DISABLEV6=NO
ACCEPT_FROM=127.0.0.1;
@@ -14,7 +14,7 @@ HOSTNAME=localhost
[test_service6]
PORT=12435
PIDFILE=/tmp/test-service.pid
-TIMEOUT=30000
+TIMEOUT=30 s
MAXBUF=1024
DISABLEV6=NO
ACCEPT_FROM=127.0.0.1;
diff --git a/src/vpn/test-conf.conf b/src/vpn/test-conf.conf
index 2b6186b2d..ba1747774 100644
--- a/src/vpn/test-conf.conf
+++ b/src/vpn/test-conf.conf
@@ -17,7 +17,7 @@ HOME = $SERVICEHOME
[transport-tcp]
PORT = 2086
-TIMEOUT = 300000
+TIMEOUT = 300s
# MAXBUF =
# DISABLEV6 =
# BINDTO =