aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2011-11-29 17:13:57 +0000
committerBart Polot <bart@net.in.tum.de>2011-11-29 17:13:57 +0000
commit5ca85864950a1fe92613f5ed3a69cd08d248423e (patch)
tree26b44bbe805223a9ca58aa46d112bb49fad35f72 /src/fs
parentb312a0e714d1782f1258b3aaa697f8f36315cd60 (diff)
downloadgnunet-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/fs')
-rw-r--r--src/fs/fs_test_lib_data.conf6
-rw-r--r--src/fs/gnunet-service-fs_pr.c4
-rw-r--r--src/fs/test_fs_defaults.conf6
-rw-r--r--src/fs/test_gnunet_service_fs_migration_data.conf6
4 files changed, 12 insertions, 10 deletions
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]
3SERVICEHOME = /tmp/gnunet-fs-test-lib/ 3SERVICEHOME = /tmp/gnunet-fs-test-lib/
4 4
5[core] 5[ats]
6TOTAL_QUOTA_IN = 3932160 6WAN_QUOTA_IN = 3932160
7TOTAL_QUOTA_OUT = 3932160 7WAN_QUOTA_OUT = 3932160
8 8
9[datastore] 9[datastore]
10QUOTA = 2 GB 10QUOTA = 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
42PORT = 43469 42PORT = 43469
43HOSTNAME = localhost 43HOSTNAME = localhost
44 44
45[ats]
46WAN_QUOTA_IN = 65536
47WAN_QUOTA_OUT = 65536
48
45[core] 49[core]
46PORT = 43470 50PORT = 43470
47HOSTNAME = localhost 51HOSTNAME = localhost
48TOTAL_QUOTA_IN = 65536
49TOTAL_QUOTA_OUT = 65536
50 52
51[fs] 53[fs]
52PORT = 43471 54PORT = 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/
4DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf 4DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf
5 5
6 6
7[core] 7[ats]
8TOTAL_QUOTA_IN = 3932160 8WAN_QUOTA_IN = 3932160
9TOTAL_QUOTA_OUT = 3932160 9WAN_QUOTA_OUT = 3932160