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.cpp | |
| parent | 49efac5cae7333c6700d9b737d09fae0f3f4d7fa (diff) | |
| download | bitcoin-14923422b08ac4b21b35c426bf0e1b9e7c97983b.tar.xz | |
[net/refactor] Remove fFeeler flag from CNode
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/net.cpp b/src/net.cpp index 4270b16d56..047153972e 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1648,7 +1648,7 @@ void CConnman::ThreadDNSAddressSeed() { LOCK(cs_vNodes); for (const CNode* pnode : vNodes) { - nRelevant += pnode->fSuccessfullyConnected && !pnode->fFeeler && !pnode->m_addr_fetch && !pnode->IsManualConn() && !pnode->fInbound; + nRelevant += pnode->fSuccessfullyConnected && !pnode->IsFeelerConn() && !pnode->m_addr_fetch && !pnode->IsManualConn() && !pnode->fInbound; } } if (nRelevant >= 2) { @@ -1758,7 +1758,7 @@ int CConnman::GetExtraOutboundCount() { LOCK(cs_vNodes); for (const CNode* pnode : vNodes) { - if (!pnode->fInbound && !pnode->IsManualConn() && !pnode->fFeeler && !pnode->fDisconnect && !pnode->m_addr_fetch && pnode->fSuccessfullyConnected) { + if (!pnode->fInbound && !pnode->IsManualConn() && !pnode->IsFeelerConn() && !pnode->fDisconnect && !pnode->m_addr_fetch && pnode->fSuccessfullyConnected) { ++nOutbound; } } @@ -1841,7 +1841,7 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect) setConnected.insert(pnode->addr.GetGroup(addrman.m_asmap)); if (pnode->m_tx_relay == nullptr) { nOutboundBlockRelay++; - } else if (!pnode->fFeeler) { + } else if (!pnode->IsFeelerConn()) { nOutboundFullRelay++; } } @@ -2739,7 +2739,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn : nTimeConnected(GetSystemTimeInSeconds()), addr(addrIn), addrBind(addrBindIn), - fFeeler(conn_type_in == ConnectionType::FEELER), m_addr_fetch(conn_type_in == ConnectionType::ADDR_FETCH), fInbound(conn_type_in == ConnectionType::INBOUND), nKeyedNetGroup(nKeyedNetGroupIn), |