summaryrefslogtreecommitdiff
path: root/src/transport
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 /src/transport
parent775613176d9e33ccdc8bcd468cfb9aab288458c2 (diff)
add units to time, use configuration time api where appropriate, fixing Mantis #1875
Diffstat (limited to 'src/transport')
-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
26 files changed, 34 insertions, 34 deletions
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 =