Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fd78fab authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Allow setting values lower than MAX_ENTRIES_DEFAULT in max_cache_entries am:... 

Allow setting values lower than MAX_ENTRIES_DEFAULT in max_cache_entries am: 016e344d am: f496bf0c am: 97b45889 am: 1cbc6550 am: 126237fd

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2623771



Change-Id: If69f6b2e296309460ea98b3cf8f6586c92107597
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d78025a 126237fd

res_cache.cpp

+2 −1
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ using std::span; 
 * *****************************************

 */

const int MAX_ENTRIES_DEFAULT = 64 * 2 * 5;

const int MAX_ENTRIES_LOWER_BOUND = 0;

const int MAX_ENTRIES_UPPER_BOUND = 100 * 1000;

constexpr int DNSEVENT_SUBSAMPLING_MAP_DEFAULT_KEY = -1;
@@ -1007,7 +1008,7 @@ struct Cache { 
                                                                        MAX_ENTRIES_DEFAULT);

        // Check both lower and upper bounds to prevent irrational values mistakenly pushed by

        // server.

        if (entries < MAX_ENTRIES_DEFAULT || entries > MAX_ENTRIES_UPPER_BOUND) {

        if (entries < MAX_ENTRIES_LOWER_BOUND || entries > MAX_ENTRIES_UPPER_BOUND) {

            LOG(ERROR) << "Misconfiguration on max_cache_entries " << entries;

            entries = MAX_ENTRIES_DEFAULT;

        }

tests/resolv_cache_unit_test.cpp

+5 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ constexpr int DNS_PORT = 53; 
// Constant values sync'd from res_cache.cpp

constexpr int DNS_HEADER_SIZE = 12;

constexpr int MAX_ENTRIES_DEFAULT = 64 * 2 * 5;

constexpr int MAX_ENTRIES_LOWER_BOUND = 0;

constexpr int MAX_ENTRIES_UPPER_BOUND = 100 * 1000;



namespace {
@@ -627,8 +628,11 @@ class ResolvCacheParameterizedTest : public ResolvCacheTest, 
                                     public testing::WithParamInterface<int> {};



INSTANTIATE_TEST_SUITE_P(MaxCacheEntries, ResolvCacheParameterizedTest,

                         testing::Values(0, MAX_ENTRIES_UPPER_BOUND + 1),

                         testing::Values(MAX_ENTRIES_LOWER_BOUND - 1, MAX_ENTRIES_UPPER_BOUND + 1),

                         [](const testing::TestParamInfo<int>& info) {

                             if (info.param < 0) {  // '-' is an invalid character in test name

                                 return "negative_" + std::to_string(abs(info.param));

                             }

                             return std::to_string(info.param);

                         });