diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-06-18 16:43:23 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-06-18 16:48:37 +0200 |
| commit | 0abfa8a22f7f26e29ed808b7eeb5f99608d2f281 (patch) | |
| tree | e8e44de93f2dc8d4dadd315c08dd380b6d48c785 /src/netbase.cpp | |
| parent | Merge pull request #6282 (diff) | |
| parent | add RPC tests for setban & disconnectnode (diff) | |
| download | discoin-0abfa8a22f7f26e29ed808b7eeb5f99608d2f281.tar.xz discoin-0abfa8a22f7f26e29ed808b7eeb5f99608d2f281.zip | |
Merge pull request #6158
9d79afe add RPC tests for setban & disconnectnode (Jonas Schnelli)
1f02b80 setban: add RPCErrorCode (Jonas Schnelli)
d624167 fix CSubNet comparison operator (Jonas Schnelli)
4e36e9b setban: rewrite to UniValue, allow absolute bantime (Jonas Schnelli)
3de24d7 rename json field "bannedtill" to "banned_until" (Jonas Schnelli)
433fb1a [RPC] extend setban to allow subnets (Jonas Schnelli)
e8b9347 [net] remove unused return type bool from CNode::Ban() (Jonas Schnelli)
1086ffb [QA] add setban/listbanned/clearbanned tests (Jonas Schnelli)
d930b26 [RPC] add setban/listbanned/clearbanned RPC commands (Jonas Schnelli)
2252fb9 [net] extend core functionallity for ban/unban/listban (Jonas Schnelli)
Diffstat (limited to 'src/netbase.cpp')
| -rw-r--r-- | src/netbase.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index e3cb4e706..adac5c2d0 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) < 0)); +} + #ifdef WIN32 std::string NetworkErrorString(int err) { |