From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 13 Oct 2023 15:44:13 +0000 (+0200)
Subject: dnsdist: More clang-tidy delinting
X-Git-Tag: rec-5.0.0-alpha2~6^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61e8b855282c08fcc9e983ad7943f1855c089cdd;p=thirdparty%2Fpdns.git

dnsdist: More clang-tidy delinting
---

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index d75d85017a..e39748e8c2 100644
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -2484,6 +2484,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
 #endif /* HAVE_DNS_OVER_HTTPS */
   });
 
+  // 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<std::string, std::shared_ptr<TLSCertKeyPair>, LuaArray<std::string>, LuaArray<std::shared_ptr<TLSCertKeyPair>>>& certFiles, const boost::variant<std::string, LuaArray<std::string>>& keyFiles, boost::optional<localbind_t> vars) {
     if (client) {
       return;
diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index a54aed88f6..cf2bf9c531 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -607,7 +607,7 @@ static size_t getMaximumIncomingPacketSize(const ClientState& cs)
 bool sendUDPResponse(int origFD, const PacketBuffer& response, const int delayMsec, const ComboAddress& origDest, const ComboAddress& origRemote)
 {
 #ifndef DISABLE_DELAY_PIPE
-  if (delayMsec && g_delay != nullptr) {
+  if (delayMsec > 0 && g_delay != nullptr) {
     DelayedPacket dp{origFD, response, origRemote, origDest};
     g_delay->submit(dp, delayMsec);
     return true;
@@ -2296,7 +2296,7 @@ static void setupLocalSocket(ClientState& clientState, const ComboAddress& addr,
 #ifdef HAVE_EBPF
   if (g_defaultBPFFilter && !g_defaultBPFFilter->isExternal()) {
     clientState.attachFilter(g_defaultBPFFilter, socket);
-    vinfolog("Attaching default BPF Filter to %s frontend %s", (!tcp ? "UDP" : "TCP"), addr.toStringWithPort());
+    vinfolog("Attaching default BPF Filter to %s frontend %s", std::string(!tcp ? "UDP" : "TCP"), addr.toStringWithPort());
   }
 #endif /* HAVE_EBPF */
 
@@ -2772,7 +2772,9 @@ int main(int argc, char** argv)
 #endif /* DISABLE_COMPLETION */
 #endif /* HAVE_LIBEDIT */
 
+    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast): SIG_IGN macro
     signal(SIGPIPE, SIG_IGN);
+    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast): SIG_IGN macro
     signal(SIGCHLD, SIG_IGN);
     signal(SIGTERM, sigTermHandler);
 
@@ -2781,7 +2783,7 @@ int main(int argc, char** argv)
 #ifdef HAVE_LIBSODIUM
     if (sodium_init() == -1) {
       cerr<<"Unable to initialize crypto library"<<endl;
-      // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic): argv
+      // NOLINTNEXTLINE(concurrency-mt-unsafe): only on thread at this point
       exit(EXIT_FAILURE);
     }
 #endif