Skip to content

Commit

Permalink
fix(net/peer): remove the duplicated disconnect logic (#9162)
Browse files Browse the repository at this point in the history
Signed-off-by: jsvisa <delweng@gmail.com>
  • Loading branch information
jsvisa authored Jun 28, 2024
1 parent 3bf3b9e commit 9a2cfe5
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions crates/net/network/src/peers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -325,15 +325,6 @@ impl PeersManager {
peer.state = PeerConnectionState::In;

is_trusted = is_trusted || peer.is_trusted();

// if a peer is not trusted and we don't have capacity for more inbound connections,
// disconnecting the peer
if !is_trusted && !has_in_capacity {
self.queued_actions.push_back(PeerAction::Disconnect {
peer_id,
reason: Some(DisconnectReason::TooManyPeers),
});
}
}
Entry::Vacant(entry) => {
// peer is missing in the table, we add it but mark it as to be removed after
Expand All @@ -342,16 +333,16 @@ impl PeersManager {
peer.remove_after_disconnect = true;
entry.insert(peer);
self.queued_actions.push_back(PeerAction::PeerAdded(peer_id));

// disconnect the peer if we don't have capacity for more inbound connections
if !is_trusted && !has_in_capacity {
self.queued_actions.push_back(PeerAction::Disconnect {
peer_id,
reason: Some(DisconnectReason::TooManyPeers),
});
}
}
}

// disconnect the peer if we don't have capacity for more inbound connections
if !is_trusted && !has_in_capacity {
self.queued_actions.push_back(PeerAction::Disconnect {
peer_id,
reason: Some(DisconnectReason::TooManyPeers),
});
}
}

/// Bans the peer temporarily with the configured ban timeout
Expand Down

0 comments on commit 9a2cfe5

Please sign in to comment.