summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core.conf3
-rw-r--r--src/core/test_core_api_data.conf6
-rw-r--r--src/core/test_core_api_send_to_self.conf4
-rw-r--r--src/core/test_core_defaults.conf6
-rw-r--r--src/core/test_core_quota_asymmetric_recv_limited_peer1.conf6
-rw-r--r--src/core/test_core_quota_asymmetric_recv_limited_peer2.conf5
-rw-r--r--src/core/test_core_quota_asymmetric_send_limit_peer1.conf6
-rw-r--r--src/core/test_core_quota_asymmetric_send_limit_peer2.conf5
-rw-r--r--src/core/test_core_quota_compliance.c16
-rw-r--r--src/core/test_core_quota_peer1.conf6
-rw-r--r--src/core/test_core_quota_peer2.conf5
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
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-# quotas are in bytes per second now!
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
UNIXPATH = /tmp/gnunet-service-core.sock
UNIX_MATCH_UID = YES
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
[arm]
DEFAULTSERVICES = topology hostlist
+[ats]
+WAN_QUOTA_IN = 64 kiB
+WAN_QUOTA_OUT = 64 kiB
+
[core]
PORT = 2092
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
UNIXPATH = /tmp/gnunet-service-core.sock
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
[core]
PORT = 24512
-TOTAL_QUOTA_IN = 104857600
-TOTAL_QUOTA_OUT = 104757600
UNIXPATH = /tmp/gnunet-service-core.sock
[ats]
+WAN_QUOTA_IN = 104857600
+WAN_QUOTA_OUT = 104757600
PORT = 24571
UNIXPATH = /tmp/gnunet-p1-service-ats.sock
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
EXTERNAL_ADDRESS = 127.0.0.1
USE_LOCALADDR = NO
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
[core]
PORT = 12470
UNIXPATH = /tmp/gnunet-p1-service-core.sock
-TOTAL_QUOTA_IN = 655360000
-TOTAL_QUOTA_OUT = 655360000
[transport-tcp]
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
PORT = 12485
UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-transport.sock
+[ats]
+WAN_QUOTA_IN = 1 MB
+WAN_QUOTA_OUT = 1 MB
+
[core]
PORT = 12490
-TOTAL_QUOTA_IN = 1000000
-TOTAL_QUOTA_OUT = 1000000
UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-core.sock
DEBUG = NO
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
[core]
PORT = 22490
-TOTAL_QUOTA_IN = 10240
-TOTAL_QUOTA_OUT = 10240
UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock
DEBUG = NO
[ats]
PORT = 22491
UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-ats.sock
-
+WAN_QUOTA_IN = 10 kiB
+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
PORT = 12485
UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock
+[ats]
+WAN_QUOTA_IN = 10240
+WAN_QUOTA_OUT = 10240
+
[core]
PORT = 12490
-TOTAL_QUOTA_IN = 10240
-TOTAL_QUOTA_OUT = 10240
UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock
DEBUG = NO
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
[core]
PORT = 22490
-TOTAL_QUOTA_IN = 1000000
-TOTAL_QUOTA_OUT = 1000000
UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock
DEBUG = NO
@@ -37,4 +35,5 @@ DEBUG = NO
[ats]
PORT = 22491
UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-ats.sock
-
+WAN_QUOTA_IN = 1 MB
+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,
GNUNET_assert (test != -1);
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_size (p1.cfg, "CORE",
- "TOTAL_QUOTA_IN",
+ GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+ "WAN_QUOTA_IN",
&current_quota_p1_in));
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_size (p2.cfg, "CORE",
- "TOTAL_QUOTA_IN",
+ GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+ "WAN_QUOTA_IN",
&current_quota_p2_in));
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_size (p1.cfg, "CORE",
- "TOTAL_QUOTA_OUT",
+ GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+ "WAN_QUOTA_OUT",
&current_quota_p1_out));
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_size (p2.cfg, "CORE",
- "TOTAL_QUOTA_OUT",
+ GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+ "WAN_QUOTA_OUT",
&current_quota_p2_out));
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
PORT = 12475
UNIXPATH = /tmp/gnunet-core-sym-p1-service-transport.sock
+[ats]
+WAN_QUOTA_IN = 10240
+WAN_QUOTA_OUT = 10240
+
[core]
PORT = 12480
-TOTAL_QUOTA_IN = 10240
-TOTAL_QUOTA_OUT = 10240
UNIXPATH = /tmp/gnunet-core-sym-p1-service-core.sock
DEBUG = NO
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
[core]
PORT = 22480
-TOTAL_QUOTA_IN = 10240
-TOTAL_QUOTA_OUT = 10240
UNIXPATH = /tmp/gnunet-core-sym-p2-service-core.sock
DEBUG = NO
[ats]
PORT = 22482
UNIXPATH = /tmp/gnunet-core-sym-p2-service-ats.sock
-
+WAN_QUOTA_IN = 10 kiB
+WAN_QUOTA_OUT = 10 kiB \ No newline at end of file