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
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
+WAN_QUOTA_IN = 65536
+WAN_QUOTA_OUT = 65536
 # ATS options
 DUMP_MLP = NO
 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,
   atc->alloc_cb_cls = alloc_cb_cls;
   atc->peers = GNUNET_CONTAINER_multihashmap_create (256);
   atc->notify_map = GNUNET_CONTAINER_multihashmap_create (256);
-  GNUNET_CONFIGURATION_get_value_size (cfg, "core", "TOTAL_QUOTA_OUT",
+  GNUNET_CONFIGURATION_get_value_size (cfg, "ats", "WAN_QUOTA_OUT",
                                          &atc->total_bps_out);
-  GNUNET_CONFIGURATION_get_value_size (cfg, "core", "TOTAL_QUOTA_IN",
+  GNUNET_CONFIGURATION_get_value_size (cfg, "ats", "WAN_QUOTA_IN",
                                        &atc->total_bps_in);
   return atc;
 }
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
 
 static struct GNUNET_CONTAINER_MultiHashMap *addresses;
 
-static unsigned long long total_quota_in;
+static unsigned long long wan_quota_in;
 
-static unsigned long long total_quota_out;
+static unsigned long long wan_quota_out;
 
 static unsigned int active_addr_count;
 
@@ -100,8 +100,8 @@ update_bw_it (void *cls, const GNUNET_HashCode * key, void *value)
   if (GNUNET_YES != aa->active)
     return GNUNET_OK;
   GNUNET_assert (active_addr_count > 0);
-  aa->assigned_bw_in.value__ = htonl (total_quota_in / active_addr_count);
-  aa->assigned_bw_out.value__ = htonl (total_quota_out / active_addr_count);
+  aa->assigned_bw_in.value__ = htonl (wan_quota_in / active_addr_count);
+  aa->assigned_bw_out.value__ = htonl (wan_quota_out / active_addr_count);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n",
               GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__),
               ntohl (aa->assigned_bw_out.value__));
@@ -475,13 +475,13 @@ void
 GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_get_value_size (cfg, "core",
-                                                      "TOTAL_QUOTA_IN",
-                                                      &total_quota_in));
+                 GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
+                                                      "WAN_QUOTA_IN",
+                                                      &wan_quota_in));
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_get_value_size (cfg, "core",
-                                                      "TOTAL_QUOTA_OUT",
-                                                      &total_quota_out));
+                 GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
+                                                      "WAN_QUOTA_OUT",
+                                                      &wan_quota_out));
   addresses = GNUNET_CONTAINER_multihashmap_create (128);
 }
 
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
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
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
 [core]
-TOTAL_QUOTA_IN = 1 GB
-TOTAL_QUOTA_OUT = 1 GB
 AUTOSTART = YES
 PORT = 10003
 
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
 FRIENDS-ONLY = NO
 MINIMUM-FRIENDS = 0
 
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1GB
+
 [core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
 PORT = 2092
 
 [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;
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
 [core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
 PORT = 12092
 
 [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
 [DHTLOG]
 PLUGIN = mysql_dump
 
+[ats]
+WAN_QUOTA_IN = 1GB
+WAN_QUOTA_OUT = 1GB
+
 [core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 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
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
 [core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
 HOSTNAME = localhost
 PORT = 12092
 
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 @@
 [PATHS]
 SERVICEHOME = /tmp/gnunet-fs-test-lib/
 
-[core]
-TOTAL_QUOTA_IN = 3932160
-TOTAL_QUOTA_OUT = 3932160
+[ats]
+WAN_QUOTA_IN = 3932160
+WAN_QUOTA_OUT = 3932160
 
 [datastore]
 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_ ()
                 "MAX_PENDING_REQUESTS");
   }
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_size (GSF_cfg, "core", "TOTAL_QUOTA_OUT",
+      GNUNET_CONFIGURATION_get_value_size (GSF_cfg, "ats", "WAN_QUOTA_OUT",
                                            &bps))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 _
                 ("Configuration fails to specify `%s', assuming default value."),
-                "TOTAL_QUOTA_IN");
+                "WAN_QUOTA_OUT");
     bps = 65536;
   }
   /* 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
 PORT = 43469
 HOSTNAME = localhost
 
+[ats]
+WAN_QUOTA_IN = 65536
+WAN_QUOTA_OUT = 65536
+
 [core]
 PORT = 43470
 HOSTNAME = localhost
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
 
 [fs]
 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/
 DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf
 
 
-[core]
-TOTAL_QUOTA_IN = 3932160
-TOTAL_QUOTA_OUT = 3932160
+[ats]
+WAN_QUOTA_IN = 3932160
+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;
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
 [core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
 PORT = 12092
 
 [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
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
 [core]
-TOTAL_QUOTA_IN = 999111999
-TOTAL_QUOTA_OUT = 999111999
 AUTOSTART = YES
 PORT = 10003
 
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;
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
 [core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
 PORT = 12092
 
 [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
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
 [core]
-TOTAL_QUOTA_IN = 1 GB
-TOTAL_QUOTA_OUT = 1 GB
 AUTOSTART = YES
 PORT = 10003
 
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
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
 [core]
-TOTAL_QUOTA_IN = 1 GB
-TOTAL_QUOTA_OUT = 1 GB
 AUTOSTART = YES
 PORT = 10003
 
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,
   GNUNET_asprintf (&fname, "q_in_%llu_q_out_%llu_%s", quota_in, quota_out,
                    cfg_file);
   GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG", fname);
-  GNUNET_CONFIGURATION_set_value_number (cfg, "core", "TOTAL_QUOTA_OUT",
-                                         quota_out);
-  GNUNET_CONFIGURATION_set_value_number (cfg, "core", "TOTAL_QUOTA_IN",
-                                         quota_in);
-  GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "TOTAL_QUOTA_IN",
+  GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "WAN_QUOTA_IN",
                                          quota_in);
-  GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "TOTAL_QUOTA_OUT",
+  GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "WAN_QUOTA_OUT",
                                          quota_out);
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname));
   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 @@
 SERVICEHOME = /tmp/test-transport/api-http-p1/
 DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [nat]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-http-p2/
 DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824 
+WAN_QUOTA_IN  = 1073741824
 
 [transport-http]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-http-p1/
 DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN  = 1 GB
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [transport-tcp]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-http-p2/
 DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN  = 1 GB
+[ats]
+WAN_QUOTA_OUT = 1 GB
+WAN_QUOTA_IN  = 1 GB
 
 [transport-http]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-https-p1/
 DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [nat]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-https-p2/
 DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824 
+WAN_QUOTA_IN  = 1073741824
 
 [transport-https]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-https-p1/
 DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [transport-https]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-https-p2/
 DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824 
+WAN_QUOTA_IN  = 1073741824
 
 [transport-https]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
 DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN  = 1 GB
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [nat]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
 DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN  = 1 GB
+[ats]
+WAN_QUOTA_OUT = 1 GB
+WAN_QUOTA_IN  = 1 GB
 
 [nat]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-tcp-p1/
 DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf
         
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN  = 1 GB
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [transport-tcp]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-tcp-p2/
 DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN  = 1 GB
+[ats]
+WAN_QUOTA_OUT = 1 GB
+WAN_QUOTA_IN  = 1 GB
 
 [transport-tcp]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-wlan-p1/
 DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [transport-wlan]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-wlan-p2/
 DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824 
+WAN_QUOTA_IN  = 1073741824
 
 [transport-wlan]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-udp-p1/
 DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [transport-udp]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-udp-p2/
 DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824 
+WAN_QUOTA_IN  = 1073741824
 
 [transport-udp]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-udp-p1/
 DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [transport-udp]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-udp-p2/
 DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824 
+WAN_QUOTA_IN  = 1073741824
 
 [transport-udp]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-unix-p1/
 DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [arm]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-unix-p2/
 DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824 
+WAN_QUOTA_IN  = 1073741824
 
 [arm]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-wlan-p1/
 DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [transport-wlan]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-wlan-p2/
 DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824 
+WAN_QUOTA_IN  = 1073741824
 
 [transport-wlan]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-wlan-p1/
 DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [transport-wlan]
 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 @@
 SERVICEHOME = /tmp/test-transport/api-wlan-p2/
 DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
 
-[core]
-TOTAL_QUOTA_OUT = 1073741824 
-TOTAL_QUOTA_IN  = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824 
+WAN_QUOTA_IN  = 1073741824
 
 [transport-wlan]
 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
 # REJECT_FROM6 =
 # PREFIX =
 
+[ats]
+WAN_QUOTA_IN = 64 kiB
+WAN_QUOTA_OUT = 64 kiB
+
 [core]
 AUTOSTART = YES
 PORT = 2092
@@ -163,9 +167,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
 # DEBUG = YES
 # USERNAME =