dnsdist: Apply Otto's suggestions

diff --git a/pdns/dnsdistdist/dnsdist-backend.cc b/pdns/dnsdistdist/dnsdist-backend.cc
index 2f3cccb91552b455929e5fe99dedab3b629bd994..f4feba0bbc5e56513c675e28f7a4b42d2b55b789 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-backend.cc
+++ b/pdns/dnsdistdist/dnsdist-backend.cc
@@ -1056,7 +1056,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;
   }
 }

diff --git a/pdns/dnsdistdist/dnsdist.hh b/pdns/dnsdistdist/dnsdist.hh
index 8c3e35b544d632b75b73c684d6f6d8d9dd90c713..2ad05d7d1c0d548c6751f718d905612312077c1f 100644 (file)
--- a/pdns/dnsdistdist/dnsdist.hh
+++ b/pdns/dnsdistdist/dnsdist.hh
@@ -842,7 +842,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;
   }