From 433fb1a95d7a96a033d7454e198d274e92108865 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Mon, 25 May 2015 20:03:51 +0200 Subject: [RPC] extend setban to allow subnets --- src/netbase.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/netbase.cpp') diff --git a/src/netbase.cpp b/src/netbase.cpp index e3cb4e706..b7c77fda6 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -1330,6 +1330,11 @@ bool operator!=(const CSubNet& a, const CSubNet& b) return !(a==b); } +bool operator<(const CSubNet& a, const CSubNet& b) +{ + return (a.network < b.network || (a.network == b.network && memcmp(a.netmask, b.netmask, 16))); +} + #ifdef WIN32 std::string NetworkErrorString(int err) { -- cgit v1.2.3 From d624167387a658c9b2c25ad13492262ccd2592bf Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Fri, 12 Jun 2015 19:51:50 +0200 Subject: fix CSubNet comparison operator --- src/netbase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/netbase.cpp') diff --git a/src/netbase.cpp b/src/netbase.cpp index b7c77fda6..adac5c2d0 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -1332,7 +1332,7 @@ bool operator!=(const CSubNet& a, const CSubNet& b) bool operator<(const CSubNet& a, const CSubNet& b) { - return (a.network < b.network || (a.network == b.network && memcmp(a.netmask, b.netmask, 16))); + return (a.network < b.network || (a.network == b.network && memcmp(a.netmask, b.netmask, 16) < 0)); } #ifdef WIN32 -- cgit v1.2.3