From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 17 Jan 2025 10:49:21 +0000 (+0100)
Subject: To match incoming, don't look at subnet
X-Git-Tag: rec-5.1.6^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c70c427a18fe1928aa7c74da7c15bb207da518b5;p=thirdparty%2Fpdns.git

To match incoming, don't look at subnet
---

diff --git a/pdns/recursordist/syncres.hh b/pdns/recursordist/syncres.hh
index 9ab3d0c56e..a56aef8bcd 100644
--- a/pdns/recursordist/syncres.hh
+++ b/pdns/recursordist/syncres.hh
@@ -807,10 +807,10 @@ struct PacketIDCompare
 {
   bool operator()(const std::shared_ptr<PacketID>& lhs, const std::shared_ptr<PacketID>& rhs) const
   {
-    if (std::tie(lhs->remote, lhs->tcpsock, lhs->type, lhs->ecsSubnet) < std::tie(rhs->remote, rhs->tcpsock, rhs->type, rhs->ecsSubnet)) {
+    if (std::tie(lhs->remote, lhs->tcpsock, lhs->type) < std::tie(rhs->remote, rhs->tcpsock, rhs->type)) {
       return true;
     }
-    if (std::tie(lhs->remote, lhs->tcpsock, lhs->type, lhs->ecsSubnet) > std::tie(rhs->remote, rhs->tcpsock, rhs->type, rhs->ecsSubnet)) {
+    if (std::tie(lhs->remote, lhs->tcpsock, lhs->type) > std::tie(rhs->remote, rhs->tcpsock, rhs->type)) {
       return false;
     }