From 41cd3ec1a38a2f04214450de954119183c065727 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 17 Oct 2024 11:37:25 +0200 Subject: [PATCH] dnsdist: Fix more "unused parameters" warnings --- pdns/dnsdistdist/bpf-filter.cc | 4 +++ pdns/dnsdistdist/dnsdist-internal-queries.cc | 2 +- .../dnsdist-lua-bindings-dnscrypt.cc | 2 +- .../dnsdist-lua-bindings-dnsquestion.cc | 6 ++-- .../dnsdist-lua-bindings-protobuf.cc | 4 +-- pdns/dnsdistdist/dnsdist-lua-ffi.cc | 4 +-- pdns/dnsdistdist/dnsdist-lua-web.cc | 2 +- pdns/dnsdistdist/dnsdist-lua.cc | 18 ++++++------ pdns/dnsdistdist/dnsdist-nghttp2.cc | 10 +++---- pdns/dnsdistdist/dnsdist-snmp.cc | 6 ++-- pdns/dnsdistdist/dnsdist-web.cc | 2 +- pdns/dnsdistdist/dnsdist.cc | 8 +++--- pdns/libssl.cc | 2 +- pdns/tcpiohandler.cc | 28 +++++++++---------- 14 files changed, 51 insertions(+), 47 deletions(-) diff --git a/pdns/dnsdistdist/bpf-filter.cc b/pdns/dnsdistdist/bpf-filter.cc index 700f32467dfb..bfed7cfc1119 100644 --- a/pdns/dnsdistdist/bpf-filter.cc +++ b/pdns/dnsdistdist/bpf-filter.cc @@ -900,6 +900,9 @@ uint64_t BPFFilter::getHits(const ComboAddress& requestor) BPFFilter::BPFFilter(std::unordered_map& configs, BPFFilter::MapFormat format, bool external) { + (void)configs; + (void)format; + (void)external; } void BPFFilter::addSocket(int) @@ -972,6 +975,7 @@ bool BPFFilter::supportsMatchAction(MatchAction action) const } return d_mapFormat == BPFFilter::MapFormat::WithActions; #endif /* HAVE_EBPF */ + (void)action; return false; } diff --git a/pdns/dnsdistdist/dnsdist-internal-queries.cc b/pdns/dnsdistdist/dnsdist-internal-queries.cc index 535062227df4..66b327e51ba8 100644 --- a/pdns/dnsdistdist/dnsdist-internal-queries.cc +++ b/pdns/dnsdistdist/dnsdist-internal-queries.cc @@ -29,7 +29,7 @@ std::unique_ptr getUDPCrossProtocolQueryFromDQ(DNSQuestion& namespace dnsdist { -std::unique_ptr getInternalQueryFromDQ(DNSQuestion& dnsQuestion, bool isResponse) +std::unique_ptr getInternalQueryFromDQ(DNSQuestion& dnsQuestion, [[maybe_unused]] bool isResponse) { auto protocol = dnsQuestion.getProtocol(); if (protocol == dnsdist::Protocol::DoUDP || protocol == dnsdist::Protocol::DNSCryptUDP) { diff --git a/pdns/dnsdistdist/dnsdist-lua-bindings-dnscrypt.cc b/pdns/dnsdistdist/dnsdist-lua-bindings-dnscrypt.cc index 65eba9e32b8a..5d5573aae085 100644 --- a/pdns/dnsdistdist/dnsdist-lua-bindings-dnscrypt.cc +++ b/pdns/dnsdistdist/dnsdist-lua-bindings-dnscrypt.cc @@ -26,7 +26,7 @@ #include "dolog.hh" -void setupLuaBindingsDNSCrypt(LuaContext& luaCtx, bool client) +void setupLuaBindingsDNSCrypt([[maybe_unused]] LuaContext& luaCtx, [[maybe_unused]] bool client) { #ifdef HAVE_DNSCRYPT /* DNSCryptContext bindings */ diff --git a/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc b/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc index 479b3371919c..6ddd0779e2c3 100644 --- a/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc +++ b/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc @@ -30,7 +30,7 @@ #include "dnsparser.hh" // NOLINTNEXTLINE(readability-function-cognitive-complexity): this function declares Lua bindings, even with a good refactoring it will likely blow up the threshold -void setupLuaBindingsDNSQuestion(LuaContext& luaCtx) +void setupLuaBindingsDNSQuestion([[maybe_unused]] LuaContext& luaCtx) { #ifndef DISABLE_NON_FFI_DQ_BINDINGS /* DNSQuestion */ @@ -173,7 +173,7 @@ void setupLuaBindingsDNSQuestion(LuaContext& luaCtx) return dnsQuestion.ids.queryRealTime.udiff(); }); - luaCtx.registerFunction("sendTrap", [](const DNSQuestion& dnsQuestion, boost::optional reason) { + luaCtx.registerFunction("sendTrap", []([[maybe_unused]] const DNSQuestion& dnsQuestion, [[maybe_unused]] boost::optional reason) { #ifdef HAVE_NET_SNMP if (g_snmpAgent != nullptr && dnsdist::configuration::getImmutableConfiguration().d_snmpTrapsEnabled) { g_snmpAgent->sendDNSTrap(dnsQuestion, reason ? *reason : ""); @@ -501,7 +501,7 @@ void setupLuaBindingsDNSQuestion(LuaContext& luaCtx) return dnsResponse.ids.queryRealTime.udiff(); }); - luaCtx.registerFunction("sendTrap", [](const DNSResponse& dnsResponse, boost::optional reason) { + luaCtx.registerFunction("sendTrap", []([[maybe_unused]] const DNSResponse& dnsResponse, [[maybe_unused]] boost::optional reason) { #ifdef HAVE_NET_SNMP if (g_snmpAgent != nullptr && dnsdist::configuration::getImmutableConfiguration().d_snmpTrapsEnabled) { g_snmpAgent->sendDNSTrap(dnsResponse, reason ? *reason : ""); diff --git a/pdns/dnsdistdist/dnsdist-lua-bindings-protobuf.cc b/pdns/dnsdistdist/dnsdist-lua-bindings-protobuf.cc index e532a568280f..8235f48af91c 100644 --- a/pdns/dnsdistdist/dnsdist-lua-bindings-protobuf.cc +++ b/pdns/dnsdistdist/dnsdist-lua-bindings-protobuf.cc @@ -128,7 +128,7 @@ void setupLuaBindingsProtoBuf(LuaContext& luaCtx, bool client, bool configCheck) return std::shared_ptr(new RemoteLogger(ComboAddress(remote), timeout ? *timeout : 2, maxQueuedEntries ? (*maxQueuedEntries*100) : 10000, reconnectWaitTime ? *reconnectWaitTime : 1, client)); }); - luaCtx.writeFunction("newFrameStreamUnixLogger", [client,configCheck](const std::string& address, boost::optional> params) { + luaCtx.writeFunction("newFrameStreamUnixLogger", [client,configCheck]([[maybe_unused]] const std::string& address, [[maybe_unused]] boost::optional> params) { #ifdef HAVE_FSTRM if (client || configCheck) { return std::shared_ptr(nullptr); @@ -143,7 +143,7 @@ void setupLuaBindingsProtoBuf(LuaContext& luaCtx, bool client, bool configCheck) #endif /* HAVE_FSTRM */ }); - luaCtx.writeFunction("newFrameStreamTcpLogger", [client,configCheck](const std::string& address, boost::optional> params) { + luaCtx.writeFunction("newFrameStreamTcpLogger", [client,configCheck]([[maybe_unused]] const std::string& address, [[maybe_unused]] boost::optional> params) { #if defined(HAVE_FSTRM) && defined(HAVE_FSTRM_TCP_WRITER_INIT) if (client || configCheck) { return std::shared_ptr(nullptr); diff --git a/pdns/dnsdistdist/dnsdist-lua-ffi.cc b/pdns/dnsdistdist/dnsdist-lua-ffi.cc index dfee7d356750..5c602da4ec1c 100644 --- a/pdns/dnsdistdist/dnsdist-lua-ffi.cc +++ b/pdns/dnsdistdist/dnsdist-lua-ffi.cc @@ -419,7 +419,7 @@ size_t dnsdist_ffi_dnsquestion_get_edns_options(dnsdist_ffi_dnsquestion_t* dq, c return totalCount; } -size_t dnsdist_ffi_dnsquestion_get_http_headers(dnsdist_ffi_dnsquestion_t* dq, const dnsdist_ffi_http_header_t** out) +size_t dnsdist_ffi_dnsquestion_get_http_headers(dnsdist_ffi_dnsquestion_t* dq, [[maybe_unused]] const dnsdist_ffi_http_header_t** out) { #if defined(HAVE_DNS_OVER_HTTPS) || defined(HAVE_DNS_OVER_HTTP3) const auto processHeaders = [&dq](const std::unordered_map& headers) { @@ -498,7 +498,7 @@ void dnsdist_ffi_dnsquestion_set_result(dnsdist_ffi_dnsquestion_t* dq, const cha dq->result = std::string(str, strSize); } -void dnsdist_ffi_dnsquestion_set_http_response(dnsdist_ffi_dnsquestion_t* dq, uint16_t statusCode, const char* body, size_t bodyLen, const char* contentType) +void dnsdist_ffi_dnsquestion_set_http_response(dnsdist_ffi_dnsquestion_t* dq, [[maybe_unused]] uint16_t statusCode, [[maybe_unused]] const char* body, [[maybe_unused]] size_t bodyLen, [[maybe_unused]] const char* contentType) { #if defined(HAVE_DNS_OVER_HTTPS) if (dq->dq->ids.du) { diff --git a/pdns/dnsdistdist/dnsdist-lua-web.cc b/pdns/dnsdistdist/dnsdist-lua-web.cc index 5785a4c5c2c7..a8b169b11954 100644 --- a/pdns/dnsdistdist/dnsdist-lua-web.cc +++ b/pdns/dnsdistdist/dnsdist-lua-web.cc @@ -30,7 +30,7 @@ namespace dnsdist::webserver void registerWebHandler(const std::string& endpoint, std::function handler, bool isLua); } -void setupLuaWeb(LuaContext& luaCtx) +void setupLuaWeb([[maybe_unused]] LuaContext& luaCtx) { #ifndef DISABLE_LUA_WEB_HANDLERS luaCtx.writeFunction("registerWebHandler", [](const std::string& path, std::function handler) { diff --git a/pdns/dnsdistdist/dnsdist-lua.cc b/pdns/dnsdistdist/dnsdist-lua.cc index 562120caf0a0..092da5fa83ad 100644 --- a/pdns/dnsdistdist/dnsdist-lua.cc +++ b/pdns/dnsdistdist/dnsdist-lua.cc @@ -2118,7 +2118,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) }); typedef std::unordered_map tlscertificateopts_t; - luaCtx.writeFunction("newTLSCertificate", [client](const std::string& cert, boost::optional opts) { + luaCtx.writeFunction("newTLSCertificate", [client]([[maybe_unused]] const std::string& cert, [[maybe_unused]] boost::optional opts) { std::shared_ptr result = nullptr; if (client) { return result; @@ -2139,7 +2139,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) return result; }); - luaCtx.writeFunction("addDOHLocal", [client](const std::string& addr, boost::optional, LuaArray, LuaArray>>> certFiles, boost::optional> keyFiles, boost::optional> urls, boost::optional vars) { + luaCtx.writeFunction("addDOHLocal", [client]([[maybe_unused]] const std::string& addr, [[maybe_unused]] boost::optional, LuaArray, LuaArray>>> certFiles, [[maybe_unused]] boost::optional> keyFiles, [[maybe_unused]] boost::optional> urls, [[maybe_unused]] boost::optional vars) { if (client) { return; } @@ -2307,7 +2307,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) }); // NOLINTNEXTLINE(performance-unnecessary-value-param): somehow clang-tidy gets confused about the fact vars could be const while it cannot - luaCtx.writeFunction("addDOH3Local", [client](const std::string& addr, const boost::variant, LuaArray, LuaArray>>& certFiles, const LuaTypeOrArrayOf& keyFiles, boost::optional vars) { + luaCtx.writeFunction("addDOH3Local", [client]([[maybe_unused]] const std::string& addr, [[maybe_unused]] const boost::variant, LuaArray, LuaArray>>& certFiles, [[maybe_unused]] const LuaTypeOrArrayOf& keyFiles, [[maybe_unused]] boost::optional vars) { if (client) { return; } @@ -2384,7 +2384,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) }); // NOLINTNEXTLINE(performance-unnecessary-value-param): somehow clang-tidy gets confused about the fact vars could be const while it cannot - luaCtx.writeFunction("addDOQLocal", [client](const std::string& addr, const boost::variant, LuaArray, LuaArray>>& certFiles, const LuaTypeOrArrayOf& keyFiles, boost::optional vars) { + luaCtx.writeFunction("addDOQLocal", [client]([[maybe_unused]] const std::string& addr, [[maybe_unused]] const boost::variant, LuaArray, LuaArray>>& certFiles, [[maybe_unused]] const LuaTypeOrArrayOf& keyFiles, [[maybe_unused]] boost::optional vars) { if (client) { return; } @@ -2635,7 +2635,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) #endif }); - luaCtx.writeFunction("getDOHFrontend", [client](uint64_t index) { + luaCtx.writeFunction("getDOHFrontend", [client]([[maybe_unused]] uint64_t index) { std::shared_ptr result = nullptr; if (client) { return result; @@ -2673,7 +2673,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) } }); - luaCtx.registerFunction::*)(boost::variant, LuaArray, LuaArray>> certFiles, LuaTypeOrArrayOf keyFiles)>("loadNewCertificatesAndKeys", [](const std::shared_ptr& frontend, const boost::variant, LuaArray, LuaArray>>& certFiles, const LuaTypeOrArrayOf& keyFiles) { + luaCtx.registerFunction::*)(boost::variant, LuaArray, LuaArray>> certFiles, LuaTypeOrArrayOf keyFiles)>("loadNewCertificatesAndKeys", []([[maybe_unused]] const std::shared_ptr& frontend, [[maybe_unused]] const boost::variant, LuaArray, LuaArray>>& certFiles, [[maybe_unused]] const LuaTypeOrArrayOf& keyFiles) { #ifdef HAVE_DNS_OVER_HTTPS if (frontend != nullptr) { if (loadTLSCertificateAndKeys("DOHFrontend::loadNewCertificatesAndKeys", frontend->d_tlsContext.d_tlsConfig.d_certKeyPairs, certFiles, keyFiles)) { @@ -2736,7 +2736,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) } }); - luaCtx.writeFunction("addTLSLocal", [client](const std::string& addr, const boost::variant, LuaArray, LuaArray>>& certFiles, const LuaTypeOrArrayOf& keyFiles, boost::optional vars) { + luaCtx.writeFunction("addTLSLocal", [client]([[maybe_unused]] const std::string& addr, [[maybe_unused]] const boost::variant, LuaArray, LuaArray>>& certFiles, [[maybe_unused]] const LuaTypeOrArrayOf& keyFiles, [[maybe_unused]] boost::optional vars) { if (client) { return; } @@ -2864,7 +2864,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) #endif }); - luaCtx.writeFunction("getTLSFrontend", [](uint64_t index) { + luaCtx.writeFunction("getTLSFrontend", []([[maybe_unused]] uint64_t index) { std::shared_ptr result = nullptr; #ifdef HAVE_DNS_OVER_TLS setLuaNoSideEffect(); @@ -2937,7 +2937,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) frontend->setupTLS(); }); - luaCtx.registerFunction::*)(const boost::variant, LuaArray, LuaArray>>&, const LuaTypeOrArrayOf&)>("loadNewCertificatesAndKeys", [](std::shared_ptr& frontend, const boost::variant, LuaArray, LuaArray>>& certFiles, const LuaTypeOrArrayOf& keyFiles) { + luaCtx.registerFunction::*)(const boost::variant, LuaArray, LuaArray>>&, const LuaTypeOrArrayOf&)>("loadNewCertificatesAndKeys", []([[maybe_unused]] std::shared_ptr& frontend, [[maybe_unused]] const boost::variant, LuaArray, LuaArray>>& certFiles, [[maybe_unused]] const LuaTypeOrArrayOf& keyFiles) { #ifdef HAVE_DNS_OVER_TLS if (loadTLSCertificateAndKeys("TLSFrontend::loadNewCertificatesAndKeys", frontend->d_tlsConfig.d_certKeyPairs, certFiles, keyFiles)) { frontend->setupTLS(); diff --git a/pdns/dnsdistdist/dnsdist-nghttp2.cc b/pdns/dnsdistdist/dnsdist-nghttp2.cc index 3ce8c376f2bd..03af2b5bba98 100644 --- a/pdns/dnsdistdist/dnsdist-nghttp2.cc +++ b/pdns/dnsdistdist/dnsdist-nghttp2.cc @@ -1045,7 +1045,7 @@ bool initDoHWorkers() #endif /* HAVE_DNS_OVER_HTTPS && HAVE_NGHTTP2 */ } -bool sendH2Query(const std::shared_ptr& ds, std::unique_ptr& mplexer, std::shared_ptr& sender, InternalQuery&& query, bool healthCheck) +bool sendH2Query([[maybe_unused]] const std::shared_ptr& ds, [[maybe_unused]] std::unique_ptr& mplexer, [[maybe_unused]] std::shared_ptr& sender, [[maybe_unused]] InternalQuery&& query, [[maybe_unused]] bool healthCheck) { #if defined(HAVE_DNS_OVER_HTTPS) && defined(HAVE_NGHTTP2) struct timeval now @@ -1080,7 +1080,7 @@ size_t clearH2Connections() return cleared; } -size_t handleH2Timeouts(FDMultiplexer& mplexer, const struct timeval& now) +size_t handleH2Timeouts([[maybe_unused]] FDMultiplexer& mplexer, [[maybe_unused]] const struct timeval& now) { size_t got = 0; #if defined(HAVE_DNS_OVER_HTTPS) && defined(HAVE_NGHTTP2) @@ -1107,21 +1107,21 @@ size_t handleH2Timeouts(FDMultiplexer& mplexer, const struct timeval& now) return got; } -void setDoHDownstreamCleanupInterval(uint16_t max) +void setDoHDownstreamCleanupInterval([[maybe_unused]] uint16_t max) { #if defined(HAVE_DNS_OVER_HTTPS) && defined(HAVE_NGHTTP2) DownstreamDoHConnectionsManager::setCleanupInterval(max); #endif /* HAVE_DNS_OVER_HTTPS && HAVE_NGHTTP2 */ } -void setDoHDownstreamMaxIdleTime(uint16_t max) +void setDoHDownstreamMaxIdleTime([[maybe_unused]] uint16_t max) { #if defined(HAVE_DNS_OVER_HTTPS) && defined(HAVE_NGHTTP2) DownstreamDoHConnectionsManager::setMaxIdleTime(max); #endif /* HAVE_DNS_OVER_HTTPS && HAVE_NGHTTP2 */ } -void setDoHDownstreamMaxIdleConnectionsPerBackend(size_t max) +void setDoHDownstreamMaxIdleConnectionsPerBackend([[maybe_unused]] size_t max) { #if defined(HAVE_DNS_OVER_HTTPS) && defined(HAVE_NGHTTP2) DownstreamDoHConnectionsManager::setMaxIdleConnectionsPerDownstream(max); diff --git a/pdns/dnsdistdist/dnsdist-snmp.cc b/pdns/dnsdistdist/dnsdist-snmp.cc index c32399fbad38..9d4a05c1f051 100644 --- a/pdns/dnsdistdist/dnsdist-snmp.cc +++ b/pdns/dnsdistdist/dnsdist-snmp.cc @@ -394,7 +394,7 @@ static int backendStatTable_handler(netsnmp_mib_handler* handler, } #endif /* HAVE_NET_SNMP */ -bool DNSDistSNMPAgent::sendBackendStatusChangeTrap(const DownstreamState& dss) +bool DNSDistSNMPAgent::sendBackendStatusChangeTrap([[maybe_unused]] const DownstreamState& dss) { #ifdef HAVE_NET_SNMP const string backendAddress = dss.d_config.remote.toStringWithPort(); @@ -432,7 +432,7 @@ bool DNSDistSNMPAgent::sendBackendStatusChangeTrap(const DownstreamState& dss) #endif /* HAVE_NET_SNMP */ } -bool DNSDistSNMPAgent::sendCustomTrap(const std::string& reason) +bool DNSDistSNMPAgent::sendCustomTrap([[maybe_unused]] const std::string& reason) { #ifdef HAVE_NET_SNMP netsnmp_variable_list* varList = nullptr; @@ -454,7 +454,7 @@ bool DNSDistSNMPAgent::sendCustomTrap(const std::string& reason) #endif /* HAVE_NET_SNMP */ } -bool DNSDistSNMPAgent::sendDNSTrap(const DNSQuestion& dnsQuestion, const std::string& reason) +bool DNSDistSNMPAgent::sendDNSTrap([[maybe_unused]] const DNSQuestion& dnsQuestion, [[maybe_unused]] const std::string& reason) { #ifdef HAVE_NET_SNMP std::string local = dnsQuestion.ids.origDest.toString(); diff --git a/pdns/dnsdistdist/dnsdist-web.cc b/pdns/dnsdistdist/dnsdist-web.cc index fc529283eaea..e5ee5a538376 100644 --- a/pdns/dnsdistdist/dnsdist-web.cc +++ b/pdns/dnsdistdist/dnsdist-web.cc @@ -214,7 +214,7 @@ class WebClientConnection Socket d_socket; }; -bool addMetricDefinition(const dnsdist::prometheus::PrometheusMetricDefinition& def) +bool addMetricDefinition([[maybe_unused]] const dnsdist::prometheus::PrometheusMetricDefinition& def) { #ifndef DISABLE_PROMETHEUS return MetricDefinitionStorage::addMetricDefinition(def); diff --git a/pdns/dnsdistdist/dnsdist.cc b/pdns/dnsdistdist/dnsdist.cc index 22ae585217f1..a72f503508db 100644 --- a/pdns/dnsdistdist/dnsdist.cc +++ b/pdns/dnsdistdist/dnsdist.cc @@ -485,7 +485,7 @@ bool applyRulesToResponse(const std::vector& return true; } -bool processResponseAfterRules(PacketBuffer& response, DNSResponse& dnsResponse, bool muted) +bool processResponseAfterRules(PacketBuffer& response, DNSResponse& dnsResponse, [[maybe_unused]] bool muted) { bool zeroScope = false; if (!fixUpResponse(response, dnsResponse.ids.qname, dnsResponse.ids.origFlags, dnsResponse.ids.ednsAdded, dnsResponse.ids.ecsAdded, dnsResponse.ids.useZeroScope ? &zeroScope : nullptr)) { @@ -584,7 +584,7 @@ static size_t getMaximumIncomingPacketSize(const ClientState& clientState) return dnsdist::configuration::s_udpIncomingBufferSize + runtimeConfig.d_proxyProtocolMaximumSize; } -bool sendUDPResponse(int origFD, const PacketBuffer& response, const int delayMsec, const ComboAddress& origDest, const ComboAddress& origRemote) +bool sendUDPResponse(int origFD, const PacketBuffer& response, [[maybe_unused]] const int delayMsec, const ComboAddress& origDest, const ComboAddress& origRemote) { #ifndef DISABLE_DELAY_PIPE if (delayMsec > 0 && g_delay != nullptr) { @@ -1266,7 +1266,7 @@ static bool isUDPQueryAcceptable(ClientState& clientState, const struct msghdr* return true; } -bool checkDNSCryptQuery(const ClientState& clientState, PacketBuffer& query, std::unique_ptr& dnsCryptQuery, time_t now, bool tcp) +bool checkDNSCryptQuery(const ClientState& clientState, [[maybe_unused]] PacketBuffer& query, [[maybe_unused]] std::unique_ptr& dnsCryptQuery, [[maybe_unused]] time_t now, [[maybe_unused]] bool tcp) { if (clientState.dnscryptCtx) { #ifdef HAVE_DNSCRYPT @@ -1332,7 +1332,7 @@ struct mmsghdr #endif /* self-generated responses or cache hits */ -static bool prepareOutgoingResponse(const ClientState& clientState, DNSQuestion& dnsQuestion, bool cacheHit) +static bool prepareOutgoingResponse([[maybe_unused]] const ClientState& clientState, DNSQuestion& dnsQuestion, bool cacheHit) { std::shared_ptr backend{nullptr}; DNSResponse dnsResponse(dnsQuestion.ids, dnsQuestion.getMutableData(), backend); diff --git a/pdns/libssl.cc b/pdns/libssl.cc index 4bb47d0ec2ca..dd0863a808dc 100644 --- a/pdns/libssl.cc +++ b/pdns/libssl.cc @@ -895,7 +895,7 @@ bool OpenSSLTLSTicketKey::decrypt(const unsigned char* iv, EVP_CIPHER_CTX* ectx, } std::pair, std::vector> libssl_init_server_context(const TLSConfig& config, - std::map& ocspResponses) + [[maybe_unused]] std::map& ocspResponses) { std::vector warnings; auto ctx = std::unique_ptr(SSL_CTX_new(SSLv23_server_method()), SSL_CTX_free); diff --git a/pdns/tcpiohandler.cc b/pdns/tcpiohandler.cc index 0286b524db6e..0b07569d14bd 100644 --- a/pdns/tcpiohandler.cc +++ b/pdns/tcpiohandler.cc @@ -7,25 +7,13 @@ const bool TCPIOHandler::s_disableConnectForUnitTests = false; -namespace { -bool shouldDoVerboseLogging() -{ -#ifdef DNSDIST - return dnsdist::configuration::getCurrentRuntimeConfiguration().d_verbose; -#elif defined(RECURSOR) - return false; -#else - return true; -#endif -} -} - #ifdef HAVE_LIBSODIUM #include #endif /* HAVE_LIBSODIUM */ TLSCtx::tickets_key_added_hook TLSCtx::s_ticketsKeyAddedHook{nullptr}; +#if defined(HAVE_DNS_OVER_TLS) || defined(HAVE_DNS_OVER_HTTPS) static std::vector> getALPNVector(TLSFrontend::ALPN alpn, bool client) { if (alpn == TLSFrontend::ALPN::DoT) { @@ -46,9 +34,21 @@ static std::vector> getALPNVector(TLSFrontend::ALPN alpn, b return {}; } -#if defined(HAVE_DNS_OVER_TLS) || defined(HAVE_DNS_OVER_HTTPS) #ifdef HAVE_LIBSSL +namespace { +bool shouldDoVerboseLogging() +{ +#ifdef DNSDIST + return dnsdist::configuration::getCurrentRuntimeConfiguration().d_verbose; +#elif defined(RECURSOR) + return false; +#else + return true; +#endif +} +} + #include #include #include