aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <sipa@ulyssis.org>2014-05-30 12:01:20 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-06-01 09:54:00 +0200
commitd6377e6a4a5a7ba2df4b5161b3efcb843f64fbcb (patch)
treef119b8d1ca38d84701c743b13e1911c6ed69e43a
parent3a4a66f47eea61ba262f915900eae97c35aa3a56 (diff)
downloadbitcoin-d6377e6a4a5a7ba2df4b5161b3efcb843f64fbcb.tar.xz
Limit number of known addresses per peer
Rebased-By: Wladimir J. van der Laan <laanwj@gmail.com> Rebased-From: 5823449
-rw-r--r--src/mruset.h1
-rw-r--r--src/net.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mruset.h b/src/mruset.h
index c36a0c8f37..c1c08b0288 100644
--- a/src/mruset.h
+++ b/src/mruset.h
@@ -32,6 +32,7 @@ public:
bool empty() const { return set.empty(); }
iterator find(const key_type& k) const { return set.find(k); }
size_type count(const key_type& k) const { return set.count(k); }
+ void clear() { set.clear(); queue.clear(); }
bool inline friend operator==(const mruset<T>& a, const mruset<T>& b) { return a.set == b.set; }
bool inline friend operator==(const mruset<T>& a, const std::set<T>& b) { return a.set == b; }
bool inline friend operator<(const mruset<T>& a, const mruset<T>& b) { return a.set < b.set; }
diff --git a/src/net.h b/src/net.h
index 729b1bcd57..f9b953c8da 100644
--- a/src/net.h
+++ b/src/net.h
@@ -255,7 +255,7 @@ public:
// flood relay
std::vector<CAddress> vAddrToSend;
- std::set<CAddress> setAddrKnown;
+ mruset<CAddress> setAddrKnown;
bool fGetAddr;
std::set<uint256> setKnown;
@@ -271,7 +271,7 @@ public:
int64_t nPingUsecTime;
bool fPingQueued;
- CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : ssSend(SER_NETWORK, INIT_PROTO_VERSION)
+ CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : ssSend(SER_NETWORK, INIT_PROTO_VERSION), setAddrKnown(5000)
{
nServices = 0;
hSocket = hSocketIn;