foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-08 10:31:50 -05:00
Code Issues Activity

Convert GetLocal() to std::optional and remove out-param

Browse source 
Co-authored-by: stickies-v <stickies-v@protonmail.com>
This commit is contained in:
Jon Atack 2023-07-13 12:38:06 -06:00
parent f1304db136
commit 5316ae5dd8
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/net.cpp
View file

@ -145,11 +145,12 @@ uint16_t GetListenPort()
return static_cast<uint16_t>(gArgs.GetIntArg("-port", Params().GetDefaultPort())); return static_cast<uint16_t>(gArgs.GetIntArg("-port", Params().GetDefaultPort()));
} }
// find 'best' local address for a particular peer // Determine the "best" local address for a particular peer.
[[nodiscard]] static bool GetLocal(CService& addr, const CNode& peer) [[nodiscard]] static std::optional<CService> GetLocal(const CNode& peer)
{ {
if (!fListen) return false; if (!fListen) return std::nullopt;
std::optional<CService> addr;
int nBestScore = -1; int nBestScore = -1;
int nBestReachability = -1; int nBestReachability = -1;
{ {
@ -165,13 +166,13 @@ uint16_t GetListenPort()
const int nScore{local_service_info.nScore}; const int nScore{local_service_info.nScore};
const int nReachability{local_addr.GetReachabilityFrom(peer.addr)}; const int nReachability{local_addr.GetReachabilityFrom(peer.addr)};
if (nReachability > nBestReachability || (nReachability == nBestReachability && nScore > nBestScore)) { if (nReachability > nBestReachability || (nReachability == nBestReachability && nScore > nBestScore)) {
addr = CService{local_addr, local_service_info.nPort}; addr.emplace(CService{local_addr, local_service_info.nPort});
nBestReachability = nReachability; nBestReachability = nReachability;
nBestScore = nScore; nBestScore = nScore;
} }
} }
} }
return nBestScore >= 0; return addr;
} }
//! Convert the serialized seeds into usable address objects. //! Convert the serialized seeds into usable address objects.
@ -196,17 +197,13 @@ static std::vector<CAddress> ConvertSeeds(const std::vector<uint8_t> &vSeedsIn)
return vSeedsOut; return vSeedsOut;
} }
// get best local address for a particular peer as a CAddress // Determine the "best" local address for a particular peer.
// Otherwise, return the unroutable 0.0.0.0 but filled in with // If none, return the unroutable 0.0.0.0 but filled in with
// the normal parameters, since the IP may be changed to a useful // the normal parameters, since the IP may be changed to a useful
// one by discovery. // one by discovery.
CService GetLocalAddress(const CNode& peer) CService GetLocalAddress(const CNode& peer)
{ {
CService addr; return GetLocal(peer).value_or(CService{CNetAddr(), GetListenPort()});
if (GetLocal(addr, peer)) {
return addr;
}
return CService{CNetAddr(), GetListenPort()};
} }
static int GetnScore(const CService& addr) static int GetnScore(const CService& addr)