Merge 89b2194124 into merged_master (Bitcoin PR bitcoin/bitcoin#25814)

This commit is contained in:
Byron Hambly 2024-11-01 15:51:40 +02:00
commit 3997d119e7

View file

@ -208,12 +208,11 @@ static std::vector<CAddress> ConvertSeeds(const std::vector<uint8_t> &vSeedsIn)
// one by discovery.
CService GetLocalAddress(const CNetAddr& addrPeer)
{
CService ret{CNetAddr(), GetListenPort()};
CService addr;
if (GetLocal(addr, &addrPeer)) {
ret = CService{addr};
return addr;
}
return ret;
return CService{CNetAddr(), GetListenPort()};
}
static int GetnScore(const CService& addr)