diff options
| author | Gregory Maxwell <greg@xiph.org> | 2016-12-11 20:26:06 +0000 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2017-01-05 19:02:15 +0000 |
| commit | 032ba3f0665432bd15ff76ee01cde245ad29e3e6 (patch) | |
| tree | 40de7c5b7d216b82f3d6a7dea9cf59528c164d72 | |
| parent | 90f13e18228fde2e62de1c7d9b4b7e12a703bf03 (diff) | |
| download | bitcoin-032ba3f0665432bd15ff76ee01cde245ad29e3e6.tar.xz | |
RPC help documentation for addnode peerinfo.
Also adds a comment about the netgroup exclusion behavior.
| -rw-r--r-- | src/net.cpp | 5 | ||||
| -rw-r--r-- | src/rpc/net.cpp | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/net.cpp b/src/net.cpp index 6640cc0016..0f0a7bf8dc 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1633,6 +1633,11 @@ void CConnman::ThreadOpenConnections() LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) { if (!pnode->fInbound && !pnode->fAddnode) { + // Netgroups for inbound and addnode peers are not excluded because our goal here + // is to not use multiple of our limited outbound slots on a single netgroup + // but inbound and addnode peers do not use our outbound slots. Inbound peers + // also have the added issue that they're attacker controlled and could be used + // to prevent us from connecting to particular hosts if we used them here. setConnected.insert(pnode->addr.GetGroup()); nOutbound++; } diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index fe59579593..2af00c1de9 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -92,6 +92,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request) " \"version\": v, (numeric) The peer version, such as 7001\n" " \"subver\": \"/Satoshi:0.8.5/\", (string) The string version\n" " \"inbound\": true|false, (boolean) Inbound (true) or Outbound (false)\n" + " \"addnode\": true|false, (boolean) Whether connection was due to addnode and is using an addnode slot\n" " \"startingheight\": n, (numeric) The starting height (block) of the peer\n" " \"banscore\": n, (numeric) The ban score\n" " \"synced_headers\": n, (numeric) The last header we have in common with this peer\n" |