use new quota parsing capabilities -- SVN 1875

diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c
index 7c92f77378a914f0163b278d45f6b9f5355fe6e0..324ab78ef58befe9f3b2d64700ca58e7ce55f21f 100644 (file)
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -139,7 +139,7 @@ GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
   char *name;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, section, "QUOTA", &quota))
+      GNUNET_CONFIGURATION_get_value_size (cfg, section, "QUOTA", &quota))
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
          _("No `%s' specified for `%s' in configuration!\n"), "QUOTA", section);

diff --git a/src/datacache/perf_datacache_data_mysql.conf b/src/datacache/perf_datacache_data_mysql.conf
index 25500692542f8418d95b2a3bd82938a1fd2af15f..1760f7d08e9666f0f038cd6f7f59f9bfcc059820 100644 (file)
--- a/src/datacache/perf_datacache_data_mysql.conf
+++ b/src/datacache/perf_datacache_data_mysql.conf
@@ -1,5 +1,5 @@
 [perfcache]
-QUOTA = 500000
+QUOTA = 500 KB
 DATABASE = mysql
 
 [datacache-mysql]

diff --git a/src/datacache/perf_datacache_data_postgres.conf b/src/datacache/perf_datacache_data_postgres.conf
index 9626933a3d03459acf1a81aa17426113cbe51089..c92f52a044077771b279fc81ff36a9dc56293add 100644 (file)
--- a/src/datacache/perf_datacache_data_postgres.conf
+++ b/src/datacache/perf_datacache_data_postgres.conf
@@ -1,5 +1,5 @@
 [perfcache]
-QUOTA = 500000
+QUOTA = 500 KB
 DATABASE = postgres
 
 [datacache-postgres]

diff --git a/src/datacache/perf_datacache_data_sqlite.conf b/src/datacache/perf_datacache_data_sqlite.conf
index b81034f5ffc054dcd2d1b7edc07792dd6d2364b2..9d0dbbdba5254d72beb9b70d44e445948d3a4d06 100644 (file)
--- a/src/datacache/perf_datacache_data_sqlite.conf
+++ b/src/datacache/perf_datacache_data_sqlite.conf
@@ -1,4 +1,4 @@
 [perfcache]
-QUOTA = 500000
+QUOTA = 500 KB
 DATABASE = sqlite
 

diff --git a/src/datacache/test_datacache_data_mysql.conf b/src/datacache/test_datacache_data_mysql.conf
index de84b4ca74307b5f01dcb38e370f4baf45233447..bc9daa3ad36c0e7fedbe092286e3d390ba482446 100644 (file)
--- a/src/datacache/test_datacache_data_mysql.conf
+++ b/src/datacache/test_datacache_data_mysql.conf
@@ -1,5 +1,5 @@
 [testcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = mysql
 
 [datacache-mysql]

diff --git a/src/datacache/test_datacache_data_postgres.conf b/src/datacache/test_datacache_data_postgres.conf
index 5452ea8175cdc43355ec0df6041775bbd771b79b..09e8e7253cb8210eebc347162d31cebd0ee43091 100644 (file)
--- a/src/datacache/test_datacache_data_postgres.conf
+++ b/src/datacache/test_datacache_data_postgres.conf
@@ -1,6 +1,6 @@
 
 [testcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = postgres
 
 [datacache-postgres]

diff --git a/src/datacache/test_datacache_data_sqlite.conf b/src/datacache/test_datacache_data_sqlite.conf
index 8254e483abcabe55ddac1a6e61f4e565947e2a07..bf6ce1b2bba8fa435d4c6976ba39c444c83f25ac 100644 (file)
--- a/src/datacache/test_datacache_data_sqlite.conf
+++ b/src/datacache/test_datacache_data_sqlite.conf
@@ -1,5 +1,5 @@
 [testcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 

diff --git a/src/datastore/datastore.conf b/src/datastore/datastore.conf
index ed44036c7e23a0fb6387a8cbd2d34520144e5a38..e86c75bb6c9736049d9e7c4d502ebba3b2bc79c2 100644 (file)
--- a/src/datastore/datastore.conf
+++ b/src/datastore/datastore.conf
@@ -10,7 +10,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-QUOTA = 100000000
+QUOTA = 100 MB
 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = sqlite
 # DISABLE_SOCKET_FORWARDING = NO

diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 71379d5db3bb1fe6bc50b03dde6c7d843f661b15..be88d288e46961f102d4068a65b156b5b9b7b7b9 100644 (file)
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -1480,7 +1480,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
 
   cfg = c;
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, "DATASTORE", "QUOTA", &quota))
+      GNUNET_CONFIGURATION_get_value_size (cfg, "DATASTORE", "QUOTA", &quota))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("No `%s' specified for `%s' in configuration!\n"), "QUOTA",

diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf
index 3dc17c3af26115eb801051e8d4a8fb58bc9a840f..8e5a3dc0d1a92c0327983d4dd5a1fc230ce0740e 100644 (file)
--- a/src/datastore/test_datastore_api_data_mysql.conf
+++ b/src/datastore/test_datastore_api_data_mysql.conf
@@ -17,7 +17,7 @@ PORT = 22667
 PORT = 42464
 
 [datastore]
-QUOTA = 10000000
+QUOTA = 10 MB
 DATABASE = mysql
 
 [datastore-mysql]

diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf
index c806ab5bee0be523385c60334e7f314d6e44f342..046c561f4633ef76c442a15246e1649cf35a2730 100644 (file)
--- a/src/datastore/test_datastore_api_data_postgres.conf
+++ b/src/datastore/test_datastore_api_data_postgres.conf
@@ -17,7 +17,7 @@ PORT = 22667
 PORT = 42464
 
 [datastore]
-QUOTA = 10000000
+QUOTA = 10 MB
 DATABASE = postgres
 
 [datastore-postgres]

diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf
index eaf4f2b5c3db2b14f36183fadfe25f35f9e16827..098f9d2b6da83c759fe8b65bbb23a346af64d31f 100644 (file)
--- a/src/datastore/test_datastore_api_data_sqlite.conf
+++ b/src/datastore/test_datastore_api_data_sqlite.conf
@@ -17,7 +17,7 @@ PORT = 22667
 PORT = 42464
 
 [datastore]
-QUOTA = 10000000
+QUOTA = 10 MB
 
 [fs]
 AUTOSTART = NO

diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
index e2911fc2d5694945468d42011135721383833d86..bbc1ad190d80b2dc3a036d07787d495b83dfc987 100644 (file)
--- a/src/datastore/test_defaults.conf
+++ b/src/datastore/test_defaults.conf
@@ -1,6 +1,6 @@
 [datastore]
 PORT = 22654
-QUOTA = 1000000
+QUOTA = 1 MB
 
 [dht]
 AUTOSTART = NO

diff --git a/src/dht/dht.conf b/src/dht/dht.conf
index 50c25daac9a2555f1dc235da3a59aeeb24067dde..ba903a2d023f0dd81025a517c0dd737928163d01 100644 (file)
--- a/src/dht/dht.conf
+++ b/src/dht/dht.conf
@@ -34,5 +34,5 @@ UNIX_MATCH_GID = YES
 
 [dhtcache]
 DATABASE = sqlite
-QUOTA = 1024000
+QUOTA = 1 MB
 

diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 090a7e507ca0b7f539fabcd60b7d0c83e0bbfec0..6bd5a892093c6516123e1d6e5e28711e44e3f639 100644 (file)
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -17,7 +17,7 @@ BINARY = gnunet-service-dht
 plugins = dht test
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 3e5d2c756a9877f28612221f9221f0c27cbe378e..9268153d7ff21463d205475ecb901f093b1c8594 100644 (file)
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -27,7 +27,7 @@ CONVERGE_MODIFIER = 4
 plugins = test dht
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 93cf0fa4212b8872381fc9304ec7be7ec548e67f..0cb0f18ab39f7998ea387ada2a63221a92116ca3 100644 (file)
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -16,7 +16,7 @@ BINARY = gnunet-service-dht
 plugins = test dht dns
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 6b2f02ee6f7b024e78982770334ad7e40b881865..957dc685991e4191bf165cc5f59de3f7420640e2 100644 (file)
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -7,5 +7,5 @@ TOTAL_QUOTA_IN = 3932160
 TOTAL_QUOTA_OUT = 3932160
 
 [datastore]
-QUOTA = 2000000000
+QUOTA = 2 GB
 

diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index f71a1206185db473c205df561c501534bc60fc26..a2b111181985306fb36a60add4a97f96996319d3 100644 (file)
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -28,7 +28,7 @@ HOSTNAME = localhost
 DEFAULTSERVICES = fs
 
 [datastore]
-QUOTA = 100000000
+QUOTA = 100 MB
 
 [statistics]
 PORT = 43467

diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index c6a6dff2e1df3e80dd384a6b4c29e2a275ef3993..b619591b88de3f1cc1d6076e49c399b096e6fc0d 100644 (file)
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -25,7 +25,7 @@ PORT = 2100
 plugins = dht test
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

diff --git a/src/mesh/test_mesh_path.conf b/src/mesh/test_mesh_path.conf
index c6a6dff2e1df3e80dd384a6b4c29e2a275ef3993..b619591b88de3f1cc1d6076e49c399b096e6fc0d 100644 (file)
--- a/src/mesh/test_mesh_path.conf
+++ b/src/mesh/test_mesh_path.conf
@@ -25,7 +25,7 @@ PORT = 2100
 plugins = dht test
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

diff --git a/src/vpn/test-conf.conf b/src/vpn/test-conf.conf
index 39446b53cd4f4cdee5a33935058ad5fcc8167645..2b6186b2ddd66b353240020b5ff2f416a3aa754f 100644 (file)
--- a/src/vpn/test-conf.conf
+++ b/src/vpn/test-conf.conf
@@ -49,7 +49,7 @@ UNIXPATH = /tmp/gnunet-service-dht.sock
 # PREFIX =
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [arm]
@@ -217,7 +217,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-QUOTA = 100000000
+QUOTA = 100 MB
 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = sqlite