Merge branch 'master' into elem-23.3.1-rc1

This commit is contained in:
Pablo Greco 2025-07-14 16:34:04 -07:00
commit 38cbe9282d
40 changed files with 3809 additions and 213 deletions

View file

@ -2226,7 +2226,7 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo() const
}
for (const std::string& strAddNode : lAddresses) {
CService service(LookupNumeric(strAddNode, Params().GetDefaultPort(strAddNode)));
CService service{MaybeFlipIPv6toCJDNS(LookupNumeric(strAddNode, Params().GetDefaultPort(strAddNode)))};
AddedNodeInfo addedNode{strAddNode, CService(), false, false};
if (service.IsValid()) {
// strAddNode is an IP:port