aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
10ALLOW_NAT = NO 10ALLOW_NAT = NO
11 11
12[transport-tcp] 12[transport-tcp]
13TIMEOUT = 5000 13TIMEOUT = 5 s
14 14
15[transport-udp] 15[transport-udp]
16PORT = 2571 16PORT = 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,
92 struct GNUNET_BANDWIDTH_Tracker *tracker; 92 struct GNUNET_BANDWIDTH_Tracker *tracker;
93 93
94 tracker = GNUNET_CONTAINER_multihashmap_get (trackers, &peer->hashPubKey); 94 tracker = GNUNET_CONTAINER_multihashmap_get (trackers, &peer->hashPubKey);
95 GNUNET_break (NULL != tracker);
95 if (0 == ntohl (bandwidth_in.value__)) 96 if (0 == ntohl (bandwidth_in.value__))
96 { 97 {
97 GNUNET_assert (GNUNET_YES == 98 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
37EXTERNAL_ADDRESS = 127.0.0.1 37EXTERNAL_ADDRESS = 127.0.0.1
38 38
39[core] 39[core]
40TOTAL_QUOTA_IN = 91024000 40TOTAL_QUOTA_IN = 1 GB
41TOTAL_QUOTA_OUT = 91024000 41TOTAL_QUOTA_OUT = 1 GB
42AUTOSTART = YES 42AUTOSTART = YES
43PORT = 10003 43PORT = 10003
44 44
@@ -58,13 +58,13 @@ CONNECT_TOPOLOGY = NONE
58#PERCENTAGE = 3 58#PERCENTAGE = 3
59#PROBABILITY = .1 59#PROBABILITY = .1
60F2F = NO 60F2F = NO
61CONNECT_TIMEOUT = 60 61CONNECT_TIMEOUT = 60 s
62CONNECT_ATTEMPTS = 3 62CONNECT_ATTEMPTS = 3
63DEBUG = YES 63DEBUG = YES
64HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 64HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
65MAX_CONCURRENT_SSH = 10 65MAX_CONCURRENT_SSH = 10
66USE_PROGRESSBARS = YES 66USE_PROGRESSBARS = YES
67PEERGROUP_TIMEOUT = 2400 67PEERGROUP_TIMEOUT = 2400 s
68TOPOLOGY_OUTPUT_FILE = 2dtorus_topo_initial 68TOPOLOGY_OUTPUT_FILE = 2dtorus_topo_initial
69MAX_OUTSTANDING_CONNECTIONS = 75 69MAX_OUTSTANDING_CONNECTIONS = 75
70#SINGLE_PEERINFO_PER_HOST = YES 70#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
21MINIMUM-FRIENDS = 0 21MINIMUM-FRIENDS = 0
22 22
23[core] 23[core]
24TOTAL_QUOTA_OUT = 93932160 24TOTAL_QUOTA_OUT = 1 GB
25TOTAL_QUOTA_IN = 93932160 25TOTAL_QUOTA_IN = 1 GB
26PORT = 2092 26PORT = 2092
27 27
28[dht] 28[dht]
@@ -52,7 +52,7 @@ DEFAULTSERVICES =
52PORT = 2087 52PORT = 2087
53 53
54[transport-tcp] 54[transport-tcp]
55TIMEOUT = 300000 55TIMEOUT = 300 s
56PORT = 2094 56PORT = 2094
57 57
58[TESTING] 58[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
29PORT = 12365 29PORT = 12365
30 30
31[core] 31[core]
32TOTAL_QUOTA_OUT = 93932160 32TOTAL_QUOTA_OUT = 1 GB
33TOTAL_QUOTA_IN = 93932160 33TOTAL_QUOTA_IN = 1 GB
34PORT = 12092 34PORT = 12092
35 35
36[arm] 36[arm]
@@ -39,7 +39,7 @@ PORT = 12366
39DEBUG = NO 39DEBUG = NO
40 40
41[transport-tcp] 41[transport-tcp]
42TIMEOUT = 300000 42TIMEOUT = 300 s
43PORT = 12368 43PORT = 12368
44BINDTO = 127.0.0.1 44BINDTO = 127.0.0.1
45 45
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
46PLUGIN = mysql_dump 46PLUGIN = mysql_dump
47 47
48[core] 48[core]
49TOTAL_QUOTA_OUT = 93932160 49TOTAL_QUOTA_OUT = 1 GB
50TOTAL_QUOTA_IN = 93932160 50TOTAL_QUOTA_IN = 1 GB
51ACCEPT_FROM6 = ::1; 51ACCEPT_FROM6 = ::1;
52ACCEPT_FROM = 127.0.0.1; 52ACCEPT_FROM = 127.0.0.1;
53BINARY = gnunet-service-core 53BINARY = gnunet-service-core
@@ -69,7 +69,7 @@ PORT = 12366
69DEBUG = NO 69DEBUG = NO
70 70
71[transport-tcp] 71[transport-tcp]
72TIMEOUT = 300000 72TIMEOUT = 300 s
73PORT = 12368 73PORT = 12368
74BINDTO = 127.0.0.1 74BINDTO = 127.0.0.1
75 75
@@ -89,7 +89,7 @@ CONNECT_TOPOLOGY = NONE
89 89
90TOPOLOGY_FILE = multipeer_topo.dat 90TOPOLOGY_FILE = multipeer_topo.dat
91MAX_CONCURRENT_SSH = 1 91MAX_CONCURRENT_SSH = 1
92PEERGROUP_TIMEOUT = 10000 92PEERGROUP_TIMEOUT = 10 s
93USE_PROGRESSBARS = YES 93USE_PROGRESSBARS = YES
94#CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET 94#CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
95#CONNECT_TOPOLOGY_OPTION_MODIFIER = 2 95#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
26PORT = 12365 26PORT = 12365
27 27
28[core] 28[core]
29TOTAL_QUOTA_OUT = 93932160 29TOTAL_QUOTA_OUT = 1 GB
30TOTAL_QUOTA_IN = 93932160 30TOTAL_QUOTA_IN = 1 GB
31HOSTNAME = localhost 31HOSTNAME = localhost
32PORT = 12092 32PORT = 12092
33 33
@@ -37,7 +37,7 @@ PORT = 12366
37DEBUG = NO 37DEBUG = NO
38 38
39[transport-tcp] 39[transport-tcp]
40TIMEOUT = 300000 40TIMEOUT = 300 s
41PORT = 12368 41PORT = 12368
42BINDTO = 127.0.0.1 42BINDTO = 127.0.0.1
43 43
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
26# Maximum frequency we're allowed to poll the datastore 26# Maximum frequency we're allowed to poll the datastore
27# for content for migration (can be used to reduce 27# for content for migration (can be used to reduce
28# GNUnet's disk-IO rate) 28# GNUnet's disk-IO rate)
29MIN_MIGRATION_DELAY = 100 29MIN_MIGRATION_DELAY = 100 ms
30EXPECTED_NEIGHBOUR_COUNT = 128 30EXPECTED_NEIGHBOUR_COUNT = 128
31 31
32 32
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
47DEBUG = NO 47DEBUG = NO
48 48
49[transport-tcp] 49[transport-tcp]
50TIMEOUT = 300000 50TIMEOUT = 300 s
51PORT = 12368 51PORT = 12368
52 52
53[TESTING] 53[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
69#PERCENTAGE = 3 69#PERCENTAGE = 3
70#PROBABILITY = .1 70#PROBABILITY = .1
71F2F = NO 71F2F = NO
72CONNECT_TIMEOUT = 600 72CONNECT_TIMEOUT = 600 s
73CONNECT_ATTEMPTS = 2 73CONNECT_ATTEMPTS = 2
74DEBUG = YES 74DEBUG = YES
75HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 75HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
76MAX_CONCURRENT_SSH = 10 76MAX_CONCURRENT_SSH = 10
77USE_PROGRESSBARS = YES 77USE_PROGRESSBARS = YES
78PEERGROUP_TIMEOUT = 2400 78PEERGROUP_TIMEOUT = 2400 s
79TOPOLOGY_OUTPUT_FILE = mesh_topo_initial 79TOPOLOGY_OUTPUT_FILE = mesh_topo_initial
80MAX_OUTSTANDING_CONNECTIONS = 75 80MAX_OUTSTANDING_CONNECTIONS = 75
81#SINGLE_PEERINFO_PER_HOST = YES 81#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
47DEBUG = NO 47DEBUG = NO
48 48
49[transport-tcp] 49[transport-tcp]
50TIMEOUT = 300000 50TIMEOUT = 300 s
51PORT = 12368 51PORT = 12368
52 52
53[TESTING] 53[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,
769 mesh_peers = GNUNET_malloc (sizeof (uint16_t) * (num_peers + 1)); 769 mesh_peers = GNUNET_malloc (sizeof (uint16_t) * (num_peers + 1));
770 770
771 if (GNUNET_OK != 771 if (GNUNET_OK !=
772 GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small", 772 GNUNET_CONFIGURATION_get_value_time (testing_cfg, "test_mesh_small",
773 "wait_time", &temp_wait)) 773 "WAIT_TIME", &wait_time))
774 { 774 {
775 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 775 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
776 "Option test_mesh_small:wait_time is required!\n"); 776 "Option test_mesh_small:wait_time is required!\n");
@@ -806,9 +806,6 @@ run (void *cls, char *const *args, const char *cfgfile,
806 } 806 }
807 } 807 }
808 808
809 wait_time =
810 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
811
812 if (GNUNET_YES == 809 if (GNUNET_YES ==
813 GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small", 810 GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
814 "output_file", &temp_str)) 811 "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
40EXTERNAL_ADDRESS = 127.0.0.1 40EXTERNAL_ADDRESS = 127.0.0.1
41 41
42[core] 42[core]
43TOTAL_QUOTA_IN = 999111999 43TOTAL_QUOTA_IN = 1 GB
44TOTAL_QUOTA_OUT = 999111999 44TOTAL_QUOTA_OUT = 1 GB
45AUTOSTART = YES 45AUTOSTART = YES
46PORT = 10003 46PORT = 10003
47 47
@@ -69,13 +69,13 @@ CONNECT_TOPOLOGY = 2D_TORUS
69#PERCENTAGE = 3 69#PERCENTAGE = 3
70#PROBABILITY = .1 70#PROBABILITY = .1
71F2F = NO 71F2F = NO
72CONNECT_TIMEOUT = 660 72CONNECT_TIMEOUT = 660 s
73CONNECT_ATTEMPTS = 2 73CONNECT_ATTEMPTS = 2
74DEBUG = YES 74DEBUG = YES
75HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 75HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
76MAX_CONCURRENT_SSH = 10 76MAX_CONCURRENT_SSH = 10
77USE_PROGRESSBARS = YES 77USE_PROGRESSBARS = YES
78PEERGROUP_TIMEOUT = 2400 78PEERGROUP_TIMEOUT = 2400 s
79TOPOLOGY_OUTPUT_FILE = mesh_topo_initial 79TOPOLOGY_OUTPUT_FILE = mesh_topo_initial
80MAX_OUTSTANDING_CONNECTIONS = 75 80MAX_OUTSTANDING_CONNECTIONS = 75
81#SINGLE_PEERINFO_PER_HOST = YES 81#SINGLE_PEERINFO_PER_HOST = YES
@@ -85,6 +85,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75
85DELETE_FILES = YES 85DELETE_FILES = YES
86 86
87[test_mesh_small] 87[test_mesh_small]
88WAIT_TIME = 300 88WAIT_TIME = 300 s
89CONNECTION_LIMIT = 16 89CONNECTION_LIMIT = 16
90#DATA_OUTPUT_FILE=data_output 90#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,
479 mesh_peers = GNUNET_malloc (sizeof (GNUNET_PEER_Id) * (num_peers + 1)); 479 mesh_peers = GNUNET_malloc (sizeof (GNUNET_PEER_Id) * (num_peers + 1));
480 480
481 if (GNUNET_OK != 481 if (GNUNET_OK !=
482 GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small", 482 GNUNET_CONFIGURATION_get_value_time (testing_cfg, "test_mesh_small",
483 "wait_time", &temp_wait)) 483 "WAIT_TIME", &wait_time))
484 { 484 {
485 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 485 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
486 "Option test_mesh_small:wait_time is required!\n"); 486 "Option test_mesh_small:wait_time is required!\n");
@@ -516,9 +516,6 @@ run (void *cls, char *const *args, const char *cfgfile,
516 } 516 }
517 } 517 }
518 518
519 wait_time =
520 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
521
522 if (GNUNET_YES == 519 if (GNUNET_YES ==
523 GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small", 520 GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
524 "output_file", &temp_str)) 521 "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,
557 } 557 }
558 558
559 if (GNUNET_OK != 559 if (GNUNET_OK !=
560 GNUNET_CONFIGURATION_get_value_number (testing_cfg, "nse-profiler", 560 GNUNET_CONFIGURATION_get_value_time (testing_cfg, "nse-profiler",
561 "wait_time", &temp_wait)) 561 "WAIT_TIME", &wait_time))
562 { 562 {
563 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 563 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
564 "Option nse-profiler:wait_time is required!\n"); 564 "Option nse-profiler:wait_time is required!\n");
@@ -611,9 +611,6 @@ run (void *cls, char *const *args, const char *cfgfile,
611 } 611 }
612 612
613 613
614 wait_time =
615 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
616
617 if (GNUNET_YES == 614 if (GNUNET_YES ==
618 GNUNET_CONFIGURATION_get_value_string (cfg, "nse-profiler", "output_file", 615 GNUNET_CONFIGURATION_get_value_string (cfg, "nse-profiler", "output_file",
619 &temp_str)) 616 &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
14HISTOGRAM = $SERVICEHOME/nse-history.log 14HISTOGRAM = $SERVICEHOME/nse-history.log
15 15
16# How 'slowly' should the proof-of-work be constructed (delay 16# How 'slowly' should the proof-of-work be constructed (delay
17# between rounds in ms); sane values between 0 and ~1000. 17# between rounds); sane values between 0 and ~1000.
18WORKDELAY = 5 18WORKDELAY = 5 ms
19 19
20# Note: changing any of the values below will make this peer 20# Note: changing any of the values below will make this peer
21# completely incompatible with other peers! 21# completely incompatible with other peers!
22INTERVAL = 3600000 22INTERVAL = 1 h
23WORKBITS = 20 23WORKBITS = 20
24 24
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
13CONFIG = $DEFAULTCONFIG 13CONFIG = $DEFAULTCONFIG
14# Overriding network settings for faster testing (do NOT use 14# Overriding network settings for faster testing (do NOT use
15# these values in production just because they are here) 15# these values in production just because they are here)
16WORKDELAY = 10000 16WORKDELAY = 10 s
17INTERVAL = 15000 17INTERVAL = 15 s
18WORKBITS = 0 18WORKBITS = 0
19PROOFFILE = $SERVICEHOME/nse.proof 19PROOFFILE = $SERVICEHOME/nse.proof
20 20
@@ -80,13 +80,13 @@ CONNECT_TOPOLOGY = SMALL_WORLD_RING
80PERCENTAGE = 3 80PERCENTAGE = 3
81#PROBABILITY = .1 81#PROBABILITY = .1
82F2F = NO 82F2F = NO
83CONNECT_TIMEOUT = 60 83CONNECT_TIMEOUT = 60 s
84CONNECT_ATTEMPTS = 3 84CONNECT_ATTEMPTS = 3
85#DEBUG = YES 85#DEBUG = YES
86HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 86HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
87MAX_CONCURRENT_SSH = 20 87MAX_CONCURRENT_SSH = 20
88USE_PROGRESSBARS = YES 88USE_PROGRESSBARS = YES
89PEERGROUP_TIMEOUT = 1000 89PEERGROUP_TIMEOUT = 1000 s
90TOPOLOGY_OUTPUT_FILE = nse_topo_1000_peers_initial 90TOPOLOGY_OUTPUT_FILE = nse_topo_1000_peers_initial
91MAX_OUTSTANDING_CONNECTIONS = 200 91MAX_OUTSTANDING_CONNECTIONS = 200
92#SINGLE_PEERINFO_PER_HOST = YES 92#SINGLE_PEERINFO_PER_HOST = YES
@@ -105,5 +105,5 @@ TOPOLOGY_OUTPUT_FILE = nse_topo_100_peers
105#ROUND3 = 100 105#ROUND3 = 100
106#ROUND2 = 500 106#ROUND2 = 500
107#ROUND3 = 1000 107#ROUND3 = 1000
108WAIT_TIME = 120 108WAIT_TIME = 120 s
109CONNECTION_LIMIT = 10 109CONNECTION_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
14PROOFFILE = $SERVICEHOME/proof.nse 14PROOFFILE = $SERVICEHOME/proof.nse
15# Overriding network settings for faster testing (do NOT use 15# Overriding network settings for faster testing (do NOT use
16# these values in production just because they are here) 16# these values in production just because they are here)
17WORKDELAY = 1 17WORKDELAY = 1 ms
18INTERVAL = 60000 18INTERVAL = 60 s
19WORKBITS = 1 19WORKBITS = 1
20 20
21HISTOGRAM = $SERVICEHOME/nse-histogram 21HISTOGRAM = $SERVICEHOME/nse-histogram
@@ -64,13 +64,13 @@ TOPOLOGY = NONE
64CONNECT_TOPOLOGY = SMALL_WORLD_RING 64CONNECT_TOPOLOGY = SMALL_WORLD_RING
65PERCENTAGE = 3 65PERCENTAGE = 3
66F2F = NO 66F2F = NO
67CONNECT_TIMEOUT = 60 67CONNECT_TIMEOUT = 60 s
68CONNECT_ATTEMPTS = 3 68CONNECT_ATTEMPTS = 3
69#DEBUG = YES 69#DEBUG = YES
70HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 70HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
71MAX_CONCURRENT_SSH = 20 71MAX_CONCURRENT_SSH = 20
72USE_PROGRESSBARS = YES 72USE_PROGRESSBARS = YES
73PEERGROUP_TIMEOUT = 1000 73PEERGROUP_TIMEOUT = 1000 s
74 74
75DELETE_FILES = NO 75DELETE_FILES = NO
76 76
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
40EXTERNAL_ADDRESS = 127.0.0.1 40EXTERNAL_ADDRESS = 127.0.0.1
41 41
42[core] 42[core]
43TOTAL_QUOTA_IN = 999111999 43TOTAL_QUOTA_IN = 1 GB
44TOTAL_QUOTA_OUT = 999111999 44TOTAL_QUOTA_OUT = 1 GB
45AUTOSTART = YES 45AUTOSTART = YES
46PORT = 10003 46PORT = 10003
47 47
@@ -61,13 +61,13 @@ CONNECT_TOPOLOGY = 2D_TORUS
61#PERCENTAGE = 3 61#PERCENTAGE = 3
62#PROBABILITY = .1 62#PROBABILITY = .1
63F2F = NO 63F2F = NO
64CONNECT_TIMEOUT = 600 64CONNECT_TIMEOUT = 600 s
65CONNECT_ATTEMPTS = 2 65CONNECT_ATTEMPTS = 2
66DEBUG = YES 66DEBUG = YES
67HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 67HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
68MAX_CONCURRENT_SSH = 10 68MAX_CONCURRENT_SSH = 10
69USE_PROGRESSBARS = YES 69USE_PROGRESSBARS = YES
70PEERGROUP_TIMEOUT = 2400 70PEERGROUP_TIMEOUT = 2400 s
71TOPOLOGY_OUTPUT_FILE = testing_topo_initial 71TOPOLOGY_OUTPUT_FILE = testing_topo_initial
72MAX_OUTSTANDING_CONNECTIONS = 75 72MAX_OUTSTANDING_CONNECTIONS = 75
73#SINGLE_PEERINFO_PER_HOST = YES 73#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 @@
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[TESTING] 5[TESTING]
6CONNECT_TIMEOUT = 180 6CONNECT_TIMEOUT = 180 s
7CONNECT_ATTEMPTS = 14 7CONNECT_ATTEMPTS = 14
8NUM_PEERS = 4 8NUM_PEERS = 4
9TOPOLOGY = CLIQUE 9TOPOLOGY = CLIQUE
10 10SETTLE_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 @@
3DEFAULTCONFIG = test_testing_data_topology_clique.conf 3DEFAULTCONFIG = test_testing_data_topology_clique.conf
4 4
5[TESTING] 5[TESTING]
6SETTLE_TIME = 600 6SETTLE_TIME = 600 s
7NUM_PEERS = 2 7NUM_PEERS = 2
8TOPOLOGY = CLIQUE 8TOPOLOGY = CLIQUE
9 9
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,
1043 GNUNET_free_non_null (topology_str); 1043 GNUNET_free_non_null (topology_str);
1044 GNUNET_free_non_null (blacklist_topology_str); 1044 GNUNET_free_non_null (blacklist_topology_str);
1045 1045
1046 if (GNUNET_OK == 1046 if (GNUNET_OK !=
1047 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time", 1047 GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SETTLE_TIME",
1048 &temp_settle)) 1048 &settle_time))
1049 settle_time = 1049 {
1050 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle); 1050 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
1051 1051 "testing", "SETTLE_TIME");
1052 return;
1053 }
1052 if (GNUNET_SYSERR == 1054 if (GNUNET_SYSERR ==
1053 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers", 1055 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
1054 &num_peers)) 1056 &num_peers))
1055 num_peers = DEFAULT_NUM_PEERS; 1057 num_peers = DEFAULT_NUM_PEERS;
1056 1058
1057 if (GNUNET_OK == 1059 if (GNUNET_OK !=
1058 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout", 1060 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "CONNECT_TIMEOUT",
1059 &temp_settle)) 1061 &connect_timeout))
1060 connect_timeout =
1061 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
1062 else
1063 { 1062 {
1064 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", 1063 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
1065 "testing", "connect_timeout"); 1064 "testing", "CONNECT_TIMEOUT");
1066 return; 1065 return;
1067 } 1066 }
1068 1067
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
6CONNECT_ATTEMPTS = 2 6CONNECT_ATTEMPTS = 2
7MAX_OUTSTANDING_CONNECTIONS = 20 7MAX_OUTSTANDING_CONNECTIONS = 20
8MAX_CONCURRENT_SSH = 1 8MAX_CONCURRENT_SSH = 1
9PEERGROUP_TIMEOUT = 300 9PEERGROUP_TIMEOUT = 300 s
10TOPOLOGY = CLIQUE 10TOPOLOGY = CLIQUE
11PERCENTAGE = 0.5 11PERCENTAGE = 0.5
12PROBABILITY = 0.5 12PROBABILITY = 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,
999 char *blacklist_topology_str; 999 char *blacklist_topology_str;
1000 char *connect_topology_option_str; 1000 char *connect_topology_option_str;
1001 char *connect_topology_option_modifier_string; 1001 char *connect_topology_option_modifier_string;
1002 unsigned long long temp_settle;
1003 unsigned long long max_outstanding_connections; 1002 unsigned long long max_outstanding_connections;
1004 1003
1005 ok = 1; 1004 ok = 1;
@@ -1101,21 +1100,21 @@ run (void *cls, char *const *args, const char *cfgfile,
1101 GNUNET_free_non_null (topology_str); 1100 GNUNET_free_non_null (topology_str);
1102 GNUNET_free_non_null (blacklist_topology_str); 1101 GNUNET_free_non_null (blacklist_topology_str);
1103 1102
1104 if (GNUNET_OK == 1103 if (GNUNET_OK !=
1105 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time", 1104 GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SETTLE_TIME",
1106 &temp_settle)) 1105 &settle_time))
1107 settle_time = 1106 {
1108 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle); 1107 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
1109 1108 "testing", "SETTLE_TIME");
1110 if (GNUNET_OK == 1109 return;
1111 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout", 1110 }
1112 &temp_settle)) 1111
1113 connect_timeout = 1112 if (GNUNET_OK !=
1114 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle); 1113 GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "CONNECT_TIMEOUT",
1115 else 1114 &connect_timeout))
1116 { 1115 {
1117 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", 1116 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
1118 "testing", "connect_timeout"); 1117 "testing", "CONNECT_TIMEOUT");
1119 return; 1118 return;
1120 } 1119 }
1121 1120
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,
390 unsigned long long connect_topology_num; 390 unsigned long long connect_topology_num;
391 unsigned long long blacklist_topology_num; 391 unsigned long long blacklist_topology_num;
392 unsigned long long connect_topology_option_num; 392 unsigned long long connect_topology_option_num;
393 unsigned long long temp_connect;
394 char *connect_topology_option_modifier_string; 393 char *connect_topology_option_modifier_string;
395 394
396 ok = 1; 395 ok = 1;
@@ -485,15 +484,12 @@ run (void *cls, char *const *args, const char *cfgfile,
485 &num_peers)) 484 &num_peers))
486 num_peers = DEFAULT_NUM_PEERS; 485 num_peers = DEFAULT_NUM_PEERS;
487 486
488 if (GNUNET_OK == 487 if (GNUNET_OK !=
489 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout", 488 GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "CONNECT_TIMEOUT",
490 &temp_connect)) 489 &connect_timeout))
491 connect_timeout =
492 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_connect);
493 else
494 { 490 {
495 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", 491 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
496 "testing", "connect_timeout"); 492 "testing", "CONNECT_TIMEOUT");
497 return; 493 return;
498 } 494 }
499 495
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 @@
1[TESTING] 1[TESTING]
2# How long before failing a connection? 2# How long before failing a connection?
3CONNECT_TIMEOUT = 30 3CONNECT_TIMEOUT = 30 s
4# How many connect attempts should we make? 4# How many connect attempts should we make?
5CONNECT_ATTEMPTS = 3 5CONNECT_ATTEMPTS = 3
6# How many connections can happen simultaneously? 6# 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 @@
33#include "gnunet_disk_lib.h" 33#include "gnunet_disk_lib.h"
34 34
35/** Globals **/ 35/** Globals **/
36#define DEFAULT_CONNECT_TIMEOUT 30 // FIXME: use fancy time 36#define DEFAULT_CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
37 37
38#define DEFAULT_CONNECT_ATTEMPTS 2 38#define DEFAULT_CONNECT_ATTEMPTS 2
39 39
@@ -55,7 +55,7 @@ struct PeerGroupStartupContext
55 /** 55 /**
56 * How long to spend trying to establish all the connections? 56 * How long to spend trying to establish all the connections?
57 */ 57 */
58 unsigned long long connect_timeout; // FIXME: use fancy time 58 struct GNUNET_TIME_Relative connect_timeout;
59 59
60 unsigned long long max_concurrent_ssh; 60 unsigned long long max_concurrent_ssh;
61 struct GNUNET_TIME_Absolute timeout; 61 struct GNUNET_TIME_Absolute timeout;
@@ -508,10 +508,7 @@ internal_peers_started_callback (void *cls,
508 pg_start_ctx->connect_topology, 508 pg_start_ctx->connect_topology,
509 pg_start_ctx->connect_topology_option, 509 pg_start_ctx->connect_topology_option,
510 pg_start_ctx->connect_topology_option_modifier, 510 pg_start_ctx->connect_topology_option_modifier,
511 // FIXME: use fancy time 511 pg_start_ctx->connect_timeout,
512 GNUNET_TIME_relative_multiply(
513 GNUNET_TIME_UNIT_SECONDS,
514 pg_start_ctx->connect_timeout),
515 pg_start_ctx->connect_attempts, NULL, 512 pg_start_ctx->connect_attempts, NULL,
516 NULL); 513 NULL);
517 514
@@ -740,6 +737,7 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
740 unsigned long long temp_config_number; 737 unsigned long long temp_config_number;
741 char *temp_str; 738 char *temp_str;
742 int temp; 739 int temp;
740 struct GNUNET_TIME_Relative rtimeout;
743 741
744 GNUNET_assert (total > 0); 742 GNUNET_assert (total > 0);
745 GNUNET_assert (cfg != NULL); 743 GNUNET_assert (cfg != NULL);
@@ -757,10 +755,10 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
757 } 755 }
758 756
759 if (GNUNET_OK != 757 if (GNUNET_OK !=
760 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout", 758 GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "CONNECT_TIMEOUT",
761 &pg_start_ctx->connect_timeout)) 759 &pg_start_ctx->connect_timeout))
762 { 760 {
763 pg_start_ctx->connect_timeout = DEFAULT_CONNECT_TIMEOUT; 761 pg_start_ctx->connect_timeout = DEFAULT_CONNECT_TIMEOUT;
764 } 762 }
765 763
766 if (GNUNET_OK != 764 if (GNUNET_OK !=
@@ -796,21 +794,18 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
796 return NULL; 794 return NULL;
797 } 795 }
798 796
799 if (GNUNET_OK == 797 if (GNUNET_OK !=
800 GNUNET_CONFIGURATION_get_value_number (cfg, "testing", 798 GNUNET_CONFIGURATION_get_value_number (cfg, "testing",
801 "peergroup_timeout", 799 "PEERGROUP_TIMEOUT",
802 &temp_config_number)) 800 &rtimeout))
803 pg_start_ctx->timeout =
804 GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply
805 (GNUNET_TIME_UNIT_SECONDS,
806 temp_config_number));
807 else
808 { 801 {
809 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", 802 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
810 "testing", "peergroup_timeout"); 803 "testing", "PEERGROUP_TIMEOUT");
811 GNUNET_free (pg_start_ctx); 804 GNUNET_free (pg_start_ctx);
812 return NULL; 805 return NULL;
813 } 806 }
807 pg_start_ctx->timeout =
808 GNUNET_TIME_relative_to_absolute (rtimeout);
814 809
815 810
816 /* Read topology related options from the configuration file */ 811 /* 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
12 12
13[transport-tcp] 13[transport-tcp]
14PORT = 12000 14PORT = 12000
15TIMEOUT = 5000 15TIMEOUT = 5 s
16 16
17[arm] 17[arm]
18PORT = 12005 18PORT = 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
12 12
13[transport-tcp] 13[transport-tcp]
14PORT = 12100 14PORT = 12100
15TIMEOUT = 5000 15TIMEOUT = 5 s
16 16
17[arm] 17[arm]
18PORT = 12014 18PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 2368 7PORT = 2368
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 2366 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 2368 7PORT = 2368
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 2366 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12015 7PORT = 12015
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12014 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12015 7PORT = 12015
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12014 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12000 7PORT = 12000
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12005 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12015 7PORT = 12015
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12014 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12000 7PORT = 12000
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12005 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12015 7PORT = 12015
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12014 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12000 7PORT = 12000
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12005 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 0 7PORT = 0
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12014 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12140 7PORT = 12140
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[transport-udp] 10[transport-udp]
11PORT = 12141 11PORT = 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
8 8
9[transport-tcp] 9[transport-tcp]
10PORT = 12150 10PORT = 12150
11TIMEOUT = 5000 11TIMEOUT = 5 s
12 12
13[transport-udp] 13[transport-udp]
14PORT = 12151 14PORT = 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
8TOTAL_QUOTA_IN = 1073741824 8TOTAL_QUOTA_IN = 1073741824
9 9
10[transport-tcp] 10[transport-tcp]
11TIMEOUT = 5000 11TIMEOUT = 5 s
12 12
13[transport-http] 13[transport-http]
14PORT = 12180 14PORT = 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/
4DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf 4DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf
5 5
6[core] 6[core]
7TOTAL_QUOTA_OUT = 1073741824 7TOTAL_QUOTA_OUT = 1 GB
8TOTAL_QUOTA_IN = 1073741824 8TOTAL_QUOTA_IN = 1 GB
9 9
10[nat] 10[nat]
11BEHIND_NAT = YES 11BEHIND_NAT = YES
@@ -14,7 +14,7 @@ DISABLEV6 = YES
14 14
15[transport-tcp] 15[transport-tcp]
16PORT = 0 16PORT = 0
17TIMEOUT = 5000 17TIMEOUT = 5 s
18 18
19[arm] 19[arm]
20PORT = 1204 20PORT = 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/
4DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf 4DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf
5 5
6[core] 6[core]
7TOTAL_QUOTA_OUT = 1073741824 7TOTAL_QUOTA_OUT = 1 GB
8TOTAL_QUOTA_IN = 1073741824 8TOTAL_QUOTA_IN = 1 GB
9 9
10[nat] 10[nat]
11DISABLEV6 = YES 11DISABLEV6 = YES
@@ -13,7 +13,7 @@ ENABLE_NAT_CLIENT = YES
13 13
14[transport-tcp] 14[transport-tcp]
15PORT = 12030 15PORT = 12030
16TIMEOUT = 5000 16TIMEOUT = 5 s
17 17
18[arm] 18[arm]
19PORT = 12034 19PORT = 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/
4DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf 4DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf
5 5
6[core] 6[core]
7TOTAL_QUOTA_OUT = 1073741824 7TOTAL_QUOTA_OUT = 1 GB
8TOTAL_QUOTA_IN = 1073741824 8TOTAL_QUOTA_IN = 1 GB
9 9
10[transport-tcp] 10[transport-tcp]
11PORT = 12000 11PORT = 12000
12TIMEOUT = 5000 12TIMEOUT = 5 s
13 13
14[arm] 14[arm]
15PORT = 12005 15PORT = 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/
4DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf 4DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf
5 5
6[core] 6[core]
7TOTAL_QUOTA_OUT = 1073741824 7TOTAL_QUOTA_OUT = 1 GB
8TOTAL_QUOTA_IN = 1073741824 8TOTAL_QUOTA_IN = 1 GB
9 9
10[transport-tcp] 10[transport-tcp]
11PORT = 12015 11PORT = 12015
12TIMEOUT = 5000 12TIMEOUT = 5 s
13 13
14[arm] 14[arm]
15PORT = 12014 15PORT = 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
10 10
11[transport-tcp] 11[transport-tcp]
12PORT = 0 12PORT = 0
13TIMEOUT = 5000 13TIMEOUT = 5 s
14 14
15[arm] 15[arm]
16PORT = 1204 16PORT = 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
9 9
10[transport-tcp] 10[transport-tcp]
11PORT = 12030 11PORT = 12030
12TIMEOUT = 5000 12TIMEOUT = 5 s
13 13
14[arm] 14[arm]
15PORT = 12034 15PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12000 7PORT = 12000
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12005 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12015 7PORT = 12015
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12014 11PORT = 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
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12000 7PORT = 12000
8TIMEOUT = 5000 8TIMEOUT = 5 s
9 9
10[arm] 10[arm]
11PORT = 12005 11PORT = 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/
3DEFAULTCONFIG = test_transport_defaults.conf 3DEFAULTCONFIG = test_transport_defaults.conf
4 4
5[transport-tcp] 5[transport-tcp]
6TIMEOUT = 300000 6TIMEOUT = 300 s
7 7
8[arm] 8[arm]
9DEFAULTSERVICES = 9DEFAULTSERVICES =
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
32# Maximum number of open TCP connections allowed 32# Maximum number of open TCP connections allowed
33MAX_CONNECTIONS = 128 33MAX_CONNECTIONS = 128
34 34
35TIMEOUT = 5000 35TIMEOUT = 5 s
36# ACCEPT_FROM = 36# ACCEPT_FROM =
37# ACCEPT_FROM6 = 37# ACCEPT_FROM6 =
38# REJECT_FROM = 38# 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 @@
2PORT=12435 2PORT=12435
3BINDTO=localhost 3BINDTO=localhost
4PIDFILE=/tmp/test-service.pid 4PIDFILE=/tmp/test-service.pid
5TIMEOUT=30000 5TIMEOUT=30 s
6MAXBUF=1024 6MAXBUF=1024
7DISABLEV6=NO 7DISABLEV6=NO
8ACCEPT_FROM=127.0.0.1; 8ACCEPT_FROM=127.0.0.1;
@@ -14,7 +14,7 @@ HOSTNAME=localhost
14[test_service6] 14[test_service6]
15PORT=12435 15PORT=12435
16PIDFILE=/tmp/test-service.pid 16PIDFILE=/tmp/test-service.pid
17TIMEOUT=30000 17TIMEOUT=30 s
18MAXBUF=1024 18MAXBUF=1024
19DISABLEV6=NO 19DISABLEV6=NO
20ACCEPT_FROM=127.0.0.1; 20ACCEPT_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
17 17
18[transport-tcp] 18[transport-tcp]
19PORT = 2086 19PORT = 2086
20TIMEOUT = 300000 20TIMEOUT = 300s
21# MAXBUF = 21# MAXBUF =
22# DISABLEV6 = 22# DISABLEV6 =
23# BINDTO = 23# BINDTO =