mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-26 11:13:23 -03:00
net: rpc: return peer's mapped AS in getrawaddrman
This information can be used to check bucketing logic.
This commit is contained in:
parent
62ef33a718
commit
8c2714907d
1 changed files with 17 additions and 5 deletions
|
@ -1093,20 +1093,28 @@ static RPCHelpMan getaddrmaninfo()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
UniValue AddrmanEntryToJSON(const AddrInfo& info)
|
UniValue AddrmanEntryToJSON(const AddrInfo& info, CConnman& connman)
|
||||||
{
|
{
|
||||||
UniValue ret(UniValue::VOBJ);
|
UniValue ret(UniValue::VOBJ);
|
||||||
ret.pushKV("address", info.ToStringAddr());
|
ret.pushKV("address", info.ToStringAddr());
|
||||||
|
const auto mapped_as{connman.GetMappedAS(info)};
|
||||||
|
if (mapped_as != 0) {
|
||||||
|
ret.pushKV("mapped_as", mapped_as);
|
||||||
|
}
|
||||||
ret.pushKV("port", info.GetPort());
|
ret.pushKV("port", info.GetPort());
|
||||||
ret.pushKV("services", (uint64_t)info.nServices);
|
ret.pushKV("services", (uint64_t)info.nServices);
|
||||||
ret.pushKV("time", int64_t{TicksSinceEpoch<std::chrono::seconds>(info.nTime)});
|
ret.pushKV("time", int64_t{TicksSinceEpoch<std::chrono::seconds>(info.nTime)});
|
||||||
ret.pushKV("network", GetNetworkName(info.GetNetClass()));
|
ret.pushKV("network", GetNetworkName(info.GetNetClass()));
|
||||||
ret.pushKV("source", info.source.ToStringAddr());
|
ret.pushKV("source", info.source.ToStringAddr());
|
||||||
ret.pushKV("source_network", GetNetworkName(info.source.GetNetClass()));
|
ret.pushKV("source_network", GetNetworkName(info.source.GetNetClass()));
|
||||||
|
const auto source_mapped_as{connman.GetMappedAS(info.source)};
|
||||||
|
if (source_mapped_as != 0) {
|
||||||
|
ret.pushKV("source_mapped_as", source_mapped_as);
|
||||||
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
UniValue AddrmanTableToJSON(const std::vector<std::pair<AddrInfo, AddressPosition>>& tableInfos)
|
UniValue AddrmanTableToJSON(const std::vector<std::pair<AddrInfo, AddressPosition>>& tableInfos, CConnman& connman)
|
||||||
{
|
{
|
||||||
UniValue table(UniValue::VOBJ);
|
UniValue table(UniValue::VOBJ);
|
||||||
for (const auto& e : tableInfos) {
|
for (const auto& e : tableInfos) {
|
||||||
|
@ -1117,7 +1125,7 @@ UniValue AddrmanTableToJSON(const std::vector<std::pair<AddrInfo, AddressPositio
|
||||||
// Address manager tables have unique entries so there is no advantage
|
// Address manager tables have unique entries so there is no advantage
|
||||||
// in using UniValue::pushKV, which checks if the key already exists
|
// in using UniValue::pushKV, which checks if the key already exists
|
||||||
// in O(N). UniValue::pushKVEnd is used instead which currently is O(1).
|
// in O(N). UniValue::pushKVEnd is used instead which currently is O(1).
|
||||||
table.pushKVEnd(key.str(), AddrmanEntryToJSON(info));
|
table.pushKVEnd(key.str(), AddrmanEntryToJSON(info, connman));
|
||||||
}
|
}
|
||||||
return table;
|
return table;
|
||||||
}
|
}
|
||||||
|
@ -1133,12 +1141,14 @@ static RPCHelpMan getrawaddrman()
|
||||||
{RPCResult::Type::OBJ_DYN, "table", "buckets with addresses in the address manager table ( new, tried )", {
|
{RPCResult::Type::OBJ_DYN, "table", "buckets with addresses in the address manager table ( new, tried )", {
|
||||||
{RPCResult::Type::OBJ, "bucket/position", "the location in the address manager table (<bucket>/<position>)", {
|
{RPCResult::Type::OBJ, "bucket/position", "the location in the address manager table (<bucket>/<position>)", {
|
||||||
{RPCResult::Type::STR, "address", "The address of the node"},
|
{RPCResult::Type::STR, "address", "The address of the node"},
|
||||||
|
{RPCResult::Type::NUM, "mapped_as", /*optional=*/true, "The ASN mapped to the IP of this peer per our current ASMap"},
|
||||||
{RPCResult::Type::NUM, "port", "The port number of the node"},
|
{RPCResult::Type::NUM, "port", "The port number of the node"},
|
||||||
{RPCResult::Type::STR, "network", "The network (" + Join(GetNetworkNames(), ", ") + ") of the address"},
|
{RPCResult::Type::STR, "network", "The network (" + Join(GetNetworkNames(), ", ") + ") of the address"},
|
||||||
{RPCResult::Type::NUM, "services", "The services offered by the node"},
|
{RPCResult::Type::NUM, "services", "The services offered by the node"},
|
||||||
{RPCResult::Type::NUM_TIME, "time", "The " + UNIX_EPOCH_TIME + " when the node was last seen"},
|
{RPCResult::Type::NUM_TIME, "time", "The " + UNIX_EPOCH_TIME + " when the node was last seen"},
|
||||||
{RPCResult::Type::STR, "source", "The address that relayed the address to us"},
|
{RPCResult::Type::STR, "source", "The address that relayed the address to us"},
|
||||||
{RPCResult::Type::STR, "source_network", "The network (" + Join(GetNetworkNames(), ", ") + ") of the source address"},
|
{RPCResult::Type::STR, "source_network", "The network (" + Join(GetNetworkNames(), ", ") + ") of the source address"},
|
||||||
|
{RPCResult::Type::NUM, "source_mapped_as", /*optional=*/true, "The ASN mapped to the IP of this peer's source per our current ASMap"}
|
||||||
}}
|
}}
|
||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
@ -1149,10 +1159,12 @@ static RPCHelpMan getrawaddrman()
|
||||||
},
|
},
|
||||||
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
|
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
|
||||||
AddrMan& addrman = EnsureAnyAddrman(request.context);
|
AddrMan& addrman = EnsureAnyAddrman(request.context);
|
||||||
|
NodeContext& node_context = EnsureAnyNodeContext(request.context);
|
||||||
|
CConnman& connman = EnsureConnman(node_context);
|
||||||
|
|
||||||
UniValue ret(UniValue::VOBJ);
|
UniValue ret(UniValue::VOBJ);
|
||||||
ret.pushKV("new", AddrmanTableToJSON(addrman.GetEntries(false)));
|
ret.pushKV("new", AddrmanTableToJSON(addrman.GetEntries(false), connman));
|
||||||
ret.pushKV("tried", AddrmanTableToJSON(addrman.GetEntries(true)));
|
ret.pushKV("tried", AddrmanTableToJSON(addrman.GetEntries(true), connman));
|
||||||
return ret;
|
return ret;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue