highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-18 22:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[net/refactor] Remove fFeeler flag from CNode

Browse Source
This commit is contained in:
Amiti Uttarwar
2020-05-12 12:58:41 -07:00
parent 49efac5cae
commit 14923422b0
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net_processing.cpp
View File

@@ -829,7 +829,7 @@ void UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds)
static bool IsOutboundDisconnectionCandidate(const CNode& node)
{
return !(node.fInbound || node.IsManualConn() || node.fFeeler || node.m_addr_fetch);
return !(node.fInbound || node.IsManualConn() || node.IsFeelerConn() || node.m_addr_fetch);
}
void PeerLogicValidation::InitializeNode(CNode *pnode) {
@@ -2324,7 +2324,7 @@ void ProcessMessage(
{
connman.SetServices(pfrom.addr, nServices);
}
if (!pfrom.fInbound && !pfrom.fFeeler && !pfrom.IsManualConn() && !HasAllDesirableServiceFlags(nServices))
if (!pfrom.fInbound && !pfrom.IsFeelerConn() && !pfrom.IsManualConn() && !HasAllDesirableServiceFlags(nServices))
{
LogPrint(BCLog::NET, "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom.GetId(), nServices, GetDesirableServiceFlags(nServices));
pfrom.fDisconnect = true;
@@ -2452,8 +2452,7 @@ void ProcessMessage(
}
// Feeler connections exist only to verify if address is online.
if (pfrom.fFeeler) {
assert(pfrom.fInbound == false);
if (pfrom.IsFeelerConn()) {
pfrom.fDisconnect = true;
}
return;