Merge pull request #4257
5823449
Limit number of known addresses per peer (Pieter Wuille)
This commit is contained in:
commit
cc342a3ede
2 changed files with 3 additions and 2 deletions
|
@ -32,6 +32,7 @@ public:
|
||||||
bool empty() const { return set.empty(); }
|
bool empty() const { return set.empty(); }
|
||||||
iterator find(const key_type& k) const { return set.find(k); }
|
iterator find(const key_type& k) const { return set.find(k); }
|
||||||
size_type count(const key_type& k) const { return set.count(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 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 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; }
|
bool inline friend operator<(const mruset<T>& a, const mruset<T>& b) { return a.set < b.set; }
|
||||||
|
|
|
@ -262,7 +262,7 @@ public:
|
||||||
|
|
||||||
// flood relay
|
// flood relay
|
||||||
std::vector<CAddress> vAddrToSend;
|
std::vector<CAddress> vAddrToSend;
|
||||||
std::set<CAddress> setAddrKnown;
|
mruset<CAddress> setAddrKnown;
|
||||||
bool fGetAddr;
|
bool fGetAddr;
|
||||||
std::set<uint256> setKnown;
|
std::set<uint256> setKnown;
|
||||||
|
|
||||||
|
@ -278,7 +278,7 @@ public:
|
||||||
int64_t nPingUsecTime;
|
int64_t nPingUsecTime;
|
||||||
bool fPingQueued;
|
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;
|
nServices = 0;
|
||||||
hSocket = hSocketIn;
|
hSocket = hSocketIn;
|
||||||
|
|
Loading…
Reference in a new issue