From: Remi Gacogne Date: Mon, 3 Feb 2025 10:09:52 +0000 (+0100) Subject: dnsdist: Fix unused parameter warnings X-Git-Tag: dnsdist-2.0.0-alpha1~128^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F14724%2Fhead;p=thirdparty%2Fpdns.git dnsdist: Fix unused parameter warnings --- diff --git a/pdns/dnsdistdist/dnsdist-actions-factory.cc b/pdns/dnsdistdist/dnsdist-actions-factory.cc index c8550f4c9d..21e6dd3ab8 100644 --- a/pdns/dnsdistdist/dnsdist-actions-factory.cc +++ b/pdns/dnsdistdist/dnsdist-actions-factory.cc @@ -55,6 +55,8 @@ class DropAction : public DNSAction public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)dnsquestion; + (void)ruleresult; return Action::Drop; } [[nodiscard]] std::string toString() const override @@ -68,6 +70,8 @@ class AllowAction : public DNSAction public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)dnsquestion; + (void)ruleresult; return Action::Allow; } [[nodiscard]] std::string toString() const override @@ -82,6 +86,8 @@ public: // this action does not stop the processing DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)dnsquestion; + (void)ruleresult; return Action::None; } [[nodiscard]] std::string toString() const override @@ -99,6 +105,8 @@ public: } DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)dnsquestion; + (void)ruleresult; if (d_qps.lock()->check()) { return Action::None; } @@ -122,6 +130,7 @@ public: } DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)dnsquestion; *ruleresult = std::to_string(d_msec); return Action::Delay; } @@ -193,6 +202,7 @@ TeeAction::~TeeAction() DNSAction::Action TeeAction::operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const { + (void)ruleresult; if (dnsquestion->overTCP()) { d_tcpdrops++; return DNSAction::Action::None; @@ -345,6 +355,7 @@ public: d_qps(QPSLimiter(limit, limit)), d_pool(std::move(pool)), d_stopProcessing(stopProcessing) {} DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; if (d_qps.lock()->check()) { if (d_stopProcessing) { /* we need to do it that way to keep compatiblity with custom Lua actions returning DNSAction.Pool, 'poolname' */ @@ -375,6 +386,7 @@ public: d_responseConfig(responseConfig), d_rcode(rcode) {} DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsdist::PacketMangling::editDNSHeaderFromPacket(dnsquestion->getMutableData(), [this](dnsheader& header) { header.rcode = d_rcode; header.qr = true; // for good measure @@ -402,6 +414,7 @@ public: } DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsdist::PacketMangling::editDNSHeaderFromPacket(dnsquestion->getMutableData(), [this](dnsheader& header) { header.rcode = (d_rcode & 0xF); header.qr = true; // for good measure @@ -449,6 +462,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; if (!dnsdist::svc::generateSVCResponse(*dnsquestion, d_payloads, d_additionals4, d_additionals6, d_responseConfig)) { return Action::None; } @@ -473,6 +487,8 @@ class TCAction : public DNSAction public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)dnsquestion; + (void)ruleresult; return Action::Truncate; } [[nodiscard]] std::string toString() const override @@ -486,6 +502,8 @@ class TCResponseAction : public DNSResponseAction public: DNSResponseAction::Action operator()(DNSResponse* dnsResponse, std::string* ruleresult) const override { + (void)dnsResponse; + (void)ruleresult; return Action::Truncate; } [[nodiscard]] std::string toString() const override @@ -890,6 +908,7 @@ private: DNSAction::Action SpoofAction::operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const { + (void)ruleresult; uint16_t qtype = dnsquestion->ids.qtype; // do we even have a response? if (d_cname.empty() && d_rawResponses.empty() && @@ -933,6 +952,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsdist::MacAddress mac{}; int res = dnsdist::MacAddressesCache::get(dnsquestion->ids.origRemote, mac.data(), mac.size()); if (res != 0) { @@ -997,6 +1017,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; setEDNSOption(*dnsquestion, d_code, d_data); return Action::None; } @@ -1017,6 +1038,7 @@ public: // this action does not stop the processing DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsdist::PacketMangling::editDNSHeaderFromPacket(dnsquestion->getMutableData(), [](dnsheader& header) { header.rd = false; return true; @@ -1049,6 +1071,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; auto filepointer = std::atomic_load_explicit(&d_fp, std::memory_order_acquire); if (!filepointer) { if (!d_verboseOnly || dnsdist::configuration::getCurrentRuntimeConfiguration().d_verbose) { @@ -1161,6 +1184,7 @@ public: DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)ruleresult; auto filepointer = std::atomic_load_explicit(&d_fp, std::memory_order_acquire); if (!filepointer) { if (!d_verboseOnly || dnsdist::configuration::getCurrentRuntimeConfiguration().d_verbose) { @@ -1236,6 +1260,7 @@ public: // this action does not stop the processing DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsdist::PacketMangling::editDNSHeaderFromPacket(dnsquestion->getMutableData(), [](dnsheader& header) { header.cd = true; return true; @@ -1254,6 +1279,7 @@ public: // this action does not stop the processing DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsquestion->ids.skipCache = true; return Action::None; } @@ -1268,6 +1294,7 @@ class SetSkipCacheResponseAction : public DNSResponseAction public: DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)ruleresult; response->ids.skipCache = true; return Action::None; } @@ -1287,6 +1314,7 @@ public: } DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsquestion->ids.tempFailureTTL = d_ttl; return Action::None; } @@ -1309,6 +1337,7 @@ public: } DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsquestion->ecsPrefixLength = dnsquestion->ids.origRemote.sin4.sin_family == AF_INET ? d_v4PrefixLength : d_v6PrefixLength; return Action::None; } @@ -1332,6 +1361,7 @@ public: } DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsquestion->ecsOverride = d_ecsOverride; return Action::None; } @@ -1350,6 +1380,7 @@ public: // this action does not stop the processing DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsquestion->useECS = false; return Action::None; } @@ -1375,6 +1406,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; if (d_hasV6) { dnsquestion->ecs = std::make_unique(dnsquestion->ids.origRemote.isIPv4() ? d_v4 : d_v6); } @@ -1457,6 +1489,7 @@ public: } DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; static thread_local std::string data; data.clear(); @@ -1545,6 +1578,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; if (!dnsquestion->ids.d_protoBufData) { dnsquestion->ids.d_protoBufData = std::make_unique(); } @@ -1607,6 +1641,7 @@ public: } DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; if (g_snmpAgent != nullptr && dnsdist::configuration::getImmutableConfiguration().d_snmpTrapsEnabled) { g_snmpAgent->sendDNSTrap(*dnsquestion, d_reason); } @@ -1632,6 +1667,7 @@ public: } DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsquestion->setTag(d_tag, d_value); return Action::None; @@ -1657,6 +1693,7 @@ public: } DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)ruleresult; static thread_local std::string data; struct timespec now = {}; gettime(&now, true); @@ -1698,6 +1735,7 @@ public: } DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)ruleresult; if (!response->ids.d_protoBufData) { response->ids.d_protoBufData = std::make_unique(); } @@ -1761,6 +1799,8 @@ class DropResponseAction : public DNSResponseAction public: DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)response; + (void)ruleresult; return Action::Drop; } [[nodiscard]] std::string toString() const override @@ -1774,6 +1814,8 @@ class AllowResponseAction : public DNSResponseAction public: DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)response; + (void)ruleresult; return Action::Allow; } [[nodiscard]] std::string toString() const override @@ -1791,6 +1833,7 @@ public: } DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)response; *ruleresult = std::to_string(d_msec); return Action::Delay; } @@ -1813,6 +1856,7 @@ public: } DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)ruleresult; if (g_snmpAgent != nullptr && dnsdist::configuration::getImmutableConfiguration().d_snmpTrapsEnabled) { g_snmpAgent->sendDNSTrap(*response, d_reason); } @@ -1838,6 +1882,7 @@ public: } DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)ruleresult; response->setTag(d_tag, d_value); return Action::None; @@ -1862,6 +1907,7 @@ public: DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)ruleresult; if (!d_qtypes.empty()) { clearDNSPacketRecordTypes(response->getMutableData(), d_qtypes); } @@ -1888,6 +1934,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; if (d_action) { /* call the action */ auto action = (*d_action)(dnsquestion, ruleresult); @@ -1921,8 +1968,9 @@ public: { } - DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override + DNSAction::Action operator()([[maybe_unused]] DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; #if defined(HAVE_DNS_OVER_HTTPS) if (dnsquestion->ids.du) { dnsquestion->ids.du->setHTTPResponse(d_code, PacketBuffer(d_body), d_contentType); @@ -1973,6 +2021,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; std::vector keys = d_key->getKeys(*dnsquestion); std::string result; for (const auto& key : keys) { @@ -2008,6 +2057,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; std::vector keys = d_key->getKeys(*dnsquestion); std::string result; for (const auto& key : keys) { @@ -2043,6 +2093,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; dnsquestion->ids.ttlCap = d_cap; return DNSAction::Action::None; } @@ -2066,6 +2117,7 @@ public: DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)ruleresult; response->ids.ttlCap = d_cap; return DNSResponseAction::Action::None; } @@ -2089,6 +2141,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; if (!setNegativeAndAdditionalSOA(*dnsquestion, d_nxd, d_zone, d_ttl, d_mname, d_rname, d_params.serial, d_params.refresh, d_params.retry, d_params.expire, d_params.minimum, d_soaInAuthoritySection)) { return Action::None; } @@ -2131,6 +2184,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; if (!dnsquestion->proxyProtocolValues) { dnsquestion->proxyProtocolValues = make_unique>(); } @@ -2160,6 +2214,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsquestion, std::string* ruleresult) const override { + (void)ruleresult; if (!dnsquestion->proxyProtocolValues) { dnsquestion->proxyProtocolValues = make_unique>(); } @@ -2190,8 +2245,12 @@ public: DNSResponseAction::Action operator()(DNSResponse* response, std::string* ruleresult) const override { + (void)ruleresult; // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) auto visitor = [&](uint8_t section, uint16_t qclass, uint16_t qtype, uint32_t ttl) { + (void)section; + (void)qclass; + (void)qtype; return ttl * d_ratio; }; // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) @@ -2220,6 +2279,7 @@ public: DNSAction::Action operator()(DNSQuestion* dnsQuestion, std::string* ruleresult) const override { + (void)ruleresult; dnsQuestion->ids.d_extendedError = std::make_unique(d_ede); return DNSAction::Action::None; @@ -2246,6 +2306,7 @@ public: DNSResponseAction::Action operator()(DNSResponse* dnsResponse, std::string* ruleresult) const override { + (void)ruleresult; dnsResponse->ids.d_extendedError = std::make_unique(d_ede); return DNSResponseAction::Action::None; @@ -2270,6 +2331,7 @@ public: DNSResponseAction::Action operator()(DNSResponse* dnsResponse, std::string* ruleresult) const override { + (void)ruleresult; dnsdist::PacketMangling::restrictDNSPacketTTLs(dnsResponse->getMutableData(), d_min, d_max, d_types); return DNSResponseAction::Action::None; } diff --git a/pdns/dnsdistdist/dnsdist-dnsparser.cc b/pdns/dnsdistdist/dnsdist-dnsparser.cc index 81db3d9151..2e3ce15318 100644 --- a/pdns/dnsdistdist/dnsdist-dnsparser.cc +++ b/pdns/dnsdistdist/dnsdist-dnsparser.cc @@ -217,6 +217,7 @@ namespace PacketMangling void restrictDNSPacketTTLs(PacketBuffer& packet, uint32_t minimumValue, uint32_t maximumValue, const std::unordered_set& types) { auto visitor = [minimumValue, maximumValue, types](uint8_t section, uint16_t qclass, uint16_t qtype, uint32_t ttl) { + (void)section; if (!types.empty() && qclass == QClass::IN && types.count(qtype) == 0) { return ttl; } diff --git a/pdns/dnsdistdist/dnsdist-rules-factory.hh b/pdns/dnsdistdist/dnsdist-rules-factory.hh index ccec8356b6..101d36820d 100644 --- a/pdns/dnsdistdist/dnsdist-rules-factory.hh +++ b/pdns/dnsdistdist/dnsdist-rules-factory.hh @@ -206,8 +206,9 @@ public: { } - bool matches(const DNSQuestion* qd) const override + bool matches(const DNSQuestion* dnsQuestion) const override { + (void)dnsQuestion; return d_qps.check(); } @@ -399,8 +400,9 @@ class AllRule : public DNSRule { public: AllRule() {} - bool matches(const DNSQuestion* dq) const override + bool matches(const DNSQuestion* dnsQuestion) const override { + (void)dnsQuestion; return true; } @@ -1111,10 +1113,12 @@ public: d_proba(proba) { } - bool matches(const DNSQuestion* dq) const override + bool matches(const DNSQuestion* dnsQuestion) const override { - if (d_proba == 1.0) + (void)dnsQuestion; + if (d_proba == 1.0) { return true; + } double rnd = 1.0 * dns_random_uint32() / UINT32_MAX; return rnd > (1.0 - d_proba); } @@ -1170,8 +1174,9 @@ public: { } - bool matches(const DNSQuestion* dq) const override + bool matches(const DNSQuestion* dnsQuestion) const override { + (void)dnsQuestion; return (getPool(d_poolname)->countServers(true) > 0); } @@ -1192,8 +1197,9 @@ public: { } - bool matches(const DNSQuestion* dq) const override + bool matches(const DNSQuestion* dnsQuestion) const override { + (void)dnsQuestion; return (getPool(d_poolname)->poolLoad()) > d_limit; } diff --git a/pdns/dnsdistdist/doq-common.cc b/pdns/dnsdistdist/doq-common.cc index ea61454761..ce2993dcd6 100644 --- a/pdns/dnsdistdist/doq-common.cc +++ b/pdns/dnsdistdist/doq-common.cc @@ -325,7 +325,7 @@ bool recvAsync(Socket& socket, PacketBuffer& buffer, ComboAddress& clientAddr, C return !buffer.empty(); } -std::string getSNIFromQuicheConnection(const QuicheConnection& conn) +std::string getSNIFromQuicheConnection([[maybe_unused]] const QuicheConnection& conn) { #if defined(HAVE_QUICHE_CONN_SERVER_NAME) const uint8_t* sniPtr = nullptr; diff --git a/pdns/dnsdistdist/test-dnsdistrules_cc.cc b/pdns/dnsdistdist/test-dnsdistrules_cc.cc index 692b50dbfb..bd589d2644 100644 --- a/pdns/dnsdistdist/test-dnsdistrules_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistrules_cc.cc @@ -43,6 +43,8 @@ ParameterType getRequiredRuleParameter(const std::string& ruleName, std::vector< template ParameterType getOptionalRuleParameter(const std::string& ruleName, std::vector& parameters, const std::string& parameterName, ParameterType defaultValue) { + (void)ruleName; + for (auto paramIt = parameters.begin(); paramIt != parameters.end(); ) { if (paramIt->name != parameterName) { ++paramIt; @@ -68,6 +70,7 @@ public: bool matches(const DNSQuestion* dnsQuestion) const override { + (void)dnsQuestion; return true; } diff --git a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc index ca8a3a773a..7a66bbb4da 100644 --- a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc +++ b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc @@ -73,6 +73,16 @@ void handleResponseSent(const InternalQueryState& ids, double udiff, const Combo void handleResponseSent(const DNSName& qname, const QType& qtype, double udiff, const ComboAddress& client, const ComboAddress& backend, unsigned int size, const dnsheader& cleartextDH, dnsdist::Protocol outgoingProtocol, dnsdist::Protocol incomingProtocol, bool fromBackend) { + (void)qname; + (void)qtype; + (void)udiff; + (void)client; + (void)backend; + (void)size; + (void)cleartextDH; + (void)outgoingProtocol; + (void)incomingProtocol; + (void)fromBackend; } std::function& selectedBackend)> s_processQuery;