diff options
| author | John Newbery <[email protected]> | 2020-07-24 08:03:48 +0100 |
|---|---|---|
| committer | John Newbery <[email protected]> | 2020-07-25 15:49:24 +0100 |
| commit | 634144a1c2a3506fd6285e76f3ce0cbb3648cc69 (patch) | |
| tree | 6ab0d71d53aed91c843d2bf11fcdc5d1557681b5 /src/net_processing.cpp | |
| parent | Merge #19472: [net processing] Reduce cs_main scope in MaybeDiscourageAndDisc... (diff) | |
| download | discoin-634144a1c2a3506fd6285e76f3ce0cbb3648cc69.tar.xz discoin-634144a1c2a3506fd6285e76f3ce0cbb3648cc69.zip | |
[net processing] Fixup MaybeDiscourageAndDisconnect() style
Based on review comments from Marco Falke and Jon Atack.
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index f63abca84..b0d6f4f04 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -3723,32 +3723,32 @@ void ProcessMessage( */ bool PeerLogicValidation::MaybeDiscourageAndDisconnect(CNode& pnode) { - NodeId peer_id{pnode.GetId()}; + const NodeId peer_id{pnode.GetId()}; { LOCK(cs_main); - CNodeState &state = *State(peer_id); + CNodeState& state = *State(peer_id); // There's nothing to do if the m_should_discourage flag isn't set if (!state.m_should_discourage) return false; - // Reset m_should_discourage state.m_should_discourage = false; } // cs_main if (pnode.HasPermission(PF_NOBAN)) { - // Peer has the NOBAN permission flag - log but don't disconnect + // We never disconnect or discourage peers for bad behavior if they have the NOBAN permission flag LogPrintf("Warning: not punishing noban peer %d!\n", peer_id); return false; } if (pnode.m_manual_connection) { - // Peer is a manual connection - log but don't disconnect + // We never disconnect or discourage manual peers for bad behavior LogPrintf("Warning: not punishing manually connected peer %d!\n", peer_id); return false; } if (pnode.addr.IsLocal()) { - // Peer is on a local address. Disconnect this peer, but don't discourage the local address + // We disconnect local peers for bad behavior but don't discourage (since that would discourage + // all peers on the same local address) LogPrintf("Warning: disconnecting but not discouraging local peer %d!\n", peer_id); pnode.fDisconnect = true; return true; |