cerc-io/lighthouse
15
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Ensure disconnecting peers are added to the peerdb (#2451)

Browse Source
This commit is contained in:
Age Manning 2021-07-14 12:59:24 +10:00
parent 059d9ec1b1
commit 381befbf82
No known key found for this signature in database
GPG Key ID: 05EED64B79E06A93
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_node/eth2_libp2p/src/peer_manager/mod.rs
View File

@ -319,7 +319,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
self.network_globals self.network_globals
.peers .peers
.write() .write()
.notify_disconnecting(&peer_id, true); .notify_disconnecting(peer_id, true);
return; return;
} }
@ -339,7 +339,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
self.network_globals self.network_globals
.peers .peers
.write() .write()
.notify_disconnecting(&peer_id, false); .notify_disconnecting(peer_id, false);
return; return;
} }
@ -1023,7 +1023,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
let mut peer_db = self.network_globals.peers.write(); let mut peer_db = self.network_globals.peers.write();
for peer_id in disconnecting_peers { for peer_id in disconnecting_peers {
peer_db.notify_disconnecting(&peer_id, false); peer_db.notify_disconnecting(peer_id, false);
self.events.push(PeerManagerEvent::DisconnectPeer( self.events.push(PeerManagerEvent::DisconnectPeer(
peer_id, peer_id,
GoodbyeReason::TooManyPeers, GoodbyeReason::TooManyPeers,

9
beacon_node/eth2_libp2p/src/peer_manager/peerdb.rs
View File

@ -475,10 +475,11 @@ impl<TSpec: EthSpec> PeerDB<TSpec> {
/// Notifies the peer manager that the peer is undergoing a normal disconnect. Optionally tag /// Notifies the peer manager that the peer is undergoing a normal disconnect. Optionally tag
/// the peer to be banned after the disconnect. /// the peer to be banned after the disconnect.
pub fn notify_disconnecting(&mut self, peer_id: &PeerId, to_ban_afterwards: bool) { pub fn notify_disconnecting(&mut self, peer_id: PeerId, to_ban_afterwards: bool) {
if let Some(info) = self.peers.get_mut(peer_id) { self.peers
info.disconnecting(to_ban_afterwards); .entry(peer_id)
} .or_default()
.disconnecting(to_ban_afterwards);
} }
/// Marks a peer to be disconnected and then banned. /// Marks a peer to be disconnected and then banned.