From: Remi Gacogne Date: Wed, 3 Sep 2025 07:34:39 +0000 (+0200) Subject: dnsdist: Fix code formatting X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ebb13752cd19e8dc19fe26bfb7dc77da86521cc;p=thirdparty%2Fpdns.git dnsdist: Fix code formatting Signed-off-by: Remi Gacogne --- diff --git a/pdns/dnsdistdist/dnsdist-configuration-yaml.cc b/pdns/dnsdistdist/dnsdist-configuration-yaml.cc index f5b07b196..e2b36bc2c 100644 --- a/pdns/dnsdistdist/dnsdist-configuration-yaml.cc +++ b/pdns/dnsdistdist/dnsdist-configuration-yaml.cc @@ -988,46 +988,46 @@ static void handlePacketCacheConfiguration(const ::rust::Vec ranks; - if (!cache.options_to_skip.empty()) { - settings.d_optionsToSkip.clear(); - settings.d_optionsToSkip.insert(EDNSOptionCode::COOKIE); - for (const auto& option : cache.options_to_skip) { - settings.d_optionsToSkip.insert(pdns::checked_stoi(std::string(option))); - } - } - if (cache.cookie_hashing) { - settings.d_optionsToSkip.erase(EDNSOptionCode::COOKIE); - } - if (cache.maximum_entry_size >= sizeof(dnsheader)) { - settings.d_maximumEntrySize = cache.maximum_entry_size; - } - for (const auto& rank : cache.payload_ranks) { - if (rank < 512 || rank > settings.d_maximumEntrySize) { - continue; - } - ranks.insert(rank); + .d_maxEntries = cache.size, + .d_maxTTL = cache.max_ttl, + .d_minTTL = cache.min_ttl, + .d_tempFailureTTL = cache.temporary_failure_ttl, + .d_maxNegativeTTL = cache.max_negative_ttl, + .d_staleTTL = cache.stale_ttl, + .d_shardCount = cache.shards, + .d_dontAge = cache.dont_age, + .d_deferrableInsertLock = cache.deferrable_insert_lock, + .d_parseECS = cache.parse_ecs, + .d_keepStaleData = cache.keep_stale_data, + }; + std::unordered_set ranks; + if (!cache.options_to_skip.empty()) { + settings.d_optionsToSkip.clear(); + settings.d_optionsToSkip.insert(EDNSOptionCode::COOKIE); + for (const auto& option : cache.options_to_skip) { + settings.d_optionsToSkip.insert(pdns::checked_stoi(std::string(option))); } - if (!ranks.empty()) { - settings.d_payloadRanks.assign(ranks.begin(), ranks.end()); - std::sort(settings.d_payloadRanks.begin(), settings.d_payloadRanks.end()); + } + if (cache.cookie_hashing) { + settings.d_optionsToSkip.erase(EDNSOptionCode::COOKIE); + } + if (cache.maximum_entry_size >= sizeof(dnsheader)) { + settings.d_maximumEntrySize = cache.maximum_entry_size; + } + for (const auto& rank : cache.payload_ranks) { + if (rank < 512 || rank > settings.d_maximumEntrySize) { + continue; } - auto packetCacheObj = std::make_shared(settings); - - registerType(packetCacheObj, cache.name); + ranks.insert(rank); } + if (!ranks.empty()) { + settings.d_payloadRanks.assign(ranks.begin(), ranks.end()); + std::sort(settings.d_payloadRanks.begin(), settings.d_payloadRanks.end()); + } + auto packetCacheObj = std::make_shared(settings); + + registerType(packetCacheObj, cache.name); + } } static void handleEBPFConfiguration([[maybe_unused]] const dnsdist::rust::settings::EbpfConfiguration& ebpf, [[maybe_unused]] bool configCheck)