diff options
author | fanquake <fanquake@gmail.com> | 2021-08-14 13:14:07 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-08-14 13:33:47 +0800 |
commit | 4c87665707af838e1cc6c3c2e65434cfc826dfec (patch) | |
tree | 67087b52dec9ee1672cddcf5ca22dd6dc479a771 /src/rpc | |
parent | 803ef70fd9f65ef800567ff9456fac525bc3e3c2 (diff) | |
parent | d930c7f5b091687eb4208a5ffe8a2abe311d8054 (diff) |
Merge bitcoin/bitcoin#22604: p2p, rpc, test: address rate-limiting follow-ups
d930c7f5b091687eb4208a5ffe8a2abe311d8054 p2p, rpc, test: address rate-limiting follow-ups (Jon Atack)
Pull request description:
Incorporates review feedback in #22387.
Edit, could be considered separately: should a release note (or two) be added for 22.0? e.g. the new getpeerinfo fields in `Updated RPCs` and the rate-limiting itself in `P2P and network changes`.
ACKs for top commit:
MarcoFalke:
review ACK d930c7f5b091687eb4208a5ffe8a2abe311d8054
theStack:
re-ACK d930c7f5b091687eb4208a5ffe8a2abe311d8054 🌮
Zero-1729:
crACK d930c7f
Tree-SHA512: b2101cad87f59c238603f38bd8e8df7a4d48929794e4de9e0e0ff2afa935a68475c2d369aa669d124a0bec2f50280fb47e8b980bde6ad812db08cf67b71c066a
Diffstat (limited to 'src/rpc')
-rw-r--r-- | src/rpc/net.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index abc9ec3ce3..4d066b8957 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -151,6 +151,8 @@ static RPCHelpMan getpeerinfo() {RPCResult::Type::NUM, "n", "The heights of blocks we're currently asking from this peer"}, }}, {RPCResult::Type::BOOL, "addr_relay_enabled", "Whether we participate in address relay with this peer"}, + {RPCResult::Type::NUM, "addr_processed", "The total number of addresses processed, excluding those dropped due to rate limiting"}, + {RPCResult::Type::NUM, "addr_rate_limited", "The total number of addresses dropped due to rate limiting"}, {RPCResult::Type::ARR, "permissions", "Any special permissions that have been granted to this peer", { {RPCResult::Type::STR, "permission_type", Join(NET_PERMISSIONS_DOC, ",\n") + ".\n"}, |