From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 14 Apr 2025 07:42:50 +0000 (+0200)
Subject: dnsdist: Apply Otto's suggestions
X-Git-Tag: dnsdist-1.9.10~7^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7cd144f3f2893dd0bffffbb947c6f14eb6c7c658;p=thirdparty%2Fpdns.git

dnsdist: Apply Otto's suggestions

(cherry picked from commit a3642df312febf731bc65d837ef47af5f89d2066)
---

diff --git a/pdns/dnsdist.hh b/pdns/dnsdist.hh
index 232e4d158c..0d0bb96f2a 100644
--- 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 ddad2abc1f..6fc01f8800 100644
--- 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;
   }
 }