diff options
author | Bart Polot <bart@net.in.tum.de> | 2011-11-29 17:13:57 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2011-11-29 17:13:57 +0000 |
commit | 5ca85864950a1fe92613f5ed3a69cd08d248423e (patch) | |
tree | 26b44bbe805223a9ca58aa46d112bb49fad35f72 /src/core | |
parent | b312a0e714d1782f1258b3aaa697f8f36315cd60 (diff) | |
download | gnunet-5ca85864950a1fe92613f5ed3a69cd08d248423e.tar.gz gnunet-5ca85864950a1fe92613f5ed3a69cd08d248423e.zip |
Changed quota configuration from core to ats section, renamed from TOTAL_QUOTA_* to WAN_QUOTA_*
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core.conf | 3 | ||||
-rw-r--r-- | src/core/test_core_api_data.conf | 6 | ||||
-rw-r--r-- | src/core/test_core_api_send_to_self.conf | 4 | ||||
-rw-r--r-- | src/core/test_core_defaults.conf | 6 | ||||
-rw-r--r-- | src/core/test_core_quota_asymmetric_recv_limited_peer1.conf | 6 | ||||
-rw-r--r-- | src/core/test_core_quota_asymmetric_recv_limited_peer2.conf | 5 | ||||
-rw-r--r-- | src/core/test_core_quota_asymmetric_send_limit_peer1.conf | 6 | ||||
-rw-r--r-- | src/core/test_core_quota_asymmetric_send_limit_peer2.conf | 5 | ||||
-rw-r--r-- | src/core/test_core_quota_compliance.c | 16 | ||||
-rw-r--r-- | src/core/test_core_quota_peer1.conf | 6 | ||||
-rw-r--r-- | src/core/test_core_quota_peer2.conf | 5 |
11 files changed, 36 insertions, 32 deletions
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 | ||