aboutsummaryrefslogtreecommitdiff
path: root/src/netbase.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-07-02 21:12:44 +0200
committerWladimir J. van der Laan <[email protected]>2015-07-02 21:33:09 +0200
commit66e546577315750ea36eeb26d96842cb768b4315 (patch)
tree27ca8e971b7f86ba7f8bd99cdd3b44b69d2c470e /src/netbase.cpp
parenttests: fix txn_clone.py (diff)
parentAdding CSubNet constructor over a single CNetAddr (diff)
downloaddiscoin-66e546577315750ea36eeb26d96842cb768b4315.tar.xz
discoin-66e546577315750ea36eeb26d96842cb768b4315.zip
Merge pull request #6310
177a0e4 Adding CSubNet constructor over a single CNetAddr (Jonas Schnelli) 409bccf use CBanEntry as object container for banned nodes (Jonas Schnelli) dfa174c CAddrDB/CBanDB: change filesize variables from int to uint64_t (Jonas Schnelli) f581d3d banlist.dat: store banlist on disk (Jonas Schnelli)
Diffstat (limited to 'src/netbase.cpp')
-rw-r--r--src/netbase.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp
index adac5c2d0..c9fc7d67f 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -1291,6 +1291,13 @@ CSubNet::CSubNet(const std::string &strSubnet, bool fAllowLookup)
network.ip[x] &= netmask[x];
}
+CSubNet::CSubNet(const CNetAddr &addr):
+ valid(addr.IsValid())
+{
+ memset(netmask, 255, sizeof(netmask));
+ network = addr;
+}
+
bool CSubNet::Match(const CNetAddr &addr) const
{
if (!valid || !addr.IsValid())