[net/refactor] Add feeler connections to ConnectionType enum

amitiuttarwar · amitiuttarwar · commit 0e52a659a2de · 2020-08-07T17:18:16.000-07:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -1777,7 +1777,7 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect)
             for (const std::string& strAddr : connect)
             {
                 CAddress addr(CService(), NODE_NONE);
-                OpenNetworkConnection(addr, false, nullptr, strAddr.c_str(), false, false, ConnectionType::MANUAL);
+                OpenNetworkConnection(addr, false, nullptr, strAddr.c_str(), false, ConnectionType::MANUAL);
                 for (int i = 0; i < 10 && i < nLoop; i++)
                 {
                     if (!interruptNet.sleep_for(std::chrono::milliseconds(500)))
@@ -1943,7 +1943,8 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect)
             // well for sanity.)
             bool block_relay_only = nOutboundBlockRelay < m_max_outbound_block_relay && !fFeeler && nOutboundFullRelay >= m_max_outbound_full_relay;
 
-            OpenNetworkConnection(addrConnect, (int)setConnected.size() >= std::min(nMaxConnections - 1, 2), &grant, nullptr, false, fFeeler, ConnectionType::OUTBOUND, block_relay_only);
+            ConnectionType conn_type = (fFeeler ? ConnectionType::FEELER : ConnectionType::OUTBOUND);
+            OpenNetworkConnection(addrConnect, (int)setConnected.size() >= std::min(nMaxConnections - 1, 2), &grant, nullptr, false, conn_type, block_relay_only);
         }
     }
 }
@@ -2018,7 +2019,7 @@ void CConnman::ThreadOpenAddedConnections()
                 }
                 tried = true;
                 CAddress addr(CService(), NODE_NONE);
-                OpenNetworkConnection(addr, false, &grant, info.strAddedNode.c_str(), false, false, ConnectionType::MANUAL);
+                OpenNetworkConnection(addr, false, &grant, info.strAddedNode.c_str(), false, ConnectionType::MANUAL);
                 if (!interruptNet.sleep_for(std::chrono::milliseconds(500)))
                     return;
             }
@@ -2030,7 +2031,7 @@ void CConnman::ThreadOpenAddedConnections()
 }
 
 // if successful, this moves the passed grant to the constructed node
-void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound, const char *pszDest, bool m_addr_fetch, bool fFeeler, ConnectionType conn_type, bool block_relay_only)
+void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound, const char *pszDest, bool m_addr_fetch, ConnectionType conn_type, bool block_relay_only)
 {
     assert(conn_type != ConnectionType::INBOUND);
 
@@ -2059,8 +2060,6 @@ void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
         grantOutbound->MoveTo(pnode->grantOutbound);
     if (m_addr_fetch)
         pnode->m_addr_fetch = true;
-    if (fFeeler)
-        pnode->fFeeler = true;
 
     m_msgproc->InitializeNode(pnode);
     {
@@ -2738,6 +2737,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     : nTimeConnected(GetSystemTimeInSeconds()),
     addr(addrIn),
     addrBind(addrBindIn),
+    fFeeler(conn_type_in == ConnectionType::FEELER),
     m_manual_connection(conn_type_in == ConnectionType::MANUAL),
     fInbound(conn_type_in == ConnectionType::INBOUND),
     nKeyedNetGroup(nKeyedNetGroupIn),
diff --git a/src/net.h b/src/net.h
@@ -117,6 +117,7 @@ enum class ConnectionType {
     INBOUND,
     OUTBOUND,
     MANUAL,
+    FEELER,
 };
 
 class NetEventsInterface;
@@ -202,7 +203,7 @@ class CConnman
     bool GetNetworkActive() const { return fNetworkActive; };
     bool GetUseAddrmanOutgoing() const { return m_use_addrman_outgoing; };
     void SetNetworkActive(bool active);
-    void OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = nullptr, const char *strDest = nullptr, bool m_addr_fetch = false, bool fFeeler = false, ConnectionType conn_type = ConnectionType::OUTBOUND, bool block_relay_only = false);
+    void OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = nullptr, const char *strDest = nullptr, bool m_addr_fetch = false, ConnectionType conn_type = ConnectionType::OUTBOUND, bool block_relay_only = false);
     bool CheckIncomingNonce(uint64_t nonce);
 
     bool ForNode(NodeId id, std::function<bool(CNode* pnode)> func);
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -264,7 +264,7 @@ static UniValue addnode(const JSONRPCRequest& request)
     if (strCommand == "onetry")
     {
         CAddress addr;
-        node.connman->OpenNetworkConnection(addr, false, nullptr, strNode.c_str(), false, false, ConnectionType::MANUAL);
+        node.connman->OpenNetworkConnection(addr, false, nullptr, strNode.c_str(), false, ConnectionType::MANUAL);
         return NullUniValue;
     }
 
diff --git a/src/test/fuzz/process_messages.cpp b/src/test/fuzz/process_messages.cpp
@@ -44,7 +44,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     const auto num_peers_to_add = fuzzed_data_provider.ConsumeIntegralInRange(1, 3);
     for (int i = 0; i < num_peers_to_add; ++i) {
         const ServiceFlags service_flags = ServiceFlags(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
-        const ConnectionType conn_type = fuzzed_data_provider.PickValueInArray({ConnectionType::INBOUND, ConnectionType::OUTBOUND, ConnectionType::MANUAL});
+        const ConnectionType conn_type = fuzzed_data_provider.PickValueInArray({ConnectionType::INBOUND, ConnectionType::OUTBOUND, ConnectionType::MANUAL, ConnectionType::FEELER});
         const bool block_relay_only{fuzzed_data_provider.ConsumeBool()};
         peers.push_back(MakeUnique<CNode>(i, service_flags, 0, INVALID_SOCKET, CAddress{CService{in_addr{0x0100007f}, 7777}, NODE_NETWORK}, 0, 0, CAddress{}, std::string{}, conn_type, block_relay_only).release());
         CNode& p2p_node = *peers.back();

Original file line number	Diff line number	Diff line change
`@@ -1777,7 +1777,7 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect)`
`1777`	`1777`	`for (const std::string& strAddr : connect)`
`1778`	`1778`	`{`
`1779`	`1779`	`CAddress addr(CService(), NODE_NONE);`
`1780`		`- OpenNetworkConnection(addr, false, nullptr, strAddr.c_str(), false, false, ConnectionType::MANUAL);`
	`1780`	`+ OpenNetworkConnection(addr, false, nullptr, strAddr.c_str(), false, ConnectionType::MANUAL);`
`1781`	`1781`	`for (int i = 0; i < 10 && i < nLoop; i++)`
`1782`	`1782`	`{`
`1783`	`1783`	`if (!interruptNet.sleep_for(std::chrono::milliseconds(500)))`
`@@ -1943,7 +1943,8 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect)`
`1943`	`1943`	`// well for sanity.)`
`1944`	`1944`	`bool block_relay_only = nOutboundBlockRelay < m_max_outbound_block_relay && !fFeeler && nOutboundFullRelay >= m_max_outbound_full_relay;`
`1945`	`1945`
`1946`		`- OpenNetworkConnection(addrConnect, (int)setConnected.size() >= std::min(nMaxConnections - 1, 2), &grant, nullptr, false, fFeeler, ConnectionType::OUTBOUND, block_relay_only);`
	`1946`	`+ ConnectionType conn_type = (fFeeler ? ConnectionType::FEELER : ConnectionType::OUTBOUND);`
	`1947`	`+ OpenNetworkConnection(addrConnect, (int)setConnected.size() >= std::min(nMaxConnections - 1, 2), &grant, nullptr, false, conn_type, block_relay_only);`
`1947`	`1948`	`}`
`1948`	`1949`	`}`
`1949`	`1950`	`}`
`@@ -2018,7 +2019,7 @@ void CConnman::ThreadOpenAddedConnections()`
`2018`	`2019`	`}`
`2019`	`2020`	`tried = true;`
`2020`	`2021`	`CAddress addr(CService(), NODE_NONE);`
`2021`		`- OpenNetworkConnection(addr, false, &grant, info.strAddedNode.c_str(), false, false, ConnectionType::MANUAL);`
	`2022`	`+ OpenNetworkConnection(addr, false, &grant, info.strAddedNode.c_str(), false, ConnectionType::MANUAL);`
`2022`	`2023`	`if (!interruptNet.sleep_for(std::chrono::milliseconds(500)))`
`2023`	`2024`	`return;`
`2024`	`2025`	`}`
`@@ -2030,7 +2031,7 @@ void CConnman::ThreadOpenAddedConnections()`
`2030`	`2031`	`}`
`2031`	`2032`
`2032`	`2033`	`// if successful, this moves the passed grant to the constructed node`
`2033`		`-void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant grantOutbound, const char pszDest, bool m_addr_fetch, bool fFeeler, ConnectionType conn_type, bool block_relay_only)`
	`2034`	`+void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant grantOutbound, const char pszDest, bool m_addr_fetch, ConnectionType conn_type, bool block_relay_only)`
`2034`	`2035`	`{`
`2035`	`2036`	`assert(conn_type != ConnectionType::INBOUND);`
`2036`	`2037`
`@@ -2059,8 +2060,6 @@ void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai`
`2059`	`2060`	`grantOutbound->MoveTo(pnode->grantOutbound);`
`2060`	`2061`	`if (m_addr_fetch)`
`2061`	`2062`	`pnode->m_addr_fetch = true;`
`2062`		`- if (fFeeler)`
`2063`		`- pnode->fFeeler = true;`
`2064`	`2063`
`2065`	`2064`	`m_msgproc->InitializeNode(pnode);`
`2066`	`2065`	`{`
`@@ -2738,6 +2737,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn`
`2738`	`2737`	`: nTimeConnected(GetSystemTimeInSeconds()),`
`2739`	`2738`	`addr(addrIn),`
`2740`	`2739`	`addrBind(addrBindIn),`
	`2740`	`+ fFeeler(conn_type_in == ConnectionType::FEELER),`
`2741`	`2741`	`m_manual_connection(conn_type_in == ConnectionType::MANUAL),`
`2742`	`2742`	`fInbound(conn_type_in == ConnectionType::INBOUND),`
`2743`	`2743`	`nKeyedNetGroup(nKeyedNetGroupIn),`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ static UniValue addnode(const JSONRPCRequest& request)`
`264`	`264`	`if (strCommand == "onetry")`
`265`	`265`	`{`
`266`	`266`	`CAddress addr;`
`267`		`- node.connman->OpenNetworkConnection(addr, false, nullptr, strNode.c_str(), false, false, ConnectionType::MANUAL);`
	`267`	`+ node.connman->OpenNetworkConnection(addr, false, nullptr, strNode.c_str(), false, ConnectionType::MANUAL);`
`268`	`268`	`return NullUniValue;`
`269`	`269`	`}`
`270`	`270`