diff options
13 files changed, 4 insertions, 53 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 493352512..a8a780ff6 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c | |||
@@ -269,7 +269,8 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
269 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 269 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
270 | GNUNET_SCHEDULER_cancel (die_task); | 270 | GNUNET_SCHEDULER_cancel (die_task); |
271 | test_failed = GNUNET_YES; | 271 | test_failed = GNUNET_YES; |
272 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 272 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, |
273 | NULL); | ||
273 | return; | 274 | return; |
274 | } | 275 | } |
275 | #if VERBOSE | 276 | #if VERBOSE |
@@ -498,13 +499,13 @@ run_measurement (unsigned long long p1_quota_in, unsigned long long p1_quota_out | |||
498 | "Generated config file `%s'\n", | 499 | "Generated config file `%s'\n", |
499 | gen_cfg_p2); | 500 | gen_cfg_p2); |
500 | 501 | ||
501 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1, | 502 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p1, 1, |
502 | ¬ify_receive, | 503 | ¬ify_receive, |
503 | ¬ify_connect, ¬ify_disconnect, | 504 | ¬ify_connect, ¬ify_disconnect, |
504 | &start_cb, | 505 | &start_cb, |
505 | NULL); | 506 | NULL); |
506 | 507 | ||
507 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2, | 508 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p2, 2, |
508 | ¬ify_receive, | 509 | ¬ify_receive, |
509 | ¬ify_connect, ¬ify_disconnect, | 510 | ¬ify_connect, ¬ify_disconnect, |
510 | &start_cb, | 511 | &start_cb, |
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 06d0e275d..872a75365 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 |
4 | DEFAULTCONFIG = test_quota_compliance_http_peer1.conf | 4 | DEFAULTCONFIG = test_quota_compliance_http_peer1.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-http] | 6 | [transport-http] |
11 | PORT = 4010 | 7 | PORT = 4010 |
12 | DEBUG = NO | 8 | DEBUG = NO |
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index d3a039cfa..256dc61eb 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_http_peer2.conf | 4 | DEFAULTCONFIG = test_quota_compliance_http_peer2.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-http] | 6 | [transport-http] |
11 | PORT = 3010 | 7 | PORT = 3010 |
12 | DEBUG = NO | 8 | DEBUG = NO |
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf index 8859304bb..47f93096c 100644 --- a/src/transport/test_quota_compliance_https_peer1.conf +++ b/src/transport/test_quota_compliance_https_peer1.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_https_peer1.conf | 4 | DEFAULTCONFIG = test_quota_compliance_https_peer1.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-https] | 6 | [transport-https] |
11 | PORT = 4001 | 7 | PORT = 4001 |
12 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL | 8 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL |
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index afe4824bd..79bf0331f 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_https_peer2.conf | 4 | DEFAULTCONFIG = test_quota_compliance_https_peer2.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-https] | 6 | [transport-https] |
11 | PORT = 3001 | 7 | PORT = 3001 |
12 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL | 8 | CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL |
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf index 47f6a639c..a7bac62ca 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf | 4 | DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-tcp] | 6 | [transport-tcp] |
11 | PORT = 4094 | 7 | PORT = 4094 |
12 | 8 | ||
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf index d9c182be5..18295ac60 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p2/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf | 4 | DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-tcp] | 6 | [transport-tcp] |
11 | PORT = 12015 | 7 | PORT = 12015 |
12 | TIMEOUT = 5000 | 8 | TIMEOUT = 5000 |
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index f92d9cd98..ff63514b1 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf | 4 | DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-tcp] | 6 | [transport-tcp] |
11 | PORT = 4094 | 7 | PORT = 4094 |
12 | 8 | ||
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index 5fe5d070e..476507588 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf | 4 | DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-tcp] | 6 | [transport-tcp] |
11 | PORT = 12015 | 7 | PORT = 12015 |
12 | TIMEOUT = 5000 | 8 | TIMEOUT = 5000 |
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf index 3e52c2167..fceee7bcd 100644 --- a/src/transport/test_quota_compliance_udp_peer1.conf +++ b/src/transport/test_quota_compliance_udp_peer1.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf | 4 | DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-udp] | 6 | [transport-udp] |
11 | PORT = 4368 | 7 | PORT = 4368 |
12 | MAX_BPS = 50000000 | 8 | MAX_BPS = 50000000 |
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index d6d928f7c..4b58c934f 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf | |||
@@ -1,14 +1,8 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | TOTAL_QUOTA_IN = 10000 | ||
3 | TOTAL_QUOTA_OUT = 10000 | ||
4 | [PATHS] | 2 | [PATHS] |
5 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
6 | DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf | 4 | DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf |
7 | 5 | ||
8 | [core] | ||
9 | TOTAL_QUOTA_IN = 10000 | ||
10 | TOTAL_QUOTA_OUT = 10000 | ||
11 | |||
12 | [transport-udp] | 6 | [transport-udp] |
13 | PORT = 3368 | 7 | PORT = 3368 |
14 | MAX_BPS = 50000000 | 8 | MAX_BPS = 50000000 |
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf index 20844227a..60e656bad 100644 --- a/src/transport/test_quota_compliance_unix_peer1.conf +++ b/src/transport/test_quota_compliance_unix_peer1.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf | 4 | DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-unix] | 6 | [transport-unix] |
11 | PORT = 12120 | 7 | PORT = 12120 |
12 | 8 | ||
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf index 332226a84..b4f0b648a 100644 --- a/src/transport/test_quota_compliance_unix_peer2.conf +++ b/src/transport/test_quota_compliance_unix_peer2.conf | |||
@@ -3,10 +3,6 @@ | |||
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf | 4 | DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf |
5 | 5 | ||
6 | [core] | ||
7 | TOTAL_QUOTA_IN = 10000 | ||
8 | TOTAL_QUOTA_OUT = 10000 | ||
9 | |||
10 | [transport-unix] | 6 | [transport-unix] |
11 | PORT = 12136 | 7 | PORT = 12136 |
12 | 8 | ||