diff options
| author | Jon Atack <jon@atack.com> | 2023-07-14 06:51:21 -0600 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2023-07-19 12:42:48 -0600 |
| commit | f1304db136bbeac70b52522b5a4522165bfb3fc0 (patch) | |
| tree | acf280aa799ff57012d9b30e9ba56f411d2bb47b /src/net.cpp | |
| parent | 07f589158835151a7613e4b2a508c0dd61a18fd7 (diff) | |
| download | bitcoin-f1304db136bbeac70b52522b5a4522165bfb3fc0.tar.xz | |
Use higher-level CNetAddr and CNode helpers in net.cpp
rather than low-level comparisons with Network enum values.
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/net.cpp b/src/net.cpp index e1f3040485..a230b64a74 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -158,11 +158,8 @@ uint16_t GetListenPort() // For privacy reasons, don't advertise our privacy-network address // to other networks and don't advertise our other-network address // to privacy networks. - const Network our_net{local_addr.GetNetwork()}; - const Network peers_net{peer.ConnectedThroughNetwork()}; - if (our_net != peers_net && - (our_net == NET_ONION || our_net == NET_I2P || - peers_net == NET_ONION || peers_net == NET_I2P)) { + if (local_addr.GetNetwork() != peer.ConnectedThroughNetwork() + && (local_addr.IsPrivacyNet() || peer.IsConnectedThroughPrivacyNet())) { continue; } const int nScore{local_service_info.nScore}; @@ -272,7 +269,7 @@ std::optional<CService> GetLocalAddrForPeer(CNode& node) CService MaybeFlipIPv6toCJDNS(const CService& 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; } return ret; @@ -488,7 +485,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo const bool use_proxy{GetProxy(addrConnect.GetNetwork(), proxy)}; bool proxyConnectionFailed = false; - if (addrConnect.GetNetwork() == NET_I2P && use_proxy) { + if (addrConnect.IsI2P() && use_proxy) { i2p::Connection conn; if (m_i2p_sam_session) { |