mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-23 07:15:29 +01:00
Code Issues Projects Releases Wiki Activity

GetLocal() type-safety, naming, const, and formatting cleanups

Browse source 
Co-authored-by: Jon Atack <jon@atack.com>
This commit is contained in:
stickies-v 2023-07-18 10:07:41 -06:00 • committed by Jon Atack
parent fb4265747c
commit df488563b2
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/net.cpp
View file

@ -148,30 +148,27 @@ uint16_t GetListenPort()
// find 'best' local address for a particular peer
[[nodiscard]] static bool GetLocal(CService& addr, const CNode& peer)
{
if (!fListen)
return false;
if (!fListen) return false;
int nBestScore = -1;
int nBestReachability = -1;
{
LOCK(g_maplocalhost_mutex);
for (const auto& entry : mapLocalHost)
{
for (const auto& [local_addr, local_service_info] : mapLocalHost) {
// 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{entry.first.GetNetwork()};
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)) {
continue;
}
int nScore = entry.second.nScore;
int nReachability = entry.first.GetReachabilityFrom(peer.addr);
if (nReachability > nBestReachability || (nReachability == nBestReachability && nScore > nBestScore))
{
addr = CService(entry.first, entry.second.nPort);
const int nScore{local_service_info.nScore};
const int nReachability{local_addr.GetReachabilityFrom(peer.addr)};
if (nReachability > nBestReachability || (nReachability == nBestReachability && nScore > nBestScore)) {
addr = CService{local_addr, local_service_info.nPort};
nBestReachability = nReachability;
nBestScore = nScore;
}