diff --git a/src/avalanche/test/processor_tests.cpp b/src/avalanche/test/processor_tests.cpp --- a/src/avalanche/test/processor_tests.cpp +++ b/src/avalanche/test/processor_tests.cpp @@ -101,9 +101,9 @@ static NodeId id = 0; CAddress addr(ip(GetRandInt(0xffffffff)), NODE_NONE); - auto node = - new CNode(id++, ServiceFlags(NODE_NETWORK), 0, INVALID_SOCKET, addr, - 0, 0, 0, CAddress(), "", ConnectionType::OUTBOUND); + auto node = new CNode(id++, ServiceFlags(NODE_NETWORK), 0, + INVALID_SOCKET, addr, 0, 0, 0, CAddress(), "", + ConnectionType::OUTBOUND_FULL_RELAY); node->SetCommonVersion(PROTOCOL_VERSION); node->nServices = nServices; m_node.peerman->InitializeNode(config, node); diff --git a/src/net.h b/src/net.h --- a/src/net.h +++ b/src/net.h @@ -140,7 +140,7 @@ * Full relay connections (blocks, addrs, txns) made automatically. * Addresses selected from AddrMan. */ - OUTBOUND, + OUTBOUND_FULL_RELAY, /** * Connections to addresses added via addnode or the connect command line * argument. @@ -253,11 +253,10 @@ 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, - ConnectionType conn_type = ConnectionType::OUTBOUND); + void OpenNetworkConnection( + const CAddress &addrConnect, bool fCountFailure, + CSemaphoreGrant *grantOutbound = nullptr, const char *strDest = nullptr, + ConnectionType conn_type = ConnectionType::OUTBOUND_FULL_RELAY); bool CheckIncomingNonce(uint64_t nonce); bool ForNode(NodeId id, std::function func); @@ -891,7 +890,7 @@ bool IsOutboundOrBlockRelayConn() const { switch (m_conn_type) { - case ConnectionType::OUTBOUND: + case ConnectionType::OUTBOUND_FULL_RELAY: case ConnectionType::BLOCK_RELAY: return true; case ConnectionType::INBOUND: @@ -905,7 +904,7 @@ } bool IsFullOutboundConn() const { - return m_conn_type == ConnectionType::OUTBOUND; + return m_conn_type == ConnectionType::OUTBOUND_FULL_RELAY; } bool IsManualConn() const { return m_conn_type == ConnectionType::MANUAL; } @@ -930,7 +929,7 @@ case ConnectionType::MANUAL: case ConnectionType::FEELER: return false; - case ConnectionType::OUTBOUND: + case ConnectionType::OUTBOUND_FULL_RELAY: case ConnectionType::BLOCK_RELAY: case ConnectionType::ADDR_FETCH: return true; diff --git a/src/net.cpp b/src/net.cpp --- a/src/net.cpp +++ b/src/net.cpp @@ -2057,7 +2057,7 @@ case ConnectionType::INBOUND: case ConnectionType::MANUAL: break; - case ConnectionType::OUTBOUND: + case ConnectionType::OUTBOUND_FULL_RELAY: case ConnectionType::BLOCK_RELAY: case ConnectionType::ADDR_FETCH: case ConnectionType::FEELER: @@ -2181,12 +2181,12 @@ if (fFeeler) { conn_type = ConnectionType::FEELER; } else if (nOutboundFullRelay < m_max_outbound_full_relay) { - conn_type = ConnectionType::OUTBOUND; + conn_type = ConnectionType::OUTBOUND_FULL_RELAY; } else if (nOutboundBlockRelay < m_max_outbound_block_relay) { conn_type = ConnectionType::BLOCK_RELAY; } else { // GetTryNewOutboundPeer() is true - conn_type = ConnectionType::OUTBOUND; + conn_type = ConnectionType::OUTBOUND_FULL_RELAY; } OpenNetworkConnection(addrConnect, diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp --- a/src/test/denialofservice_tests.cpp +++ b/src/test/denialofservice_tests.cpp @@ -85,7 +85,8 @@ // Mock an outbound peer CAddress addr1(ip(0xa0b0c001), NODE_NONE); CNode dummyNode1(id++, ServiceFlags(NODE_NETWORK), 0, INVALID_SOCKET, addr1, - 0, 0, 0, CAddress(), "", ConnectionType::OUTBOUND); + 0, 0, 0, CAddress(), "", + ConnectionType::OUTBOUND_FULL_RELAY); dummyNode1.SetCommonVersion(PROTOCOL_VERSION); peerLogic->InitializeNode(config, &dummyNode1); @@ -147,7 +148,7 @@ CAddress addr(ip(g_insecure_rand_ctx.randbits(32)), NODE_NONE); vNodes.emplace_back(new CNode(id++, ServiceFlags(NODE_NETWORK), 0, INVALID_SOCKET, addr, 0, 0, 0, CAddress(), "", - ConnectionType::OUTBOUND)); + ConnectionType::OUTBOUND_FULL_RELAY)); CNode &node = *vNodes.back(); node.SetCommonVersion(PROTOCOL_VERSION); diff --git a/src/test/fuzz/net.cpp b/src/test/fuzz/net.cpp --- a/src/test/fuzz/net.cpp +++ b/src/test/fuzz/net.cpp @@ -40,21 +40,22 @@ return; } - CNode node{fuzzed_data_provider.ConsumeIntegral(), - static_cast( - fuzzed_data_provider.ConsumeIntegral()), - fuzzed_data_provider.ConsumeIntegral(), - INVALID_SOCKET, - *address, - fuzzed_data_provider.ConsumeIntegral(), - fuzzed_data_provider.ConsumeIntegral(), - fuzzed_data_provider.ConsumeIntegral(), - *address_bind, - fuzzed_data_provider.ConsumeRandomLengthString(32), - fuzzed_data_provider.PickValueInArray( - {ConnectionType::INBOUND, ConnectionType::OUTBOUND, - ConnectionType::MANUAL, ConnectionType::FEELER, - ConnectionType::BLOCK_RELAY, ConnectionType::ADDR_FETCH})}; + CNode node{ + fuzzed_data_provider.ConsumeIntegral(), + static_cast( + fuzzed_data_provider.ConsumeIntegral()), + fuzzed_data_provider.ConsumeIntegral(), + INVALID_SOCKET, + *address, + fuzzed_data_provider.ConsumeIntegral(), + fuzzed_data_provider.ConsumeIntegral(), + fuzzed_data_provider.ConsumeIntegral(), + *address_bind, + fuzzed_data_provider.ConsumeRandomLengthString(32), + fuzzed_data_provider.PickValueInArray( + {ConnectionType::INBOUND, ConnectionType::OUTBOUND_FULL_RELAY, + ConnectionType::MANUAL, ConnectionType::FEELER, + ConnectionType::BLOCK_RELAY, ConnectionType::ADDR_FETCH})}; node.SetCommonVersion(fuzzed_data_provider.ConsumeIntegral()); while (fuzzed_data_provider.ConsumeBool()) { switch (fuzzed_data_provider.ConsumeIntegralInRange(0, 10)) { diff --git a/src/test/fuzz/process_message.cpp b/src/test/fuzz/process_message.cpp --- a/src/test/fuzz/process_message.cpp +++ b/src/test/fuzz/process_message.cpp @@ -77,7 +77,7 @@ *std::make_unique( 0, ServiceFlags(NODE_NETWORK | NODE_BLOOM), 0, INVALID_SOCKET, CAddress{CService{in_addr{0x0100007f}, 7777}, NODE_NETWORK}, 0, 0, - 0, CAddress{}, std::string{}, ConnectionType::OUTBOUND) + 0, CAddress{}, std::string{}, ConnectionType::OUTBOUND_FULL_RELAY) .release(); p2p_node.fSuccessfullyConnected = true; p2p_node.nVersion = PROTOCOL_VERSION; diff --git a/src/test/fuzz/process_messages.cpp b/src/test/fuzz/process_messages.cpp --- a/src/test/fuzz/process_messages.cpp +++ b/src/test/fuzz/process_messages.cpp @@ -47,7 +47,7 @@ const ServiceFlags service_flags = ServiceFlags(fuzzed_data_provider.ConsumeIntegral()); const ConnectionType conn_type = fuzzed_data_provider.PickValueInArray( - {ConnectionType::INBOUND, ConnectionType::OUTBOUND, + {ConnectionType::INBOUND, ConnectionType::OUTBOUND_FULL_RELAY, ConnectionType::MANUAL, ConnectionType::FEELER, ConnectionType::BLOCK_RELAY, ConnectionType::ADDR_FETCH}); peers.push_back( diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -193,7 +193,7 @@ auto pnode1 = std::make_unique(id++, NODE_NETWORK, height, hSocket, addr, 0, 0, 0, CAddress(), pszDest, - ConnectionType::OUTBOUND); + ConnectionType::OUTBOUND_FULL_RELAY); BOOST_CHECK(pnode1->IsInboundConn() == false); auto pnode2 = std::make_unique(id++, NODE_NETWORK, height, hSocket, @@ -723,7 +723,7 @@ CAddress addr = CAddress(CService(ipv4AddrPeer, 7777), NODE_NETWORK); std::unique_ptr pnode = std::make_unique( 0, NODE_NETWORK, 0, INVALID_SOCKET, addr, 0, 0, 0, CAddress{}, - std::string{}, ConnectionType::OUTBOUND); + std::string{}, ConnectionType::OUTBOUND_FULL_RELAY); pnode->fSuccessfullyConnected.store(true); // the peer claims to be reaching us via IPv6