From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 11 Feb 2020 11:52:37 +0000 (+0100)
Subject: Compare netmasks on their masked version (highly inefficient version)
X-Git-Tag: rec-4.4.0-alpha0~14^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ead2fa27e5944e23f457694960dfbb35fa114083;p=thirdparty%2Fpdns.git

Compare netmasks on their masked version (highly inefficient version)
---

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 97ef03855f..754b104b2b 100644
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -562,7 +562,7 @@ public:
     if (d_bits < rhs.d_bits)
       return false;
 
-    return d_network < rhs.d_network;
+    return getMaskedNetwork() < rhs.getMaskedNetwork();
   }
 
   bool operator>(const Netmask& rhs) const
diff --git a/pdns/test-iputils_hh.cc b/pdns/test-iputils_hh.cc
index 9a531cf063..1b6d2943c6 100644
--- a/pdns/test-iputils_hh.cc
+++ b/pdns/test-iputils_hh.cc
@@ -225,8 +225,8 @@ BOOST_AUTO_TEST_CASE(test_Netmask) {
 
   Netmask sameMask1("192.0.0.0/16");
   Netmask sameMask2("192.0.0.1/16");
-  BOOST_CHECK(sameMask1 < sameMask2);
-  BOOST_CHECK(sameMask2 > sameMask1);
+  BOOST_CHECK(!(sameMask1 < sameMask2));
+  BOOST_CHECK(!(sameMask2 > sameMask1));
 
   /* An empty Netmask should be larger than
      every others. */