Skip to content

Commit 60156f5

Browse files
amitiuttarwaramitiuttarwar
committed
[net/refactor] Remove fInbound flag from CNode
1 parent 7b322df commit 60156f5

File tree

4 files changed

+29
-27
lines changed

4 files changed

+29
-27
lines changed

‎src/net.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ bool CConnman::CheckIncomingNonce(uint64_t nonce)
346346
{
347347
LOCK(cs_vNodes);
348348
for (const CNode* pnode : vNodes) {
349-
if (!pnode->fSuccessfullyConnected && !pnode->fInbound && pnode->GetLocalNonce() == nonce)
349+
if (!pnode->fSuccessfullyConnected && !pnode->IsInboundConn() && pnode->GetLocalNonce() == nonce)
350350
return false;
351351
}
352352
return true;
@@ -538,7 +538,7 @@ void CNode::copyStats(CNodeStats &stats, const std::vector<bool> &m_asmap)
538538
LOCK(cs_SubVer);
539539
X(cleanSubVer);
540540
}
541-
X(fInbound);
541+
stats.fInbound = IsInboundConn();
542542
stats.m_manual_connection = IsManualConn();
543543
X(nStartingHeight);
544544
{
@@ -874,7 +874,7 @@ bool CConnman::AttemptToEvictConnection()
874874
for (const CNode* node : vNodes) {
875875
if (node->HasPermission(PF_NOBAN))
876876
continue;
877-
if (!node->fInbound)
877+
if (!node->IsInboundConn())
878878
continue;
879879
if (node->fDisconnect)
880880
continue;
@@ -985,7 +985,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
985985
{
986986
LOCK(cs_vNodes);
987987
for (const CNode* pnode : vNodes) {
988-
if (pnode->fInbound) nInbound++;
988+
if (pnode->IsInboundConn()) nInbound++;
989989
}
990990
}
991991

@@ -1648,7 +1648,7 @@ void CConnman::ThreadDNSAddressSeed()
16481648
{
16491649
LOCK(cs_vNodes);
16501650
for (const CNode* pnode : vNodes) {
1651-
nRelevant += pnode->fSuccessfullyConnected && !pnode->IsFeelerConn() && !pnode->IsAddrFetchConn() && !pnode->IsManualConn() && !pnode->fInbound;
1651+
nRelevant += pnode->fSuccessfullyConnected && !pnode->IsFeelerConn() && !pnode->IsAddrFetchConn() && !pnode->IsManualConn() && !pnode->IsInboundConn();
16521652
}
16531653
}
16541654
if (nRelevant >= 2) {
@@ -1758,7 +1758,7 @@ int CConnman::GetExtraOutboundCount()
17581758
{
17591759
LOCK(cs_vNodes);
17601760
for (const CNode* pnode : vNodes) {
1761-
if (!pnode->fInbound && !pnode->IsManualConn() && !pnode->IsFeelerConn() && !pnode->fDisconnect && !pnode->IsAddrFetchConn() && pnode->fSuccessfullyConnected) {
1761+
if (!pnode->IsInboundConn() && !pnode->IsManualConn() && !pnode->IsFeelerConn() && !pnode->fDisconnect && !pnode->IsAddrFetchConn() && pnode->fSuccessfullyConnected) {
17621762
++nOutbound;
17631763
}
17641764
}
@@ -1832,7 +1832,7 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect)
18321832
{
18331833
LOCK(cs_vNodes);
18341834
for (const CNode* pnode : vNodes) {
1835-
if (!pnode->fInbound && (pnode->m_conn_type != ConnectionType::MANUAL)) {
1835+
if (!pnode->IsInboundConn() && (pnode->m_conn_type != ConnectionType::MANUAL)) {
18361836
// Netgroups for inbound and addnode peers are not excluded because our goal here
18371837
// is to not use multiple of our limited outbound slots on a single netgroup
18381838
// but inbound and addnode peers do not use our outbound slots. Inbound peers
@@ -1972,11 +1972,11 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo()
19721972
LOCK(cs_vNodes);
19731973
for (const CNode* pnode : vNodes) {
19741974
if (pnode->addr.IsValid()) {
1975-
mapConnected[pnode->addr] = pnode->fInbound;
1975+
mapConnected[pnode->addr] = pnode->IsInboundConn();
19761976
}
19771977
std::string addrName = pnode->GetAddrName();
19781978
if (!addrName.empty()) {
1979-
mapConnectedByName[std::move(addrName)] = std::make_pair(pnode->fInbound, static_cast<const CService&>(pnode->addr));
1979+
mapConnectedByName[std::move(addrName)] = std::make_pair(pnode->IsInboundConn(), static_cast<const CService&>(pnode->addr));
19801980
}
19811981
}
19821982
}
@@ -2551,7 +2551,7 @@ size_t CConnman::GetNodeCount(NumConnections flags)
25512551

25522552
int nNum = 0;
25532553
for (const auto& pnode : vNodes) {
2554-
if (flags & (pnode->fInbound ? CONNECTIONS_IN : CONNECTIONS_OUT)) {
2554+
if (flags & (pnode->IsInboundConn() ? CONNECTIONS_IN : CONNECTIONS_OUT)) {
25552555
nNum++;
25562556
}
25572557
}
@@ -2739,7 +2739,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
27392739
: nTimeConnected(GetSystemTimeInSeconds()),
27402740
addr(addrIn),
27412741
addrBind(addrBindIn),
2742-
fInbound(conn_type_in == ConnectionType::INBOUND),
27432742
nKeyedNetGroup(nKeyedNetGroupIn),
27442743
// Don't relay addr messages to peers that we connect to as block-relay-only
27452744
// peers (to prevent adversaries from inferring these links from addr

‎src/net.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,6 @@ class CNode
777777
bool m_legacyWhitelisted{false};
778778
bool fClient{false}; // set by version message
779779
bool m_limited_node{false}; //after BIP159, set by version message
780-
const bool fInbound;
781780
std::atomic_bool fSuccessfullyConnected{false};
782781
// Setting fDisconnect to true will cause the node to be disconnected the
783782
// next time DisconnectNodes() runs
@@ -802,6 +801,10 @@ class CNode
802801
return m_conn_type == ConnectionType::ADDR_FETCH;
803802
}
804803

804+
bool IsInboundConn() const {
805+
return m_conn_type == ConnectionType::INBOUND;
806+
}
807+
805808
protected:
806809
mapMsgCmdSize mapSendBytesPerMsgCmd;
807810
mapMsgCmdSize mapRecvBytesPerMsgCmd GUARDED_BY(cs_vRecv);

‎src/net_processing.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ static void UpdatePreferredDownload(const CNode& node, CNodeState* state) EXCLUS
473473
nPreferredDownload -= state->fPreferredDownload;
474474

475475
// Whether this node should be marked as a preferred download node.
476-
state->fPreferredDownload = (!node.fInbound || node.HasPermission(PF_NOBAN)) && !node.IsAddrFetchConn() && !node.fClient;
476+
state->fPreferredDownload = (!node.IsInboundConn() || node.HasPermission(PF_NOBAN)) && !node.IsAddrFetchConn() && !node.fClient;
477477

478478
nPreferredDownload += state->fPreferredDownload;
479479
}
@@ -829,7 +829,7 @@ void UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds)
829829

830830
static bool IsOutboundDisconnectionCandidate(const CNode& node)
831831
{
832-
return !(node.fInbound || node.IsManualConn() || node.IsFeelerConn() || node.IsAddrFetchConn());
832+
return !(node.IsInboundConn() || node.IsManualConn() || node.IsFeelerConn() || node.IsAddrFetchConn());
833833
}
834834

835835
void PeerLogicValidation::InitializeNode(CNode *pnode) {
@@ -838,9 +838,9 @@ void PeerLogicValidation::InitializeNode(CNode *pnode) {
838838
NodeId nodeid = pnode->GetId();
839839
{
840840
LOCK(cs_main);
841-
mapNodeState.emplace_hint(mapNodeState.end(), std::piecewise_construct, std::forward_as_tuple(nodeid), std::forward_as_tuple(addr, std::move(addrName), pnode->fInbound, pnode->IsManualConn()));
841+
mapNodeState.emplace_hint(mapNodeState.end(), std::piecewise_construct, std::forward_as_tuple(nodeid), std::forward_as_tuple(addr, std::move(addrName), pnode->IsInboundConn(), pnode->IsManualConn()));
842842
}
843-
if(!pnode->fInbound)
843+
if(!pnode->IsInboundConn())
844844
PushNodeVersion(*pnode, *connman, GetTime());
845845
}
846846

@@ -2320,11 +2320,11 @@ void ProcessMessage(
23202320
vRecv >> nVersion >> nServiceInt >> nTime >> addrMe;
23212321
nSendVersion = std::min(nVersion, PROTOCOL_VERSION);
23222322
nServices = ServiceFlags(nServiceInt);
2323-
if (!pfrom.fInbound)
2323+
if (!pfrom.IsInboundConn())
23242324
{
23252325
connman.SetServices(pfrom.addr, nServices);
23262326
}
2327-
if (!pfrom.fInbound && !pfrom.IsFeelerConn() && !pfrom.IsManualConn() && !HasAllDesirableServiceFlags(nServices))
2327+
if (!pfrom.IsInboundConn() && !pfrom.IsFeelerConn() && !pfrom.IsManualConn() && !HasAllDesirableServiceFlags(nServices))
23282328
{
23292329
LogPrint(BCLog::NET, "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom.GetId(), nServices, GetDesirableServiceFlags(nServices));
23302330
pfrom.fDisconnect = true;
@@ -2351,20 +2351,20 @@ void ProcessMessage(
23512351
if (!vRecv.empty())
23522352
vRecv >> fRelay;
23532353
// Disconnect if we connected to ourself
2354-
if (pfrom.fInbound && !connman.CheckIncomingNonce(nNonce))
2354+
if (pfrom.IsInboundConn() && !connman.CheckIncomingNonce(nNonce))
23552355
{
23562356
LogPrintf("connected to self at %s, disconnecting\n", pfrom.addr.ToString());
23572357
pfrom.fDisconnect = true;
23582358
return;
23592359
}
23602360

2361-
if (pfrom.fInbound && addrMe.IsRoutable())
2361+
if (pfrom.IsInboundConn() && addrMe.IsRoutable())
23622362
{
23632363
SeenLocal(addrMe);
23642364
}
23652365

23662366
// Be shy and don't send version until we hear
2367-
if (pfrom.fInbound)
2367+
if (pfrom.IsInboundConn())
23682368
PushNodeVersion(pfrom, connman, GetAdjustedTime());
23692369

23702370
if (nVersion >= WTXID_RELAY_VERSION) {
@@ -2408,7 +2408,7 @@ void ProcessMessage(
24082408
UpdatePreferredDownload(pfrom, State(pfrom.GetId()));
24092409
}
24102410

2411-
if (!pfrom.fInbound && pfrom.IsAddrRelayPeer())
2411+
if (!pfrom.IsInboundConn() && pfrom.IsAddrRelayPeer())
24122412
{
24132413
// Advertise our address
24142414
if (fListen && !::ChainstateActive().IsInitialBlockDownload())
@@ -2472,7 +2472,7 @@ void ProcessMessage(
24722472
{
24732473
pfrom.SetRecvVersion(std::min(pfrom.nVersion.load(), PROTOCOL_VERSION));
24742474

2475-
if (!pfrom.fInbound) {
2475+
if (!pfrom.IsInboundConn()) {
24762476
// Mark this node as currently connected, so we update its timestamp later.
24772477
LOCK(cs_main);
24782478
State(pfrom.GetId())->fCurrentlyConnected = true;
@@ -3452,7 +3452,7 @@ void ProcessMessage(
34523452
// to users' AddrMan and later request them by sending getaddr messages.
34533453
// Making nodes which are behind NAT and can only make outgoing connections ignore
34543454
// the getaddr message mitigates the attack.
3455-
if (!pfrom.fInbound) {
3455+
if (!pfrom.IsInboundConn()) {
34563456
LogPrint(BCLog::NET, "Ignoring \"getaddr\" from outbound connection. peer=%d\n", pfrom.GetId());
34573457
return;
34583458
}
@@ -4279,7 +4279,7 @@ bool PeerLogicValidation::SendMessages(CNode* pto)
42794279
bool fSendTrickle = pto->HasPermission(PF_NOBAN);
42804280
if (pto->m_tx_relay->nNextInvSend < current_time) {
42814281
fSendTrickle = true;
4282-
if (pto->fInbound) {
4282+
if (pto->IsInboundConn()) {
42834283
pto->m_tx_relay->nNextInvSend = std::chrono::microseconds{connman->PoissonNextSendInbound(nNow, INVENTORY_BROADCAST_INTERVAL)};
42844284
} else {
42854285
// Use half the delay for outbound peers, as there is less privacy concern for them.

‎src/test/net_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test)
182182
std::string pszDest;
183183

184184
std::unique_ptr<CNode> pnode1 = MakeUnique<CNode>(id++, NODE_NETWORK, height, hSocket, addr, 0, 0, CAddress(), pszDest, ConnectionType::OUTBOUND);
185-
BOOST_CHECK(pnode1->fInbound == false);
185+
BOOST_CHECK(pnode1->IsInboundConn() == false);
186186

187187
std::unique_ptr<CNode> pnode2 = MakeUnique<CNode>(id++, NODE_NETWORK, height, hSocket, addr, 1, 1, CAddress(), pszDest, ConnectionType::INBOUND);
188-
BOOST_CHECK(pnode2->fInbound == true);
188+
BOOST_CHECK(pnode2->IsInboundConn() == true);
189189
}
190190

191191
// prior to PR #14728, this test triggers an undefined behavior

0 commit comments

Comments
 (0)