Merge 5711da6588 into merged_master (Bitcoin PR bitcoin/bitcoin#29213)

This commit is contained in:
Byron Hambly 2025-11-18 12:06:56 +02:00
commit 3217a2ce4f
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
3 changed files with 34 additions and 2 deletions

View file

@ -3427,6 +3427,9 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
vRecv >> CNetAddr::V1(addrMe);
if (!pfrom.IsInboundConn())
{
// Overwrites potentially existing services. In contrast to this,
// unvalidated services received via gossip relay in ADDR/ADDRV2
// messages are only ever added but cannot replace existing ones.
m_addrman.SetServices(pfrom.addr, nServices);
}
if (pfrom.ExpectServicesFromConn() && !HasAllDesirableServiceFlags(nServices))