From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 15 Apr 2025 14:39:17 +0000 (+0200)
Subject: dnsdist: Ignore port mask for TCP limits if the v4 mask != 32
X-Git-Tag: dnsdist-2.0.0-alpha2~60^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8f7a1b7ca96b398eb13e7f41ba90bad7fd3704b;p=thirdparty%2Fpdns.git

dnsdist: Ignore port mask for TCP limits if the v4 mask != 32
---

diff --git a/pdns/dnsdistdist/dnsdist-concurrent-connections.cc b/pdns/dnsdistdist/dnsdist-concurrent-connections.cc
index 99e3cd75b3..bf3169a168 100644
--- a/pdns/dnsdistdist/dnsdist-concurrent-connections.cc
+++ b/pdns/dnsdistdist/dnsdist-concurrent-connections.cc
@@ -76,7 +76,7 @@ static std::vector<LockGuarded<map_t>> s_tcpClientsConnectionMetrics{10};
 static AddressAndPortRange getRange(const ComboAddress& from)
 {
   const auto& immutable = dnsdist::configuration::getImmutableConfiguration();
-  return AddressAndPortRange(from, from.isIPv4() ? immutable.d_tcpConnectionsMaskV4 : immutable.d_tcpConnectionsMaskV6, from.isIPv4() ? immutable.d_tcpConnectionsMaskV4Port : 0);
+  return AddressAndPortRange(from, from.isIPv4() ? immutable.d_tcpConnectionsMaskV4 : immutable.d_tcpConnectionsMaskV6, from.isIPv4() && immutable.d_tcpConnectionsMaskV4 == 32 ? immutable.d_tcpConnectionsMaskV4Port : 0);
 }
 
 static size_t getShardID(const AddressAndPortRange& from)