diff options
54 files changed, 180 insertions, 157 deletions
diff --git a/src/ats/ats.conf b/src/ats/ats.conf index f5d6c7765..d56227ff2 100644 --- a/src/ats/ats.conf +++ b/src/ats/ats.conf | |||
@@ -11,8 +11,8 @@ UNIXPATH = /tmp/gnunet-service-ats.sock | |||
11 | UNIX_MATCH_UID = YES | 11 | UNIX_MATCH_UID = YES |
12 | UNIX_MATCH_GID = YES | 12 | UNIX_MATCH_GID = YES |
13 | 13 | ||
14 | TOTAL_QUOTA_IN = 65536 | 14 | WAN_QUOTA_IN = 65536 |
15 | TOTAL_QUOTA_OUT = 65536 | 15 | WAN_QUOTA_OUT = 65536 |
16 | # ATS options | 16 | # ATS options |
17 | DUMP_MLP = NO | 17 | DUMP_MLP = NO |
18 | DUMP_SOLUTION = NO | 18 | DUMP_SOLUTION = NO |
diff --git a/src/ats/ats_api.c b/src/ats/ats_api.c index 8ebc240e1..47daad6cf 100644 --- a/src/ats/ats_api.c +++ b/src/ats/ats_api.c | |||
@@ -341,9 +341,9 @@ GNUNET_ATS_init (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
341 | atc->alloc_cb_cls = alloc_cb_cls; | 341 | atc->alloc_cb_cls = alloc_cb_cls; |
342 | atc->peers = GNUNET_CONTAINER_multihashmap_create (256); | 342 | atc->peers = GNUNET_CONTAINER_multihashmap_create (256); |
343 | atc->notify_map = GNUNET_CONTAINER_multihashmap_create (256); | 343 | atc->notify_map = GNUNET_CONTAINER_multihashmap_create (256); |
344 | GNUNET_CONFIGURATION_get_value_size (cfg, "core", "TOTAL_QUOTA_OUT", | 344 | GNUNET_CONFIGURATION_get_value_size (cfg, "ats", "WAN_QUOTA_OUT", |
345 | &atc->total_bps_out); | 345 | &atc->total_bps_out); |
346 | GNUNET_CONFIGURATION_get_value_size (cfg, "core", "TOTAL_QUOTA_IN", | 346 | GNUNET_CONFIGURATION_get_value_size (cfg, "ats", "WAN_QUOTA_IN", |
347 | &atc->total_bps_in); | 347 | &atc->total_bps_in); |
348 | return atc; | 348 | return atc; |
349 | } | 349 | } |
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 626ffbf61..04eacbbb1 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -76,9 +76,9 @@ struct ATS_Address | |||
76 | 76 | ||
77 | static struct GNUNET_CONTAINER_MultiHashMap *addresses; | 77 | static struct GNUNET_CONTAINER_MultiHashMap *addresses; |
78 | 78 | ||
79 | static unsigned long long total_quota_in; | 79 | static unsigned long long wan_quota_in; |
80 | 80 | ||
81 | static unsigned long long total_quota_out; | 81 | static unsigned long long wan_quota_out; |
82 | 82 | ||
83 | static unsigned int active_addr_count; | 83 | static unsigned int active_addr_count; |
84 | 84 | ||
@@ -100,8 +100,8 @@ update_bw_it (void *cls, const GNUNET_HashCode * key, void *value) | |||
100 | if (GNUNET_YES != aa->active) | 100 | if (GNUNET_YES != aa->active) |
101 | return GNUNET_OK; | 101 | return GNUNET_OK; |
102 | GNUNET_assert (active_addr_count > 0); | 102 | GNUNET_assert (active_addr_count > 0); |
103 | aa->assigned_bw_in.value__ = htonl (total_quota_in / active_addr_count); | 103 | aa->assigned_bw_in.value__ = htonl (wan_quota_in / active_addr_count); |
104 | aa->assigned_bw_out.value__ = htonl (total_quota_out / active_addr_count); | 104 | aa->assigned_bw_out.value__ = htonl (wan_quota_out / active_addr_count); |
105 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n", | 105 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n", |
106 | GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__), | 106 | GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__), |
107 | ntohl (aa->assigned_bw_out.value__)); | 107 | ntohl (aa->assigned_bw_out.value__)); |
@@ -475,13 +475,13 @@ void | |||
475 | GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | 475 | GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg) |
476 | { | 476 | { |
477 | GNUNET_assert (GNUNET_OK == | 477 | GNUNET_assert (GNUNET_OK == |
478 | GNUNET_CONFIGURATION_get_value_size (cfg, "core", | 478 | GNUNET_CONFIGURATION_get_value_size (cfg, "ats", |
479 | "TOTAL_QUOTA_IN", | 479 | "WAN_QUOTA_IN", |
480 | &total_quota_in)); | 480 | &wan_quota_in)); |
481 | GNUNET_assert (GNUNET_OK == | 481 | GNUNET_assert (GNUNET_OK == |
482 | GNUNET_CONFIGURATION_get_value_size (cfg, "core", | 482 | GNUNET_CONFIGURATION_get_value_size (cfg, "ats", |
483 | "TOTAL_QUOTA_OUT", | 483 | "WAN_QUOTA_OUT", |
484 | &total_quota_out)); | 484 | &wan_quota_out)); |
485 | addresses = GNUNET_CONTAINER_multihashmap_create (128); | 485 | addresses = GNUNET_CONTAINER_multihashmap_create (128); |
486 | } | 486 | } |
487 | 487 | ||
diff --git a/src/core/core.conf b/src/core/core.conf index 1d7815ad6..3dc08312e 100644 --- a/src/core/core.conf +++ b/src/core/core.conf | |||
@@ -7,9 +7,6 @@ CONFIG = $DEFAULTCONFIG | |||
7 | BINARY = gnunet-service-core | 7 | BINARY = gnunet-service-core |
8 | ACCEPT_FROM = 127.0.0.1; | 8 | ACCEPT_FROM = 127.0.0.1; |
9 | ACCEPT_FROM6 = ::1; | 9 | ACCEPT_FROM6 = ::1; |
10 | # quotas are in bytes per second now! | ||
11 | TOTAL_QUOTA_IN = 65536 | ||
12 | TOTAL_QUOTA_OUT = 65536 | ||
13 | UNIXPATH = /tmp/gnunet-service-core.sock | 10 | UNIXPATH = /tmp/gnunet-service-core.sock |
14 | UNIX_MATCH_UID = YES | 11 | UNIX_MATCH_UID = YES |
15 | UNIX_MATCH_GID = YES | 12 | UNIX_MATCH_GID = YES |
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf index 438423372..30eea2dd5 100644 --- a/src/core/test_core_api_data.conf +++ b/src/core/test_core_api_data.conf | |||
@@ -5,9 +5,11 @@ DEFAULTCONFIG = test_core_api_data.conf | |||
5 | [arm] | 5 | [arm] |
6 | DEFAULTSERVICES = topology hostlist | 6 | DEFAULTSERVICES = topology hostlist |
7 | 7 | ||
8 | [ats] | ||
9 | WAN_QUOTA_IN = 64 kiB | ||
10 | WAN_QUOTA_OUT = 64 kiB | ||
11 | |||
8 | [core] | 12 | [core] |
9 | PORT = 2092 | 13 | PORT = 2092 |
10 | TOTAL_QUOTA_IN = 65536 | ||
11 | TOTAL_QUOTA_OUT = 65536 | ||
12 | UNIXPATH = /tmp/gnunet-service-core.sock | 14 | UNIXPATH = /tmp/gnunet-service-core.sock |
13 | 15 | ||
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf index ad3cb1780..673772685 100644 --- a/src/core/test_core_api_send_to_self.conf +++ b/src/core/test_core_api_send_to_self.conf | |||
@@ -9,11 +9,11 @@ DEFAULTSERVICES = core test-sts | |||
9 | 9 | ||
10 | [core] | 10 | [core] |
11 | PORT = 24512 | 11 | PORT = 24512 |
12 | TOTAL_QUOTA_IN = 104857600 | ||
13 | TOTAL_QUOTA_OUT = 104757600 | ||
14 | UNIXPATH = /tmp/gnunet-service-core.sock | 12 | UNIXPATH = /tmp/gnunet-service-core.sock |
15 | 13 | ||
16 | [ats] | 14 | [ats] |
15 | WAN_QUOTA_IN = 104857600 | ||
16 | WAN_QUOTA_OUT = 104757600 | ||
17 | PORT = 24571 | 17 | PORT = 24571 |
18 | UNIXPATH = /tmp/gnunet-p1-service-ats.sock | 18 | UNIXPATH = /tmp/gnunet-p1-service-ats.sock |
19 | 19 | ||
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf index b3b745095..82f14a9d9 100644 --- a/src/core/test_core_defaults.conf +++ b/src/core/test_core_defaults.conf | |||
@@ -14,11 +14,13 @@ INTERNAL_ADDRESS = 127.0.0.1 | |||
14 | EXTERNAL_ADDRESS = 127.0.0.1 | 14 | EXTERNAL_ADDRESS = 127.0.0.1 |
15 | USE_LOCALADDR = NO | 15 | USE_LOCALADDR = NO |
16 | 16 | ||
17 | [ats] | ||
18 | WAN_QUOTA_IN = 1 GB | ||
19 | WAN_QUOTA_OUT = 1 GB | ||
20 | |||
17 | [core] | 21 | [core] |
18 | PORT = 12470 | 22 | PORT = 12470 |
19 | UNIXPATH = /tmp/gnunet-p1-service-core.sock | 23 | UNIXPATH = /tmp/gnunet-p1-service-core.sock |
20 | TOTAL_QUOTA_IN = 655360000 | ||
21 | TOTAL_QUOTA_OUT = 655360000 | ||
22 | 24 | ||
23 | [transport-tcp] | 25 | [transport-tcp] |
24 | BINDTO = 127.0.0.1 | 26 | BINDTO = 127.0.0.1 |
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf index b7e92ee84..3dfeb6e23 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf | |||
@@ -26,10 +26,12 @@ UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-peerinfo.sock | |||
26 | PORT = 12485 | 26 | PORT = 12485 |
27 | UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-transport.sock | 27 | UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-transport.sock |
28 | 28 | ||
29 | [ats] | ||
30 | WAN_QUOTA_IN = 1 MB | ||
31 | WAN_QUOTA_OUT = 1 MB | ||
32 | |||
29 | [core] | 33 | [core] |
30 | PORT = 12490 | 34 | PORT = 12490 |
31 | TOTAL_QUOTA_IN = 1000000 | ||
32 | TOTAL_QUOTA_OUT = 1000000 | ||
33 | UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-core.sock | 35 | UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-core.sock |
34 | DEBUG = NO | 36 | DEBUG = NO |
35 | 37 | ||
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf index a0d8c6776..ef23679e1 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf | |||
@@ -28,12 +28,11 @@ UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-transport.sock | |||
28 | 28 | ||
29 | [core] | 29 | [core] |
30 | PORT = 22490 | 30 | PORT = 22490 |
31 | TOTAL_QUOTA_IN = 10240 | ||
32 | TOTAL_QUOTA_OUT = 10240 | ||
33 | UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock | 31 | UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock |
34 | DEBUG = NO | 32 | DEBUG = NO |
35 | 33 | ||
36 | [ats] | 34 | [ats] |
37 | PORT = 22491 | 35 | PORT = 22491 |
38 | UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-ats.sock | 36 | UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-ats.sock |
39 | 37 | WAN_QUOTA_IN = 10 kiB | |
38 | WAN_QUOTA_OUT = 10 kiB \ No newline at end of file | ||
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf index 1056e3471..5a23d2140 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf | |||
@@ -26,10 +26,12 @@ UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-peerinfo.sock | |||
26 | PORT = 12485 | 26 | PORT = 12485 |
27 | UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock | 27 | UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock |
28 | 28 | ||
29 | [ats] | ||
30 | WAN_QUOTA_IN = 10240 | ||
31 | WAN_QUOTA_OUT = 10240 | ||
32 | |||
29 | [core] | 33 | [core] |
30 | PORT = 12490 | 34 | PORT = 12490 |
31 | TOTAL_QUOTA_IN = 10240 | ||
32 | TOTAL_QUOTA_OUT = 10240 | ||
33 | UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock | 35 | UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock |
34 | DEBUG = NO | 36 | DEBUG = NO |
35 | 37 | ||
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf index 8101f62df..a93f3f987 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf | |||
@@ -28,8 +28,6 @@ UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-transport.sock | |||
28 | 28 | ||
29 | [core] | 29 | [core] |
30 | PORT = 22490 | 30 | PORT = 22490 |
31 | TOTAL_QUOTA_IN = 1000000 | ||
32 | TOTAL_QUOTA_OUT = 1000000 | ||
33 | UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock | 31 | UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock |
34 | DEBUG = NO | 32 | DEBUG = NO |
35 | 33 | ||
@@ -37,4 +35,5 @@ DEBUG = NO | |||
37 | [ats] | 35 | [ats] |
38 | PORT = 22491 | 36 | PORT = 22491 |
39 | UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-ats.sock | 37 | UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-ats.sock |
40 | 38 | WAN_QUOTA_IN = 1 MB | |
39 | WAN_QUOTA_OUT = 1 MB | ||
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index dd8f16a2c..59305725a 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -629,20 +629,20 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
629 | 629 | ||
630 | GNUNET_assert (test != -1); | 630 | GNUNET_assert (test != -1); |
631 | GNUNET_assert (GNUNET_SYSERR != | 631 | GNUNET_assert (GNUNET_SYSERR != |
632 | GNUNET_CONFIGURATION_get_value_size (p1.cfg, "CORE", | 632 | GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", |
633 | "TOTAL_QUOTA_IN", | 633 | "WAN_QUOTA_IN", |
634 | ¤t_quota_p1_in)); | 634 | ¤t_quota_p1_in)); |
635 | GNUNET_assert (GNUNET_SYSERR != | 635 | GNUNET_assert (GNUNET_SYSERR != |
636 | GNUNET_CONFIGURATION_get_value_size (p2.cfg, "CORE", | 636 | GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", |
637 | "TOTAL_QUOTA_IN", | 637 | "WAN_QUOTA_IN", |
638 | ¤t_quota_p2_in)); | 638 | ¤t_quota_p2_in)); |
639 | GNUNET_assert (GNUNET_SYSERR != | 639 | GNUNET_assert (GNUNET_SYSERR != |
640 | GNUNET_CONFIGURATION_get_value_size (p1.cfg, "CORE", | 640 | GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", |
641 | "TOTAL_QUOTA_OUT", | 641 | "WAN_QUOTA_OUT", |
642 | ¤t_quota_p1_out)); | 642 | ¤t_quota_p1_out)); |
643 | GNUNET_assert (GNUNET_SYSERR != | 643 | GNUNET_assert (GNUNET_SYSERR != |
644 | GNUNET_CONFIGURATION_get_value_size (p2.cfg, "CORE", | 644 | GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", |
645 | "TOTAL_QUOTA_OUT", | 645 | "WAN_QUOTA_OUT", |
646 | ¤t_quota_p2_out)); | 646 | ¤t_quota_p2_out)); |
647 | 647 | ||
648 | p1.ch = | 648 | p1.ch = |
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf index 78b4a8aac..0393d1d65 100644 --- a/src/core/test_core_quota_peer1.conf +++ b/src/core/test_core_quota_peer1.conf | |||
@@ -26,10 +26,12 @@ UNIXPATH = /tmp/gnunet-core-sym-p1-service-peerinfo.sock | |||
26 | PORT = 12475 | 26 | PORT = 12475 |
27 | UNIXPATH = /tmp/gnunet-core-sym-p1-service-transport.sock | 27 | UNIXPATH = /tmp/gnunet-core-sym-p1-service-transport.sock |
28 | 28 | ||
29 | [ats] | ||
30 | WAN_QUOTA_IN = 10240 | ||
31 | WAN_QUOTA_OUT = 10240 | ||
32 | |||
29 | [core] | 33 | [core] |
30 | PORT = 12480 | 34 | PORT = 12480 |
31 | TOTAL_QUOTA_IN = 10240 | ||
32 | TOTAL_QUOTA_OUT = 10240 | ||
33 | UNIXPATH = /tmp/gnunet-core-sym-p1-service-core.sock | 35 | UNIXPATH = /tmp/gnunet-core-sym-p1-service-core.sock |
34 | DEBUG = NO | 36 | DEBUG = NO |
35 | 37 | ||
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf index bc64fee00..c7975cddc 100644 --- a/src/core/test_core_quota_peer2.conf +++ b/src/core/test_core_quota_peer2.conf | |||
@@ -28,12 +28,11 @@ UNIXPATH = /tmp/gnunet-core-sym-p2-service-transport.sock | |||
28 | 28 | ||
29 | [core] | 29 | [core] |
30 | PORT = 22480 | 30 | PORT = 22480 |
31 | TOTAL_QUOTA_IN = 10240 | ||
32 | TOTAL_QUOTA_OUT = 10240 | ||
33 | UNIXPATH = /tmp/gnunet-core-sym-p2-service-core.sock | 31 | UNIXPATH = /tmp/gnunet-core-sym-p2-service-core.sock |
34 | DEBUG = NO | 32 | DEBUG = NO |
35 | 33 | ||
36 | [ats] | 34 | [ats] |
37 | PORT = 22482 | 35 | PORT = 22482 |
38 | UNIXPATH = /tmp/gnunet-core-sym-p2-service-ats.sock | 36 | UNIXPATH = /tmp/gnunet-core-sym-p2-service-ats.sock |
39 | 37 | WAN_QUOTA_IN = 10 kiB | |
38 | WAN_QUOTA_OUT = 10 kiB \ No newline at end of file | ||
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf index 0d7b94879..e8da79e89 100644 --- a/src/dht/test_dht_2dtorus.conf +++ b/src/dht/test_dht_2dtorus.conf | |||
@@ -36,9 +36,11 @@ ALLOW_NAT = NO | |||
36 | INTERNAL_ADDRESS = 127.0.0.1 | 36 | INTERNAL_ADDRESS = 127.0.0.1 |
37 | EXTERNAL_ADDRESS = 127.0.0.1 | 37 | EXTERNAL_ADDRESS = 127.0.0.1 |
38 | 38 | ||
39 | [ats] | ||
40 | WAN_QUOTA_IN = 1 GB | ||
41 | WAN_QUOTA_OUT = 1 GB | ||
42 | |||
39 | [core] | 43 | [core] |
40 | TOTAL_QUOTA_IN = 1 GB | ||
41 | TOTAL_QUOTA_OUT = 1 GB | ||
42 | AUTOSTART = YES | 44 | AUTOSTART = YES |
43 | PORT = 10003 | 45 | PORT = 10003 |
44 | 46 | ||
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf index 610733399..8ed30aff2 100644 --- a/src/dht/test_dht_api_data.conf +++ b/src/dht/test_dht_api_data.conf | |||
@@ -20,9 +20,11 @@ AUTOCONNECT = YES | |||
20 | FRIENDS-ONLY = NO | 20 | FRIENDS-ONLY = NO |
21 | MINIMUM-FRIENDS = 0 | 21 | MINIMUM-FRIENDS = 0 |
22 | 22 | ||
23 | [ats] | ||
24 | WAN_QUOTA_IN = 1 GB | ||
25 | WAN_QUOTA_OUT = 1GB | ||
26 | |||
23 | [core] | 27 | [core] |
24 | TOTAL_QUOTA_OUT = 1 GB | ||
25 | TOTAL_QUOTA_IN = 1 GB | ||
26 | PORT = 2092 | 28 | PORT = 2092 |
27 | 29 | ||
28 | [dht] | 30 | [dht] |
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf index 075234232..cacc4da8f 100644 --- a/src/dht/test_dht_api_peer1.conf +++ b/src/dht/test_dht_api_peer1.conf | |||
@@ -28,9 +28,11 @@ ACCEPT_FROM = 127.0.0.1; | |||
28 | NEIGHBOUR_LIMIT = 50 | 28 | NEIGHBOUR_LIMIT = 50 |
29 | PORT = 12365 | 29 | PORT = 12365 |
30 | 30 | ||
31 | [ats] | ||
32 | WAN_QUOTA_IN = 1 GB | ||
33 | WAN_QUOTA_OUT = 1 GB | ||
34 | |||
31 | [core] | 35 | [core] |
32 | TOTAL_QUOTA_OUT = 1 GB | ||
33 | TOTAL_QUOTA_IN = 1 GB | ||
34 | PORT = 12092 | 36 | PORT = 12092 |
35 | 37 | ||
36 | [arm] | 38 | [arm] |
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf index bf826789d..d16017d34 100644 --- a/src/dht/test_dht_multipeer_data.conf +++ b/src/dht/test_dht_multipeer_data.conf | |||
@@ -45,9 +45,11 @@ PORT = 12365 | |||
45 | [DHTLOG] | 45 | [DHTLOG] |
46 | PLUGIN = mysql_dump | 46 | PLUGIN = mysql_dump |
47 | 47 | ||
48 | [ats] | ||
49 | WAN_QUOTA_IN = 1GB | ||
50 | WAN_QUOTA_OUT = 1GB | ||
51 | |||
48 | [core] | 52 | [core] |
49 | TOTAL_QUOTA_OUT = 1 GB | ||
50 | TOTAL_QUOTA_IN = 1 GB | ||
51 | ACCEPT_FROM6 = ::1; | 53 | ACCEPT_FROM6 = ::1; |
52 | ACCEPT_FROM = 127.0.0.1; | 54 | ACCEPT_FROM = 127.0.0.1; |
53 | BINARY = gnunet-service-core | 55 | BINARY = gnunet-service-core |
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf index 418772fc7..ba1e22b80 100644 --- a/src/dht/test_dht_twopeer_data.conf +++ b/src/dht/test_dht_twopeer_data.conf | |||
@@ -25,9 +25,11 @@ DEBUG = NO | |||
25 | NEIGHBOUR_LIMIT = 50 | 25 | NEIGHBOUR_LIMIT = 50 |
26 | PORT = 12365 | 26 | PORT = 12365 |
27 | 27 | ||
28 | [ats] | ||
29 | WAN_QUOTA_IN = 1 GB | ||
30 | WAN_QUOTA_OUT = 1 GB | ||
31 | |||
28 | [core] | 32 | [core] |
29 | TOTAL_QUOTA_OUT = 1 GB | ||
30 | TOTAL_QUOTA_IN = 1 GB | ||
31 | HOSTNAME = localhost | 33 | HOSTNAME = localhost |
32 | PORT = 12092 | 34 | PORT = 12092 |
33 | 35 | ||
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf index 957dc6859..e6c2abd3a 100644 --- a/src/fs/fs_test_lib_data.conf +++ b/src/fs/fs_test_lib_data.conf | |||
@@ -2,9 +2,9 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-fs-test-lib/ | 3 | SERVICEHOME = /tmp/gnunet-fs-test-lib/ |
4 | 4 | ||
5 | [core] | 5 | [ats] |
6 | TOTAL_QUOTA_IN = 3932160 | 6 | WAN_QUOTA_IN = 3932160 |
7 | TOTAL_QUOTA_OUT = 3932160 | 7 | WAN_QUOTA_OUT = 3932160 |
8 | 8 | ||
9 | [datastore] | 9 | [datastore] |
10 | QUOTA = 2 GB | 10 | QUOTA = 2 GB |
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index d382e1f93..e6add21b9 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -1587,13 +1587,13 @@ GSF_pending_request_init_ () | |||
1587 | "MAX_PENDING_REQUESTS"); | 1587 | "MAX_PENDING_REQUESTS"); |
1588 | } | 1588 | } |
1589 | if (GNUNET_OK != | 1589 | if (GNUNET_OK != |
1590 | GNUNET_CONFIGURATION_get_value_size (GSF_cfg, "core", "TOTAL_QUOTA_OUT", | 1590 | GNUNET_CONFIGURATION_get_value_size (GSF_cfg, "ats", "WAN_QUOTA_OUT", |
1591 | &bps)) | 1591 | &bps)) |
1592 | { | 1592 | { |
1593 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 1593 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1594 | _ | 1594 | _ |
1595 | ("Configuration fails to specify `%s', assuming default value."), | 1595 | ("Configuration fails to specify `%s', assuming default value."), |
1596 | "TOTAL_QUOTA_IN"); | 1596 | "WAN_QUOTA_OUT"); |
1597 | bps = 65536; | 1597 | bps = 65536; |
1598 | } | 1598 | } |
1599 | /* queue size should be #queries we can have pending and satisfy within | 1599 | /* queue size should be #queries we can have pending and satisfy within |
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf index a2b111181..9dd717863 100644 --- a/src/fs/test_fs_defaults.conf +++ b/src/fs/test_fs_defaults.conf | |||
@@ -42,11 +42,13 @@ PORT = 43468 | |||
42 | PORT = 43469 | 42 | PORT = 43469 |
43 | HOSTNAME = localhost | 43 | HOSTNAME = localhost |
44 | 44 | ||
45 | [ats] | ||
46 | WAN_QUOTA_IN = 65536 | ||
47 | WAN_QUOTA_OUT = 65536 | ||
48 | |||
45 | [core] | 49 | [core] |
46 | PORT = 43470 | 50 | PORT = 43470 |
47 | HOSTNAME = localhost | 51 | HOSTNAME = localhost |
48 | TOTAL_QUOTA_IN = 65536 | ||
49 | TOTAL_QUOTA_OUT = 65536 | ||
50 | 52 | ||
51 | [fs] | 53 | [fs] |
52 | PORT = 43471 | 54 | PORT = 43471 |
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf index ad6b7a2db..9c05a88e9 100644 --- a/src/fs/test_gnunet_service_fs_migration_data.conf +++ b/src/fs/test_gnunet_service_fs_migration_data.conf | |||
@@ -4,6 +4,6 @@ SERVICEHOME = /tmp/test-gnunet-service-fs-migration/ | |||
4 | DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf | 4 | DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf |
5 | 5 | ||
6 | 6 | ||
7 | [core] | 7 | [ats] |
8 | TOTAL_QUOTA_IN = 3932160 | 8 | WAN_QUOTA_IN = 3932160 |
9 | TOTAL_QUOTA_OUT = 3932160 | 9 | WAN_QUOTA_OUT = 3932160 |
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf index bf4d4dfe7..3d955f09e 100644 --- a/src/mesh/test_mesh.conf +++ b/src/mesh/test_mesh.conf | |||
@@ -36,9 +36,11 @@ ACCEPT_FROM = 127.0.0.1; | |||
36 | NEIGHBOUR_LIMIT = 50 | 36 | NEIGHBOUR_LIMIT = 50 |
37 | PORT = 12365 | 37 | PORT = 12365 |
38 | 38 | ||
39 | [ats] | ||
40 | WAN_QUOTA_OUT = 3932160 | ||
41 | WAN_QUOTA_IN = 3932160 | ||
42 | |||
39 | [core] | 43 | [core] |
40 | TOTAL_QUOTA_OUT = 3932160 | ||
41 | TOTAL_QUOTA_IN = 3932160 | ||
42 | PORT = 12092 | 44 | PORT = 12092 |
43 | 45 | ||
44 | [arm] | 46 | [arm] |
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf index 90ebd73af..9a2227bed 100644 --- a/src/mesh/test_mesh_2dtorus.conf +++ b/src/mesh/test_mesh_2dtorus.conf | |||
@@ -39,9 +39,11 @@ ALLOW_NAT = NO | |||
39 | INTERNAL_ADDRESS = 127.0.0.1 | 39 | INTERNAL_ADDRESS = 127.0.0.1 |
40 | EXTERNAL_ADDRESS = 127.0.0.1 | 40 | EXTERNAL_ADDRESS = 127.0.0.1 |
41 | 41 | ||
42 | [ats] | ||
43 | WAN_QUOTA_IN = 1 GB | ||
44 | WAN_QUOTA_OUT = 1 GB | ||
45 | |||
42 | [core] | 46 | [core] |
43 | TOTAL_QUOTA_IN = 999111999 | ||
44 | TOTAL_QUOTA_OUT = 999111999 | ||
45 | AUTOSTART = YES | 47 | AUTOSTART = YES |
46 | PORT = 10003 | 48 | PORT = 10003 |
47 | 49 | ||
diff --git a/src/mesh/test_mesh_path.conf b/src/mesh/test_mesh_path.conf index bf4d4dfe7..3d955f09e 100644 --- a/src/mesh/test_mesh_path.conf +++ b/src/mesh/test_mesh_path.conf | |||
@@ -36,9 +36,11 @@ ACCEPT_FROM = 127.0.0.1; | |||
36 | NEIGHBOUR_LIMIT = 50 | 36 | NEIGHBOUR_LIMIT = 50 |
37 | PORT = 12365 | 37 | PORT = 12365 |
38 | 38 | ||
39 | [ats] | ||
40 | WAN_QUOTA_OUT = 3932160 | ||
41 | WAN_QUOTA_IN = 3932160 | ||
42 | |||
39 | [core] | 43 | [core] |
40 | TOTAL_QUOTA_OUT = 3932160 | ||
41 | TOTAL_QUOTA_IN = 3932160 | ||
42 | PORT = 12092 | 44 | PORT = 12092 |
43 | 45 | ||
44 | [arm] | 46 | [arm] |
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf index 20e13b863..0aec8ff7f 100644 --- a/src/mesh/test_mesh_small.conf +++ b/src/mesh/test_mesh_small.conf | |||
@@ -39,9 +39,11 @@ ALLOW_NAT = NO | |||
39 | INTERNAL_ADDRESS = 127.0.0.1 | 39 | INTERNAL_ADDRESS = 127.0.0.1 |
40 | EXTERNAL_ADDRESS = 127.0.0.1 | 40 | EXTERNAL_ADDRESS = 127.0.0.1 |
41 | 41 | ||
42 | [ats] | ||
43 | WAN_QUOTA_IN = 1 GB | ||
44 | WAN_QUOTA_OUT = 1 GB | ||
45 | |||
42 | [core] | 46 | [core] |
43 | TOTAL_QUOTA_IN = 1 GB | ||
44 | TOTAL_QUOTA_OUT = 1 GB | ||
45 | AUTOSTART = YES | 47 | AUTOSTART = YES |
46 | PORT = 10003 | 48 | PORT = 10003 |
47 | 49 | ||
diff --git a/src/testing/test_testing_2dtorus.conf b/src/testing/test_testing_2dtorus.conf index da5f90c9c..ba1db3a6b 100644 --- a/src/testing/test_testing_2dtorus.conf +++ b/src/testing/test_testing_2dtorus.conf | |||
@@ -39,9 +39,11 @@ ALLOW_NAT = NO | |||
39 | INTERNAL_ADDRESS = 127.0.0.1 | 39 | INTERNAL_ADDRESS = 127.0.0.1 |
40 | EXTERNAL_ADDRESS = 127.0.0.1 | 40 | EXTERNAL_ADDRESS = 127.0.0.1 |
41 | 41 | ||
42 | [ats] | ||
43 | WAN_QUOTA_IN = 1 GB | ||
44 | WAN_QUOTA_OUT = 1 GB | ||
45 | |||
42 | [core] | 46 | [core] |
43 | TOTAL_QUOTA_IN = 1 GB | ||
44 | TOTAL_QUOTA_OUT = 1 GB | ||
45 | AUTOSTART = YES | 47 | AUTOSTART = YES |
46 | PORT = 10003 | 48 | PORT = 10003 |
47 | 49 | ||
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index bb33be1e8..52051954b 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c | |||
@@ -484,13 +484,9 @@ generate_config (char *cfg_file, unsigned long long quota_in, | |||
484 | GNUNET_asprintf (&fname, "q_in_%llu_q_out_%llu_%s", quota_in, quota_out, | 484 | GNUNET_asprintf (&fname, "q_in_%llu_q_out_%llu_%s", quota_in, quota_out, |
485 | cfg_file); | 485 | cfg_file); |
486 | GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG", fname); | 486 | GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG", fname); |
487 | GNUNET_CONFIGURATION_set_value_number (cfg, "core", "TOTAL_QUOTA_OUT", | 487 | GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "WAN_QUOTA_IN", |
488 | quota_out); | ||
489 | GNUNET_CONFIGURATION_set_value_number (cfg, "core", "TOTAL_QUOTA_IN", | ||
490 | quota_in); | ||
491 | GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "TOTAL_QUOTA_IN", | ||
492 | quota_in); | 488 | quota_in); |
493 | GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "TOTAL_QUOTA_OUT", | 489 | GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "WAN_QUOTA_OUT", |
494 | quota_out); | 490 | quota_out); |
495 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname)); | 491 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname)); |
496 | GNUNET_CONFIGURATION_destroy (cfg); | 492 | GNUNET_CONFIGURATION_destroy (cfg); |
diff --git a/src/transport/test_transport_api_reliability_http_nat_peer1.conf b/src/transport/test_transport_api_reliability_http_nat_peer1.conf index 7d9d62773..2041e70a2 100644 --- a/src/transport/test_transport_api_reliability_http_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_http_nat_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [nat] | 10 | [nat] |
11 | BEHIND_NAT = YES | 11 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_reliability_http_nat_peer2.conf b/src/transport/test_transport_api_reliability_http_nat_peer2.conf index 448667c8a..c87a25622 100644 --- a/src/transport/test_transport_api_reliability_http_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_http_nat_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_OUT = 1073741824 |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [transport-http] | 10 | [transport-http] |
11 | PORT = 12090 | 11 | PORT = 12090 |
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf index 40fc73b6b..6a6eeabb4 100644 --- a/src/transport/test_transport_api_reliability_http_peer1.conf +++ b/src/transport/test_transport_api_reliability_http_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1 GB | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1 GB | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [transport-tcp] | 10 | [transport-tcp] |
11 | TIMEOUT = 5 s | 11 | TIMEOUT = 5 s |
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf index 755d1b546..c0d8c99cc 100644 --- a/src/transport/test_transport_api_reliability_http_peer2.conf +++ b/src/transport/test_transport_api_reliability_http_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1 GB | 7 | WAN_QUOTA_OUT = 1 GB |
8 | TOTAL_QUOTA_IN = 1 GB | 8 | WAN_QUOTA_IN = 1 GB |
9 | 9 | ||
10 | [transport-http] | 10 | [transport-http] |
11 | PORT = 12190 | 11 | PORT = 12190 |
diff --git a/src/transport/test_transport_api_reliability_https_nat_peer1.conf b/src/transport/test_transport_api_reliability_https_nat_peer1.conf index ede7e288a..3ce6eb4c7 100644 --- a/src/transport/test_transport_api_reliability_https_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_https_nat_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [nat] | 10 | [nat] |
11 | BEHIND_NAT = YES | 11 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_reliability_https_nat_peer2.conf b/src/transport/test_transport_api_reliability_https_nat_peer2.conf index 369ee152a..6b773185f 100644 --- a/src/transport/test_transport_api_reliability_https_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_https_nat_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_OUT = 1073741824 |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [transport-https] | 10 | [transport-https] |
11 | PORT = 12110 | 11 | PORT = 12110 |
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf index 6079b0a40..de844c9a9 100644 --- a/src/transport/test_transport_api_reliability_https_peer1.conf +++ b/src/transport/test_transport_api_reliability_https_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [transport-https] | 10 | [transport-https] |
11 | PORT = 12300 | 11 | PORT = 12300 |
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf index 4c2e9959d..f005dc041 100644 --- a/src/transport/test_transport_api_reliability_https_peer2.conf +++ b/src/transport/test_transport_api_reliability_https_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_OUT = 1073741824 |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [transport-https] | 10 | [transport-https] |
11 | PORT = 12310 | 11 | PORT = 12310 |
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 2efaef33a..5832b01b2 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ | 3 | 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 | [ats] |
7 | TOTAL_QUOTA_OUT = 1 GB | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1 GB | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [nat] | 10 | [nat] |
11 | BEHIND_NAT = YES | 11 | BEHIND_NAT = YES |
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 19ac0bcda..4feafb98a 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ | 3 | 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 | [ats] |
7 | TOTAL_QUOTA_OUT = 1 GB | 7 | WAN_QUOTA_OUT = 1 GB |
8 | TOTAL_QUOTA_IN = 1 GB | 8 | WAN_QUOTA_IN = 1 GB |
9 | 9 | ||
10 | [nat] | 10 | [nat] |
11 | DISABLEV6 = YES | 11 | DISABLEV6 = YES |
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf index 123357e39..06658f18e 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | 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 | [ats] |
7 | TOTAL_QUOTA_OUT = 1 GB | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1 GB | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [transport-tcp] | 10 | [transport-tcp] |
11 | PORT = 12000 | 11 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf index 7d6aea04b..e3ec8b197 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | 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 | [ats] |
7 | TOTAL_QUOTA_OUT = 1 GB | 7 | WAN_QUOTA_OUT = 1 GB |
8 | TOTAL_QUOTA_IN = 1 GB | 8 | WAN_QUOTA_IN = 1 GB |
9 | 9 | ||
10 | [transport-tcp] | 10 | [transport-tcp] |
11 | PORT = 12015 | 11 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf index dda2cc10b..036f87759 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [transport-wlan] | 10 | [transport-wlan] |
11 | TESTMODE = 1 | 11 | TESTMODE = 1 |
diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf index b743bd94e..f86253c3b 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_OUT = 1073741824 |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [transport-wlan] | 10 | [transport-wlan] |
11 | INTERFACE = mon1 | 11 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf index 24bf6cad1..d785c98ac 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [transport-udp] | 10 | [transport-udp] |
11 | PORT = 12040 | 11 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf index f45a95762..a58c1c09c 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_OUT = 1073741824 |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [transport-udp] | 10 | [transport-udp] |
11 | PORT = 12050 | 11 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf index 0c868a0f6..eb7e96595 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [transport-udp] | 10 | [transport-udp] |
11 | PORT = 12040 | 11 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf index 88d5dfb86..7b0972bd1 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_OUT = 1073741824 |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [transport-udp] | 10 | [transport-udp] |
11 | PORT = 12050 | 11 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf index 23e485df4..6600e0355 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer1.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12125 | 11 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf index c197c18ff..6344ba191 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer2.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_OUT = 1073741824 |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [arm] | 10 | [arm] |
11 | PORT = 12135 | 11 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf index dda2cc10b..036f87759 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [transport-wlan] | 10 | [transport-wlan] |
11 | TESTMODE = 1 | 11 | TESTMODE = 1 |
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf index b743bd94e..f86253c3b 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_OUT = 1073741824 |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [transport-wlan] | 10 | [transport-wlan] |
11 | INTERFACE = mon1 | 11 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index 685bad85c..3f870ef92 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_IN = 1 GB |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_OUT = 1 GB |
9 | 9 | ||
10 | [transport-wlan] | 10 | [transport-wlan] |
11 | INTERFACE = mon0 | 11 | INTERFACE = mon0 |
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index 10c91e07a..917d8021f 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf | |||
@@ -3,9 +3,9 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf |
5 | 5 | ||
6 | [core] | 6 | [ats] |
7 | TOTAL_QUOTA_OUT = 1073741824 | 7 | WAN_QUOTA_OUT = 1073741824 |
8 | TOTAL_QUOTA_IN = 1073741824 | 8 | WAN_QUOTA_IN = 1073741824 |
9 | 9 | ||
10 | [transport-wlan] | 10 | [transport-wlan] |
11 | INTERFACE = mon1 | 11 | INTERFACE = mon1 |
diff --git a/src/vpn/test-conf.conf b/src/vpn/test-conf.conf index ba1747774..b805c7c94 100644 --- a/src/vpn/test-conf.conf +++ b/src/vpn/test-conf.conf | |||
@@ -154,6 +154,10 @@ UNIXPATH = /tmp/gnunet-service-transport.sock | |||
154 | # REJECT_FROM6 = | 154 | # REJECT_FROM6 = |
155 | # PREFIX = | 155 | # PREFIX = |
156 | 156 | ||
157 | [ats] | ||
158 | WAN_QUOTA_IN = 64 kiB | ||
159 | WAN_QUOTA_OUT = 64 kiB | ||
160 | |||
157 | [core] | 161 | [core] |
158 | AUTOSTART = YES | 162 | AUTOSTART = YES |
159 | PORT = 2092 | 163 | PORT = 2092 |
@@ -163,9 +167,6 @@ CONFIG = $DEFAULTCONFIG | |||
163 | BINARY = gnunet-service-core | 167 | BINARY = gnunet-service-core |
164 | ACCEPT_FROM = 127.0.0.1; | 168 | ACCEPT_FROM = 127.0.0.1; |
165 | ACCEPT_FROM6 = ::1; | 169 | ACCEPT_FROM6 = ::1; |
166 | # quotas are in bytes per second now! | ||
167 | TOTAL_QUOTA_IN = 65536 | ||
168 | TOTAL_QUOTA_OUT = 65536 | ||
169 | UNIXPATH = /tmp/gnunet-service-core.sock | 170 | UNIXPATH = /tmp/gnunet-service-core.sock |
170 | # DEBUG = YES | 171 | # DEBUG = YES |
171 | # USERNAME = | 172 | # USERNAME = |