diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-17 19:18:52 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-17 19:18:52 +0000 |
commit | 7dfd634b17df4e1505c62f2224380a0d38da2e8d (patch) | |
tree | dc8846d3455b9aa73f242ab79328bc943749de2c /src/transport | |
parent | 775613176d9e33ccdc8bcd468cfb9aab288458c2 (diff) | |
download | gnunet-7dfd634b17df4e1505c62f2224380a0d38da2e8d.tar.gz gnunet-7dfd634b17df4e1505c62f2224380a0d38da2e8d.zip |
add units to time, use configuration time api where appropriate, fixing Mantis #1875
Diffstat (limited to 'src/transport')
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 | |||
12 | 12 | ||
13 | [transport-tcp] | 13 | [transport-tcp] |
14 | PORT = 12000 | 14 | PORT = 12000 |
15 | TIMEOUT = 5000 | 15 | TIMEOUT = 5 s |
16 | 16 | ||
17 | [arm] | 17 | [arm] |
18 | PORT = 12005 | 18 | 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 | |||
12 | 12 | ||
13 | [transport-tcp] | 13 | [transport-tcp] |
14 | PORT = 12100 | 14 | PORT = 12100 |
15 | TIMEOUT = 5000 | 15 | TIMEOUT = 5 s |
16 | 16 | ||
17 | [arm] | 17 | [arm] |
18 | PORT = 12014 | 18 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 2368 | 7 | PORT = 2368 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 2366 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 2368 | 7 | PORT = 2368 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 2366 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12015 | 7 | PORT = 12015 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12014 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12015 | 7 | PORT = 12015 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12014 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12000 | 7 | PORT = 12000 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12005 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12015 | 7 | PORT = 12015 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12014 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12000 | 7 | PORT = 12000 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12005 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12015 | 7 | PORT = 12015 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12014 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12000 | 7 | PORT = 12000 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12005 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 0 | 7 | PORT = 0 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12014 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12140 | 7 | PORT = 12140 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [transport-udp] | 10 | [transport-udp] |
11 | PORT = 12141 | 11 | 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 | |||
8 | 8 | ||
9 | [transport-tcp] | 9 | [transport-tcp] |
10 | PORT = 12150 | 10 | PORT = 12150 |
11 | TIMEOUT = 5000 | 11 | TIMEOUT = 5 s |
12 | 12 | ||
13 | [transport-udp] | 13 | [transport-udp] |
14 | PORT = 12151 | 14 | 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 | |||
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | TOTAL_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [transport-tcp] | 10 | [transport-tcp] |
11 | TIMEOUT = 5000 | 11 | TIMEOUT = 5 s |
12 | 12 | ||
13 | [transport-http] | 13 | [transport-http] |
14 | PORT = 12180 | 14 | 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/ | |||
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [core] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | TOTAL_QUOTA_OUT = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | TOTAL_QUOTA_IN = 1 GB |
9 | 9 | ||
10 | [nat] | 10 | [nat] |
11 | BEHIND_NAT = YES | 11 | BEHIND_NAT = YES |
@@ -14,7 +14,7 @@ DISABLEV6 = YES | |||
14 | 14 | ||
15 | [transport-tcp] | 15 | [transport-tcp] |
16 | PORT = 0 | 16 | PORT = 0 |
17 | TIMEOUT = 5000 | 17 | TIMEOUT = 5 s |
18 | 18 | ||
19 | [arm] | 19 | [arm] |
20 | PORT = 1204 | 20 | 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/ | |||
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [core] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | TOTAL_QUOTA_OUT = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | TOTAL_QUOTA_IN = 1 GB |
9 | 9 | ||
10 | [nat] | 10 | [nat] |
11 | DISABLEV6 = YES | 11 | DISABLEV6 = YES |
@@ -13,7 +13,7 @@ ENABLE_NAT_CLIENT = YES | |||
13 | 13 | ||
14 | [transport-tcp] | 14 | [transport-tcp] |
15 | PORT = 12030 | 15 | PORT = 12030 |
16 | TIMEOUT = 5000 | 16 | TIMEOUT = 5 s |
17 | 17 | ||
18 | [arm] | 18 | [arm] |
19 | PORT = 12034 | 19 | 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/ | |||
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [core] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | TOTAL_QUOTA_OUT = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | TOTAL_QUOTA_IN = 1 GB |
9 | 9 | ||
10 | [transport-tcp] | 10 | [transport-tcp] |
11 | PORT = 12000 | 11 | PORT = 12000 |
12 | TIMEOUT = 5000 | 12 | TIMEOUT = 5 s |
13 | 13 | ||
14 | [arm] | 14 | [arm] |
15 | PORT = 12005 | 15 | 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/ | |||
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [core] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | TOTAL_QUOTA_OUT = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | TOTAL_QUOTA_IN = 1 GB |
9 | 9 | ||
10 | [transport-tcp] | 10 | [transport-tcp] |
11 | PORT = 12015 | 11 | PORT = 12015 |
12 | TIMEOUT = 5000 | 12 | TIMEOUT = 5 s |
13 | 13 | ||
14 | [arm] | 14 | [arm] |
15 | PORT = 12014 | 15 | 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 | |||
10 | 10 | ||
11 | [transport-tcp] | 11 | [transport-tcp] |
12 | PORT = 0 | 12 | PORT = 0 |
13 | TIMEOUT = 5000 | 13 | TIMEOUT = 5 s |
14 | 14 | ||
15 | [arm] | 15 | [arm] |
16 | PORT = 1204 | 16 | 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 | |||
9 | 9 | ||
10 | [transport-tcp] | 10 | [transport-tcp] |
11 | PORT = 12030 | 11 | PORT = 12030 |
12 | TIMEOUT = 5000 | 12 | TIMEOUT = 5 s |
13 | 13 | ||
14 | [arm] | 14 | [arm] |
15 | PORT = 12034 | 15 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12000 | 7 | PORT = 12000 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12005 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12015 | 7 | PORT = 12015 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12014 | 11 | 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 | |||
5 | 5 | ||
6 | [transport-tcp] | 6 | [transport-tcp] |
7 | PORT = 12000 | 7 | PORT = 12000 |
8 | TIMEOUT = 5000 | 8 | TIMEOUT = 5 s |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12005 | 11 | 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/ | |||
3 | DEFAULTCONFIG = test_transport_defaults.conf | 3 | DEFAULTCONFIG = test_transport_defaults.conf |
4 | 4 | ||
5 | [transport-tcp] | 5 | [transport-tcp] |
6 | TIMEOUT = 300000 | 6 | TIMEOUT = 300 s |
7 | 7 | ||
8 | [arm] | 8 | [arm] |
9 | DEFAULTSERVICES = | 9 | 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 | |||
32 | # Maximum number of open TCP connections allowed | 32 | # Maximum number of open TCP connections allowed |
33 | MAX_CONNECTIONS = 128 | 33 | MAX_CONNECTIONS = 128 |
34 | 34 | ||
35 | TIMEOUT = 5000 | 35 | TIMEOUT = 5 s |
36 | # ACCEPT_FROM = | 36 | # ACCEPT_FROM = |
37 | # ACCEPT_FROM6 = | 37 | # ACCEPT_FROM6 = |
38 | # REJECT_FROM = | 38 | # REJECT_FROM = |