dnsdist: Apply Otto's suggestions

(cherry picked from commit a3642df312febf731bc65d837ef47af5f89d2066)

diff --git a/pdns/dnsdist.hh b/pdns/dnsdist.hh
index 232e4d158caaa4e34ff0804076a64b4b7cc92f91..0d0bb96f2a808de1bc1abee237338fbc92f21f78 100644 (file)
--- a/pdns/dnsdist.hh
+++ b/pdns/dnsdist.hh
@@ -971,7 +971,7 @@ public:
     return d_config.d_tcpOnly || d_config.d_tcpCheck || d_tlsCtx != nullptr;
   }
 
-  bool isTCPOnly() const
+  [[nodiscard]] bool isTCPOnly() const
   {
     return d_config.d_tcpOnly || d_tlsCtx != nullptr;
   }

diff --git a/pdns/dnsdistdist/dnsdist-backend.cc b/pdns/dnsdistdist/dnsdist-backend.cc
index ddad2abc1f3a451fa71180923e18d7947d8b18ee..6fc01f88004d7075be501fb91554e7b004321faf 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-backend.cc
+++ b/pdns/dnsdistdist/dnsdist-backend.cc
@@ -978,7 +978,7 @@ void ServerPool::addServer(shared_ptr<DownstreamState>& server)
   if ((*servers)->size() == 1) {
     d_tcpOnly = server->isTCPOnly();
   }
-  else if (d_tcpOnly && !server->isTCPOnly()) {
+  else if (!server->isTCPOnly()) {
     d_tcpOnly = false;
   }
 }