github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-29 17:18:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(net): poll after starting disconnect (#522)

Browse Source
This commit is contained in:
Matthias Seitz
2022-12-19 18:03:36 +01:00
committed by GitHub
parent aac078a132
commit e713b0c015
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/net/network/src/session/active.rs
View File

@@ -294,6 +294,16 @@ impl ActiveSession {
self.conn.inner_mut().start_disconnect(reason);
}
/// Flushes the disconnect message and emits the corresponding message
fn poll_disconnect(&mut self, cx: &mut Context<'_>) -> Poll<()> {
debug_assert!(self.is_disconnecting(), "not disconnecting");
// try to close the flush out the remaining Disconnect message
let _ = ready!(self.conn.poll_close_unpin(cx));
self.emit_disconnect();
Poll::Ready(())
}
/// Removes all timed out requests
fn evict_timed_out_requests(&mut self, now: Instant) {
let mut timedout = Vec::new();
@@ -317,10 +327,7 @@ impl Future for ActiveSession {
let this = self.get_mut();
if this.is_disconnecting() {
// try to close the flush out the remaining Disconnect message
let _ = ready!(this.conn.poll_close_unpin(cx));
this.emit_disconnect();
return Poll::Ready(())
return this.poll_disconnect(cx)
}
loop {
@@ -342,6 +349,7 @@ impl Future for ActiveSession {
let reason =
reason.unwrap_or(DisconnectReason::DisconnectRequested);
this.start_disconnect(reason);
return this.poll_disconnect(cx)
}
SessionCommand::Message(msg) => {
this.on_peer_message(msg);