highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-26 19:11:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use higher-level CNetAddr and CNode helpers in net.cpp

Browse Source 
rather than low-level comparisons with Network enum values.
This commit is contained in:
Jon Atack
2023-07-14 06:51:21 -06:00
parent 07f5891588
commit f1304db136
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/net.cpp
View File

@@ -158,11 +158,8 @@ uint16_t GetListenPort()
// For privacy reasons, don't advertise our privacy-network address // For privacy reasons, don't advertise our privacy-network address
// to other networks and don't advertise our other-network address // to other networks and don't advertise our other-network address
// to privacy networks. // to privacy networks.
const Network our_net{local_addr.GetNetwork()}; if (local_addr.GetNetwork() != peer.ConnectedThroughNetwork()
const Network peers_net{peer.ConnectedThroughNetwork()}; && (local_addr.IsPrivacyNet() || peer.IsConnectedThroughPrivacyNet())) {
if (our_net != peers_net &&
(our_net == NET_ONION || our_net == NET_I2P ||
peers_net == NET_ONION || peers_net == NET_I2P)) {
continue; continue;
} }
const int nScore{local_service_info.nScore}; const int nScore{local_service_info.nScore};
@@ -272,7 +269,7 @@ std::optional<CService> GetLocalAddrForPeer(CNode& node)
CService MaybeFlipIPv6toCJDNS(const CService& service) CService MaybeFlipIPv6toCJDNS(const CService& service)
{ {
CService ret{service}; CService ret{service};
if (ret.m_net == NET_IPV6 && ret.HasCJDNSPrefix() && IsReachable(NET_CJDNS)) { if (ret.IsIPv6() && ret.HasCJDNSPrefix() && IsReachable(NET_CJDNS)) {
ret.m_net = NET_CJDNS; ret.m_net = NET_CJDNS;
} }
return ret; return ret;
@@ -488,7 +485,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
const bool use_proxy{GetProxy(addrConnect.GetNetwork(), proxy)}; const bool use_proxy{GetProxy(addrConnect.GetNetwork(), proxy)};
bool proxyConnectionFailed = false; bool proxyConnectionFailed = false;
if (addrConnect.GetNetwork() == NET_I2P && use_proxy) { if (addrConnect.IsI2P() && use_proxy) {
i2p::Connection conn; i2p::Connection conn;
if (m_i2p_sam_session) { if (m_i2p_sam_session) {