3 files changed, 41 insertions, 2 deletions
diff --git a/Swiften/Network/HostAddress.h b/Swiften/Network/HostAddress.h
index e4ddffb..7a22cf4 100644
--- a/Swiften/Network/HostAddress.h
+++ b/Swiften/Network/HostAddress.h
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <boost/asio/ip/address.hpp>
@@ -21,18 +21,22 @@ namespace Swift {
             HostAddress(const boost::asio::ip::address& address);
 
             std::string toString() const;
             boost::asio::ip::address getRawAddress() const;
 
             bool operator==(const HostAddress& o) const {
                 return address_ == o.address_;
             }
 
+            bool operator<(const HostAddress& o) const {
+              return address_ < o.address_;
+            }
+
             bool isValid() const;
             bool isLocalhost() const;
 
             static boost::optional<HostAddress> fromString(const std::string& addressString);
 
         private:
             boost::asio::ip::address address_;
     };
 }
diff --git a/Swiften/Network/HostAddressPort.h b/Swiften/Network/HostAddressPort.h
index 14c7c66..759af01 100644
--- a/Swiften/Network/HostAddressPort.h
+++ b/Swiften/Network/HostAddressPort.h
@@ -23,18 +23,25 @@ namespace Swift {
 
             unsigned short getPort() const {
                 return port_;
             }
 
             bool operator==(const HostAddressPort& o) const {
                 return address_ == o.address_ && port_ == o.port_;
             }
 
+            bool operator<(const HostAddressPort& o) const {
+                if (address_ < o.address_) {
+                    return true;
+                }
+                return address_ == o.address_ && port_ < o.port_;
+            }
+
             bool isValid() const {
                 return address_.isValid() && port_ > 0;
             }
 
             std::string toString() const;
 
         private:
             HostAddress address_;
             unsigned short port_;
diff --git a/Swiften/Network/UnitTest/HostAddressTest.cpp b/Swiften/Network/UnitTest/HostAddressTest.cpp
index 226346b..bd345a7 100644
--- a/Swiften/Network/UnitTest/HostAddressTest.cpp
+++ b/Swiften/Network/UnitTest/HostAddressTest.cpp
@@ -1,32 +1,34 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <string>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Network/HostAddress.h>
+#include <Swiften/Network/HostAddressPort.h>
 
 using namespace Swift;
 
 class HostAddressTest : public CppUnit::TestFixture {
         CPPUNIT_TEST_SUITE(HostAddressTest);
         CPPUNIT_TEST(testConstructor);
         CPPUNIT_TEST(testConstructor_Invalid);
         CPPUNIT_TEST(testConstructor_InvalidString);
         CPPUNIT_TEST(testToString);
         CPPUNIT_TEST(testToString_IPv6);
         CPPUNIT_TEST(testToString_Invalid);
+        CPPUNIT_TEST(testComparison);
         CPPUNIT_TEST_SUITE_END();
 
     public:
         void testConstructor() {
             auto testling = HostAddress::fromString("192.168.1.254");
 
             CPPUNIT_ASSERT_EQUAL(std::string("192.168.1.254"), testling->toString());
             CPPUNIT_ASSERT(testling->isValid());
         }
@@ -56,12 +58,38 @@ class HostAddressTest : public CppUnit::TestFixture {
 
             CPPUNIT_ASSERT_EQUAL(std::string("102:304:506:708:90a:b0c:d0e:f11"), testling.toString());
         }
 
         void testToString_Invalid() {
             HostAddress testling;
 
             CPPUNIT_ASSERT_EQUAL(std::string("0.0.0.0"), testling.toString());
         }
+
+        void testComparison() {
+            auto ha127_0_0_1 = *HostAddress::fromString("127.0.0.1");
+            auto ha127_0_0_2 = *HostAddress::fromString("127.0.0.2");
+            auto ha127_0_1_0 = *HostAddress::fromString("127.0.1.0");
+
+            CPPUNIT_ASSERT(ha127_0_0_1 < ha127_0_0_2);
+            CPPUNIT_ASSERT(ha127_0_0_2 < ha127_0_1_0);
+            CPPUNIT_ASSERT(!(ha127_0_0_1 < ha127_0_0_1));
+            CPPUNIT_ASSERT(!(ha127_0_0_2 < ha127_0_0_1));
+            CPPUNIT_ASSERT(!(ha127_0_0_2 == ha127_0_0_1));
+            CPPUNIT_ASSERT(ha127_0_0_1 == ha127_0_0_1);
+
+            auto hap_127_0_0_1__1 = HostAddressPort(ha127_0_0_1, 1);
+            auto hap_127_0_0_1__2 = HostAddressPort(ha127_0_0_1, 2);
+            auto hap_127_0_0_2__1 = HostAddressPort(ha127_0_0_2, 1);
+            auto hap_127_0_0_2__2 = HostAddressPort(ha127_0_0_2, 2);
+
+            CPPUNIT_ASSERT(hap_127_0_0_1__1 < hap_127_0_0_1__2);
+            CPPUNIT_ASSERT(!(hap_127_0_0_1__1 < hap_127_0_0_1__1));
+            CPPUNIT_ASSERT(!(hap_127_0_0_1__1 == hap_127_0_0_1__2));
+            CPPUNIT_ASSERT(hap_127_0_0_1__1 == hap_127_0_0_1__1);
+            CPPUNIT_ASSERT(!(hap_127_0_0_1__2 == hap_127_0_0_1__1));
+            CPPUNIT_ASSERT(hap_127_0_0_1__2 < hap_127_0_0_2__1);
+            CPPUNIT_ASSERT(hap_127_0_0_2__1 < hap_127_0_0_2__2);
+        }
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(HostAddressTest);