diff options
| author | Amiti Uttarwar <amiti@uttarwar.org> | 2020-05-12 12:58:41 -0700 |
|---|---|---|
| committer | Amiti Uttarwar <amiti@uttarwar.org> | 2020-08-07 17:18:16 -0700 |
| commit | 14923422b08ac4b21b35c426bf0e1b9e7c97983b (patch) | |
| tree | 678645398fc7e75093828cb8200e7ca9fed2ae3b /src/net_processing.cpp | |
| parent | 49efac5cae7333c6700d9b737d09fae0f3f4d7fa (diff) | |
| download | bitcoin-14923422b08ac4b21b35c426bf0e1b9e7c97983b.tar.xz | |
[net/refactor] Remove fFeeler flag from CNode
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 62886064eb..53d47b63b3 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -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; |