diff options
| author | MarcoFalke <[email protected]> | 2020-07-10 19:16:12 +0200 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2020-07-10 19:16:48 +0200 |
| commit | c0b0b0240f986b88a31336db2e6906de0edc0816 (patch) | |
| tree | 2c75053ab9e4ed9bb1da8f672f435c673e2a0aa5 /src/net_processing.cpp | |
| parent | Merge #18638: net: Use mockable time for ping/pong, add tests (diff) | |
| parent | Drop CADDR_TIME_VERSION checks now that MIN_PEER_PROTO_VERSION is greater (diff) | |
| download | discoin-c0b0b0240f986b88a31336db2e6906de0edc0816.tar.xz discoin-c0b0b0240f986b88a31336db2e6906de0edc0816.zip | |
Merge #14033: p2p: Drop CADDR_TIME_VERSION checks now that MIN_PEER_PROTO_VERSION is greater
57b0c0a93a243769beb306c89560d1eda61f54bd Drop CADDR_TIME_VERSION checks now that MIN_PEER_PROTO_VERSION is greater (Ben Woosley)
Pull request description:
We do not connect to peers older than 31800
ACKs for top commit:
sipa:
Code reivew ACK 57b0c0a93a243769beb306c89560d1eda61f54bd
jnewbery:
Code review ACK 57b0c0a93a243769beb306c89560d1eda61f54bd
vasild:
ACK 57b0c0a9
Tree-SHA512: e1ca7c9203cbad83ab7c7a2312777ad07ed6a16119169b256648b8a8738c260a5168acdd4fb33f6e4b17f51ec7e033e110b76bde55b4e3b2d444dc02c01bc2b1
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 210d8ee37..8ef79cd71 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1438,7 +1438,7 @@ static void RelayAddress(const CAddress& addr, bool fReachable, const CConnman& assert(nRelayNodes <= best.size()); auto sortfunc = [&best, &hasher, nRelayNodes](CNode* pnode) { - if (pnode->nVersion >= CADDR_TIME_VERSION && pnode->IsAddrRelayPeer()) { + if (pnode->IsAddrRelayPeer()) { uint64_t hashKey = CSipHasher(hasher).Write(pnode->GetId()).Finalize(); for (unsigned int i = 0; i < nRelayNodes; i++) { if (hashKey > best[i].first) { @@ -2349,11 +2349,8 @@ void ProcessMessage( } // Get recent addresses - if (pfrom.fOneShot || pfrom.nVersion >= CADDR_TIME_VERSION || connman->GetAddressCount() < 1000) - { - connman->PushMessage(&pfrom, CNetMsgMaker(nSendVersion).Make(NetMsgType::GETADDR)); - pfrom.fGetAddr = true; - } + connman->PushMessage(&pfrom, CNetMsgMaker(nSendVersion).Make(NetMsgType::GETADDR)); + pfrom.fGetAddr = true; connman->MarkAddressGood(pfrom.addr); } @@ -2443,9 +2440,6 @@ void ProcessMessage( std::vector<CAddress> vAddr; vRecv >> vAddr; - // Don't want addr from older versions unless seeding - if (pfrom.nVersion < CADDR_TIME_VERSION && connman->GetAddressCount() > 1000) - return; if (!pfrom.IsAddrRelayPeer()) { return; } |