p2p, bugfix: detect addnode cjdns peers in GetAddedNodeInfo()

jonatack · jonatack · commit 684da9707040 · 2024-05-10T22:29:51.000-06:00
Addnode (manual) peers connected to us via the cjdns network are currently not
detected by CConnman::GetAddedNodeInfo(), i.e. fConnected is always false.

This causes the following issues:

- RPC `getaddednodeinfo` incorrectly shows them as not connected

- CConnman::ThreadOpenAddedConnections() continually retries to connect them
diff --git a/src/net.cpp b/src/net.cpp
@@ -2832,7 +2832,7 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo(bool include_connected) co
     }
 
     for (const auto& addr : lAddresses) {
-        CService service(LookupNumeric(addr.m_added_node, GetDefaultPort(addr.m_added_node)));
+        CService service{MaybeFlipIPv6toCJDNS(LookupNumeric(addr.m_added_node, GetDefaultPort(addr.m_added_node)))};
         AddedNodeInfo addedNode{addr, CService(), false, false};
         if (service.IsValid()) {
             // strAddNode is an IP:port

Original file line number	Diff line number	Diff line change
`@@ -2832,7 +2832,7 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo(bool include_connected) co`
`2832`	`2832`	`}`
`2833`	`2833`
`2834`	`2834`	`for (const auto& addr : lAddresses) {`
`2835`		`- CService service(LookupNumeric(addr.m_added_node, GetDefaultPort(addr.m_added_node)));`
	`2835`	`+ CService service{MaybeFlipIPv6toCJDNS(LookupNumeric(addr.m_added_node, GetDefaultPort(addr.m_added_node)))};`
`2836`	`2836`	`AddedNodeInfo addedNode{addr, CService(), false, false};`
`2837`	`2837`	`if (service.IsValid()) {`
`2838`	`2838`	`// strAddNode is an IP:port`