fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-17 20:11:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix the ping dialer never closed (#504)

Browse Source 
* Fix the ping dialer never closed

* Fix not ready
This commit is contained in:
Pierre Krieger
2018-09-21 10:06:04 +02:00
committed by GitHub
parent a910797f22
commit a988926c3e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
protocols/ping/src/lib.rs
View File

@ -226,6 +226,14 @@ where TSocket: AsyncRead + AsyncWrite,
type Error = IoError; type Error = IoError;
fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> { fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> {
if self.needs_close {
match self.inner.close() {
Ok(Async::Ready(())) => return Ok(Async::Ready(None)),
Ok(Async::NotReady) => return Ok(Async::NotReady),
Err(err) => return Err(err),
}
}
self.to_notify = Some(task::current()); self.to_notify = Some(task::current());
while let Some((ping, user_data)) = self.pings_to_send.pop_front() { while let Some((ping, user_data)) = self.pings_to_send.pop_front() {
@ -257,7 +265,7 @@ where TSocket: AsyncRead + AsyncWrite,
.expect("Grabbed a valid position just above"); .expect("Grabbed a valid position just above");
return Ok(Async::Ready(Some(user_data))); return Ok(Async::Ready(Some(user_data)));
} else { } else {
debug!("Received pong that doesn't match what we went: {:?}", pong); debug!("Received pong that doesn't match what we sent: {:?}", pong);
} }
}, },
Ok(Async::NotReady) => break, Ok(Async::NotReady) => break,