[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18196 - in gnunet/src: ats ats-test dht fs mesh nse testin
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18196 - in gnunet/src: ats ats-test dht fs mesh nse testing transport util vpn |
|
Date: |
Thu, 17 Nov 2011 20:18:52 +0100 |
Author: grothoff
Date: 2011-11-17 20:18:52 +0100 (Thu, 17 Nov 2011)
New Revision: 18196
Modified:
gnunet/src/ats-test/test_transport_ats_4addr.conf
gnunet/src/ats/gnunet-service-ats_reservations.c
gnunet/src/dht/test_dht_2dtorus.conf
gnunet/src/dht/test_dht_api_data.conf
gnunet/src/dht/test_dht_api_peer1.conf
gnunet/src/dht/test_dht_multipeer_data.conf
gnunet/src/dht/test_dht_twopeer_data.conf
gnunet/src/fs/fs.conf
gnunet/src/mesh/test_mesh.conf
gnunet/src/mesh/test_mesh_2dtorus.conf
gnunet/src/mesh/test_mesh_path.conf
gnunet/src/mesh/test_mesh_small.c
gnunet/src/mesh/test_mesh_small.conf
gnunet/src/mesh/test_mesh_small_unicast_far.c
gnunet/src/nse/gnunet-nse-profiler.c
gnunet/src/nse/nse.conf
gnunet/src/nse/nse_profiler_test.conf
gnunet/src/nse/test_nse.conf
gnunet/src/testing/test_testing_2dtorus.conf
gnunet/src/testing/test_testing_data_topology_clique.conf
gnunet/src/testing/test_testing_data_topology_stability.conf
gnunet/src/testing/test_testing_large_topology.c
gnunet/src/testing/test_testing_peergroup_data.conf
gnunet/src/testing/test_testing_topology.c
gnunet/src/testing/test_testing_topology_blacklist.c
gnunet/src/testing/testing.conf
gnunet/src/testing/testing_peergroup.c
gnunet/src/transport/template_cfg_peer1.conf
gnunet/src/transport/template_cfg_peer2.conf
gnunet/src/transport/test_plugin_transport_data.conf
gnunet/src/transport/test_quota_compliance_data.conf
gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
gnunet/src/transport/test_transport_api_multi_peer1.conf
gnunet/src/transport/test_transport_api_multi_peer2.conf
gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_tcp_peer1.conf
gnunet/src/transport/test_transport_api_tcp_peer2.conf
gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
gnunet/src/transport/test_transport_defaults.conf
gnunet/src/transport/transport.conf
gnunet/src/util/test_service_data.conf
gnunet/src/vpn/test-conf.conf
Log:
add units to time, use configuration time api where appropriate, fixing Mantis
#1875
Modified: gnunet/src/ats/gnunet-service-ats_reservations.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_reservations.c 2011-11-17 18:16:59 UTC
(rev 18195)
+++ gnunet/src/ats/gnunet-service-ats_reservations.c 2011-11-17 19:18:52 UTC
(rev 18196)
@@ -92,6 +92,7 @@
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 ==
Modified: gnunet/src/ats-test/test_transport_ats_4addr.conf
===================================================================
--- gnunet/src/ats-test/test_transport_ats_4addr.conf 2011-11-17 18:16:59 UTC
(rev 18195)
+++ gnunet/src/ats-test/test_transport_ats_4addr.conf 2011-11-17 19:18:52 UTC
(rev 18196)
@@ -10,7 +10,7 @@
ALLOW_NAT = NO
[transport-tcp]
-TIMEOUT = 5000
+TIMEOUT = 5 s
[transport-udp]
PORT = 2571
Modified: gnunet/src/dht/test_dht_2dtorus.conf
===================================================================
--- gnunet/src/dht/test_dht_2dtorus.conf 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/dht/test_dht_2dtorus.conf 2011-11-17 19:18:52 UTC (rev
18196)
@@ -37,8 +37,8 @@
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 @@
#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
Modified: gnunet/src/dht/test_dht_api_data.conf
===================================================================
--- gnunet/src/dht/test_dht_api_data.conf 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/dht/test_dht_api_data.conf 2011-11-17 19:18:52 UTC (rev
18196)
@@ -21,8 +21,8 @@
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 @@
PORT = 2087
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 2094
[TESTING]
Modified: gnunet/src/dht/test_dht_api_peer1.conf
===================================================================
--- gnunet/src/dht/test_dht_api_peer1.conf 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/dht/test_dht_api_peer1.conf 2011-11-17 19:18:52 UTC (rev
18196)
@@ -29,8 +29,8 @@
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 @@
DEBUG = NO
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 12368
BINDTO = 127.0.0.1
Modified: gnunet/src/dht/test_dht_multipeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer_data.conf 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/dht/test_dht_multipeer_data.conf 2011-11-17 19:18:52 UTC (rev
18196)
@@ -46,8 +46,8 @@
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 @@
DEBUG = NO
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 12368
BINDTO = 127.0.0.1
@@ -89,7 +89,7 @@
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
Modified: gnunet/src/dht/test_dht_twopeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_twopeer_data.conf 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/dht/test_dht_twopeer_data.conf 2011-11-17 19:18:52 UTC (rev
18196)
@@ -26,8 +26,8 @@
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 @@
DEBUG = NO
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 12368
BINDTO = 127.0.0.1
Modified: gnunet/src/fs/fs.conf
===================================================================
--- gnunet/src/fs/fs.conf 2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/fs/fs.conf 2011-11-17 19:18:52 UTC (rev 18196)
@@ -26,7 +26,7 @@
# 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
Modified: gnunet/src/mesh/test_mesh.conf
===================================================================
--- gnunet/src/mesh/test_mesh.conf 2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/mesh/test_mesh.conf 2011-11-17 19:18:52 UTC (rev 18196)
@@ -47,7 +47,7 @@
DEBUG = NO
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 12368
[TESTING]
Modified: gnunet/src/mesh/test_mesh_2dtorus.conf
===================================================================
--- gnunet/src/mesh/test_mesh_2dtorus.conf 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/mesh/test_mesh_2dtorus.conf 2011-11-17 19:18:52 UTC (rev
18196)
@@ -69,13 +69,13 @@
#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
Modified: gnunet/src/mesh/test_mesh_path.conf
===================================================================
--- gnunet/src/mesh/test_mesh_path.conf 2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/mesh/test_mesh_path.conf 2011-11-17 19:18:52 UTC (rev 18196)
@@ -47,7 +47,7 @@
DEBUG = NO
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
PORT = 12368
[TESTING]
Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c 2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/mesh/test_mesh_small.c 2011-11-17 19:18:52 UTC (rev 18196)
@@ -769,8 +769,8 @@
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 @@
}
}
- 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))
Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/mesh/test_mesh_small.conf 2011-11-17 19:18:52 UTC (rev
18196)
@@ -40,8 +40,8 @@
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 @@
#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 @@
DELETE_FILES = YES
[test_mesh_small]
-WAIT_TIME = 300
+WAIT_TIME = 300 s
CONNECTION_LIMIT = 16
#DATA_OUTPUT_FILE=data_output
Modified: gnunet/src/mesh/test_mesh_small_unicast_far.c
===================================================================
--- gnunet/src/mesh/test_mesh_small_unicast_far.c 2011-11-17 18:16:59 UTC
(rev 18195)
+++ gnunet/src/mesh/test_mesh_small_unicast_far.c 2011-11-17 19:18:52 UTC
(rev 18196)
@@ -479,8 +479,8 @@
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 @@
}
}
- 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))
Modified: gnunet/src/nse/gnunet-nse-profiler.c
===================================================================
--- gnunet/src/nse/gnunet-nse-profiler.c 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/nse/gnunet-nse-profiler.c 2011-11-17 19:18:52 UTC (rev
18196)
@@ -557,8 +557,8 @@
}
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 @@
}
- 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))
Modified: gnunet/src/nse/nse.conf
===================================================================
--- gnunet/src/nse/nse.conf 2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/nse/nse.conf 2011-11-17 19:18:52 UTC (rev 18196)
@@ -14,11 +14,11 @@
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
Modified: gnunet/src/nse/nse_profiler_test.conf
===================================================================
--- gnunet/src/nse/nse_profiler_test.conf 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/nse/nse_profiler_test.conf 2011-11-17 19:18:52 UTC (rev
18196)
@@ -13,8 +13,8 @@
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 @@
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 @@
#ROUND3 = 100
#ROUND2 = 500
#ROUND3 = 1000
-WAIT_TIME = 120
+WAIT_TIME = 120 s
CONNECTION_LIMIT = 10
Modified: gnunet/src/nse/test_nse.conf
===================================================================
--- gnunet/src/nse/test_nse.conf 2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/nse/test_nse.conf 2011-11-17 19:18:52 UTC (rev 18196)
@@ -14,8 +14,8 @@
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 @@
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
Modified: gnunet/src/testing/test_testing_2dtorus.conf
===================================================================
--- gnunet/src/testing/test_testing_2dtorus.conf 2011-11-17 18:16:59 UTC
(rev 18195)
+++ gnunet/src/testing/test_testing_2dtorus.conf 2011-11-17 19:18:52 UTC
(rev 18196)
@@ -40,8 +40,8 @@
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 @@
#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
Modified: gnunet/src/testing/test_testing_data_topology_clique.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/testing/test_testing_data_topology_clique.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -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
Modified: gnunet/src/testing/test_testing_data_topology_stability.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_stability.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/testing/test_testing_data_topology_stability.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -3,7 +3,7 @@
DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING]
-SETTLE_TIME = 600
+SETTLE_TIME = 600 s
NUM_PEERS = 2
TOPOLOGY = CLIQUE
Modified: gnunet/src/testing/test_testing_large_topology.c
===================================================================
--- gnunet/src/testing/test_testing_large_topology.c 2011-11-17 18:16:59 UTC
(rev 18195)
+++ gnunet/src/testing/test_testing_large_topology.c 2011-11-17 19:18:52 UTC
(rev 18196)
@@ -1043,26 +1043,25 @@
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;
}
Modified: gnunet/src/testing/test_testing_peergroup_data.conf
===================================================================
--- gnunet/src/testing/test_testing_peergroup_data.conf 2011-11-17 18:16:59 UTC
(rev 18195)
+++ gnunet/src/testing/test_testing_peergroup_data.conf 2011-11-17 19:18:52 UTC
(rev 18196)
@@ -6,7 +6,7 @@
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
Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/testing/test_testing_topology.c 2011-11-17 19:18:52 UTC (rev
18196)
@@ -999,7 +999,6 @@
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 @@
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_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", "CONNECT_TIMEOUT",
+ &connect_timeout))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
- "testing", "connect_timeout");
+ "testing", "CONNECT_TIMEOUT");
return;
}
Modified: gnunet/src/testing/test_testing_topology_blacklist.c
===================================================================
--- gnunet/src/testing/test_testing_topology_blacklist.c 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/testing/test_testing_topology_blacklist.c 2011-11-17
19:18:52 UTC (rev 18196)
@@ -390,7 +390,6 @@
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 @@
&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;
}
Modified: gnunet/src/testing/testing.conf
===================================================================
--- gnunet/src/testing/testing.conf 2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/testing/testing.conf 2011-11-17 19:18:52 UTC (rev 18196)
@@ -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?
Modified: gnunet/src/testing/testing_peergroup.c
===================================================================
--- gnunet/src/testing/testing_peergroup.c 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/testing/testing_peergroup.c 2011-11-17 19:18:52 UTC (rev
18196)
@@ -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 @@
/**
* 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 @@
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 @@
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 @@
}
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 @@
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 */
Modified: gnunet/src/transport/template_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer1.conf 2011-11-17 18:16:59 UTC
(rev 18195)
+++ gnunet/src/transport/template_cfg_peer1.conf 2011-11-17 19:18:52 UTC
(rev 18196)
@@ -12,7 +12,7 @@
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
Modified: gnunet/src/transport/template_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer2.conf 2011-11-17 18:16:59 UTC
(rev 18195)
+++ gnunet/src/transport/template_cfg_peer2.conf 2011-11-17 19:18:52 UTC
(rev 18196)
@@ -12,7 +12,7 @@
[transport-tcp]
PORT = 12100
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
Modified: gnunet/src/transport/test_plugin_transport_data.conf
===================================================================
--- gnunet/src/transport/test_plugin_transport_data.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_plugin_transport_data.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 2368
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 2366
Modified: gnunet/src/transport/test_quota_compliance_data.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_data.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_quota_compliance_data.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 2368
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 2366
Modified: gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
Modified: gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
Modified:
gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
Modified:
gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 0
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
Modified: gnunet/src/transport/test_transport_api_multi_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer1.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_multi_peer1.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12140
-TIMEOUT = 5000
+TIMEOUT = 5 s
[transport-udp]
PORT = 12141
Modified: gnunet/src/transport/test_transport_api_multi_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer2.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_multi_peer2.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -8,7 +8,7 @@
[transport-tcp]
PORT = 12150
-TIMEOUT = 5000
+TIMEOUT = 5 s
[transport-udp]
PORT = 12151
Modified: gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -8,7 +8,7 @@
TOTAL_QUOTA_IN = 1073741824
[transport-tcp]
-TIMEOUT = 5000
+TIMEOUT = 5 s
[transport-http]
PORT = 12180
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -4,8 +4,8 @@
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 @@
[transport-tcp]
PORT = 0
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 1204
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -4,8 +4,8 @@
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 @@
[transport-tcp]
PORT = 12030
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12034
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -4,12 +4,12 @@
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
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -4,12 +4,12 @@
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
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -10,7 +10,7 @@
[transport-tcp]
PORT = 0
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 1204
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -9,7 +9,7 @@
[transport-tcp]
PORT = 12030
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12034
Modified: gnunet/src/transport/test_transport_api_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer1.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_tcp_peer1.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
Modified: gnunet/src/transport/test_transport_api_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer2.conf 2011-11-17
18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_tcp_peer2.conf 2011-11-17
19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12015
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12014
Modified: gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
2011-11-17 19:18:52 UTC (rev 18196)
@@ -5,7 +5,7 @@
[transport-tcp]
PORT = 12000
-TIMEOUT = 5000
+TIMEOUT = 5 s
[arm]
PORT = 12005
Modified: gnunet/src/transport/test_transport_defaults.conf
===================================================================
--- gnunet/src/transport/test_transport_defaults.conf 2011-11-17 18:16:59 UTC
(rev 18195)
+++ gnunet/src/transport/test_transport_defaults.conf 2011-11-17 19:18:52 UTC
(rev 18196)
@@ -3,7 +3,7 @@
DEFAULTCONFIG = test_transport_defaults.conf
[transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
[arm]
DEFAULTSERVICES =
Modified: gnunet/src/transport/transport.conf
===================================================================
--- gnunet/src/transport/transport.conf 2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/transport/transport.conf 2011-11-17 19:18:52 UTC (rev 18196)
@@ -32,7 +32,7 @@
# Maximum number of open TCP connections allowed
MAX_CONNECTIONS = 128
-TIMEOUT = 5000
+TIMEOUT = 5 s
# ACCEPT_FROM =
# ACCEPT_FROM6 =
# REJECT_FROM =
Modified: gnunet/src/util/test_service_data.conf
===================================================================
--- gnunet/src/util/test_service_data.conf 2011-11-17 18:16:59 UTC (rev
18195)
+++ gnunet/src/util/test_service_data.conf 2011-11-17 19:18:52 UTC (rev
18196)
@@ -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 @@
[test_service6]
PORT=12435
PIDFILE=/tmp/test-service.pid
-TIMEOUT=30000
+TIMEOUT=30 s
MAXBUF=1024
DISABLEV6=NO
ACCEPT_FROM=127.0.0.1;
Modified: gnunet/src/vpn/test-conf.conf
===================================================================
--- gnunet/src/vpn/test-conf.conf 2011-11-17 18:16:59 UTC (rev 18195)
+++ gnunet/src/vpn/test-conf.conf 2011-11-17 19:18:52 UTC (rev 18196)
@@ -17,7 +17,7 @@
[transport-tcp]
PORT = 2086
-TIMEOUT = 300000
+TIMEOUT = 300s
# MAXBUF =
# DISABLEV6 =
# BINDTO =
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18196 - in gnunet/src: ats ats-test dht fs mesh nse testing transport util vpn,
gnunet <=