Remove fNetworkNode.

gmaxwell · gmaxwell · commit 083f20369878 · 2016-11-27T04:13:54.000Z
Matt pointed out to me that this appeared to be doing nothing (except involving itself in data races).
diff --git a/src/main.cpp b/src/main.cpp
@@ -5242,8 +5242,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     {
         pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
 
-        // Mark this node as currently connected, so we update its timestamp later.
-        if (pfrom->fNetworkNode) {
+        if (!pfrom->fInbound) {
+            // Mark this node as currently connected, so we update its timestamp later.
             LOCK(cs_main);
             State(pfrom->GetId())->fCurrentlyConnected = true;
         }
diff --git a/src/net.cpp b/src/net.cpp
@@ -1067,8 +1067,7 @@ void CConnman::ThreadSocketHandler()
                     pnode->CloseSocketDisconnect();
 
                     // hold in disconnected pool until all refs are released
-                    if (pnode->fNetworkNode || pnode->fInbound)
-                        pnode->Release();
+                    pnode->Release();
                     vNodesDisconnected.push_back(pnode);
                 }
             }
@@ -1808,7 +1807,6 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
         return false;
     if (grantOutbound)
         grantOutbound->MoveTo(pnode->grantOutbound);
-    pnode->fNetworkNode = true;
     if (fOneShot)
         pnode->fOneShot = true;
     if (fFeeler)
@@ -2531,7 +2529,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     fOneShot = false;
     fClient = false; // set by version message
     fFeeler = false;
-    fNetworkNode = false;
     fSuccessfullyConnected = false;
     fDisconnect = false;
     nRefCount = 0;
diff --git a/src/net.h b/src/net.h
@@ -613,7 +613,6 @@ class CNode
     bool fOneShot;
     bool fClient;
     const bool fInbound;
-    bool fNetworkNode;
     bool fSuccessfullyConnected;
     bool fDisconnect;
     // We use fRelayTxes for two purposes -

Original file line number	Diff line number	Diff line change
`@@ -5242,8 +5242,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`5242`	`5242`	`{`
`5243`	`5243`	`pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION));`
`5244`	`5244`
`5245`		`- // Mark this node as currently connected, so we update its timestamp later.`
`5246`		`- if (pfrom->fNetworkNode) {`
	`5245`	`+ if (!pfrom->fInbound) {`
	`5246`	`+ // Mark this node as currently connected, so we update its timestamp later.`
`5247`	`5247`	`LOCK(cs_main);`
`5248`	`5248`	`State(pfrom->GetId())->fCurrentlyConnected = true;`
`5249`	`5249`	`}`