From ffdb1652e3ce6bd3fcfd4df2aa45fc5194229167 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Fri, 21 Jun 2024 10:50:39 +0200 Subject: [PATCH] dnsdist: Fix unwanted copies of the configuration --- pdns/dnsdistdist/dnsdist-web.cc | 4 ++-- pdns/dnsdistdist/dnsdist.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pdns/dnsdistdist/dnsdist-web.cc b/pdns/dnsdistdist/dnsdist-web.cc index 23cb39fcc7..a9e4afc2ef 100644 --- a/pdns/dnsdistdist/dnsdist-web.cc +++ b/pdns/dnsdistdist/dnsdist-web.cc @@ -1431,8 +1431,8 @@ static void handleConfigDump(const YaHTTP::Request& req, YaHTTP::Response& resp) resp.status = 200; Json::array doc; - const auto runtimeConfiguration = dnsdist::configuration::getCurrentRuntimeConfiguration(); - const auto immutableConfig = dnsdist::configuration::getImmutableConfiguration(); + const auto& runtimeConfiguration = dnsdist::configuration::getCurrentRuntimeConfiguration(); + const auto& immutableConfig = dnsdist::configuration::getImmutableConfiguration(); using configentry_t = boost::variant; std::vector> configEntries{ {"acl", runtimeConfiguration.d_ACL.toString()}, diff --git a/pdns/dnsdistdist/dnsdist.cc b/pdns/dnsdistdist/dnsdist.cc index 646652dcbf..036911857c 100644 --- a/pdns/dnsdistdist/dnsdist.cc +++ b/pdns/dnsdistdist/dnsdist.cc @@ -1031,7 +1031,7 @@ static bool applyRulesToQuery(DNSQuestion& dnsQuestion, const timespec& now) } { - const auto runtimeConfig = dnsdist::configuration::getCurrentRuntimeConfiguration(); + const auto& runtimeConfig = dnsdist::configuration::getCurrentRuntimeConfiguration(); if (runtimeConfig.d_queryCountConfig.d_enabled) { string qname = dnsQuestion.ids.qname.toLogString(); bool countQuery{true}; @@ -2455,7 +2455,7 @@ static void dropUserPrivs(uid_t uid) static void checkFileDescriptorsLimits(size_t udpBindsCount, size_t tcpBindsCount) { - const auto immutableConfig = dnsdist::configuration::getImmutableConfiguration(); + const auto& immutableConfig = dnsdist::configuration::getImmutableConfiguration(); /* stdin, stdout, stderr */ rlim_t requiredFDsCount = 3; const auto backends = dnsdist::configuration::getCurrentRuntimeConfiguration().d_backends; @@ -2506,7 +2506,7 @@ static void checkFileDescriptorsLimits(size_t udpBindsCount, size_t tcpBindsCoun static void setupLocalSocket(ClientState& clientState, const ComboAddress& addr, int& socket, bool tcp, bool warn) { - const auto immutableConfig = dnsdist::configuration::getImmutableConfiguration(); + const auto& immutableConfig = dnsdist::configuration::getImmutableConfiguration(); static bool s_warned_ipv6_recvpktinfo = false; (void)warn; socket = SSocket(addr.sin4.sin_family, !tcp ? SOCK_DGRAM : SOCK_STREAM, 0); -- 2.47.2