phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-25 18:53:23 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[net processing] Fixup MaybeDiscourageAndDisconnect() style

Browse source 
Based on review comments from Marco Falke and Jon Atack.
This commit is contained in:
John Newbery 2020-07-24 08:03:48 +01:00
parent 40a04814d1
commit 634144a1c2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/net_processing.cpp
View file

@ -3723,32 +3723,32 @@ void ProcessMessage(
*/ */
bool PeerLogicValidation::MaybeDiscourageAndDisconnect(CNode& pnode) bool PeerLogicValidation::MaybeDiscourageAndDisconnect(CNode& pnode)
{ {
NodeId peer_id{pnode.GetId()}; const NodeId peer_id{pnode.GetId()};
{ {
LOCK(cs_main); 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 // There's nothing to do if the m_should_discourage flag isn't set
if (!state.m_should_discourage) return false; if (!state.m_should_discourage) return false;
// Reset m_should_discourage
state.m_should_discourage = false; state.m_should_discourage = false;
} // cs_main } // cs_main
if (pnode.HasPermission(PF_NOBAN)) { 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); LogPrintf("Warning: not punishing noban peer %d!\n", peer_id);
return false; return false;
} }
if (pnode.m_manual_connection) { 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); LogPrintf("Warning: not punishing manually connected peer %d!\n", peer_id);
return false; return false;
} }
if (pnode.addr.IsLocal()) { 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); LogPrintf("Warning: disconnecting but not discouraging local peer %d!\n", peer_id);
pnode.fDisconnect = true; pnode.fDisconnect = true;
return true; return true;