Compare netmasks on their masked version (highly inefficient version)

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 97ef03855f266ea0cfddf5af1f2672fd1ba31474..754b104b2bd191985ae336a61ddb0e3883b1928a 100644 (file)
--- 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 9a531cf063825498a01acc8bf445e106aa35744b..1b6d2943c63684597bfa6a7ee381c4176e80c1b5 100644 (file)
--- 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. */