fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-26 16:21:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix noise/io.rs not flushing the underlying stream

Browse Source
This commit is contained in:
Pierre Krieger
2019-12-11 17:01:31 +01:00
parent 7e9175716e
commit 3f1cbaa3a8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
protocols/noise/src/io.rs
View File

@ -353,7 +353,7 @@ impl<T: AsyncWrite + Unpin> AsyncWrite for NoiseOutput<T> {
loop { loop {
match this.write_state { match this.write_state {
WriteState::Init => return Poll::Ready(Ok(())), WriteState::Init => return Pin::new(&mut this.io).poll_flush(cx),
WriteState::BufferData { off } => { WriteState::BufferData { off } => {
trace!("flush: encrypting {} bytes", off); trace!("flush: encrypting {} bytes", off);
match this.session.write_message(&buffer.write[.. off], buffer.write_crypto) { match this.session.write_message(&buffer.write[.. off], buffer.write_crypto) {
@ -409,7 +409,6 @@ impl<T: AsyncWrite + Unpin> AsyncWrite for NoiseOutput<T> {
if len == *off { if len == *off {
trace!("flush: finished writing {} bytes", len); trace!("flush: finished writing {} bytes", len);
this.write_state = WriteState::Init; this.write_state = WriteState::Init;
return Poll::Ready(Ok(()))
} }
} }
WriteState::Eof => { WriteState::Eof => {
@ -425,6 +424,7 @@ impl<T: AsyncWrite + Unpin> AsyncWrite for NoiseOutput<T> {
mut self: Pin<&mut Self>, mut self: Pin<&mut Self>,
cx: &mut Context<'_>, cx: &mut Context<'_>,
) -> Poll<Result<(), std::io::Error>>{ ) -> Poll<Result<(), std::io::Error>>{
ready!(Pin::new(&mut *self).poll_flush(cx))?;
Pin::new(&mut self.io).poll_close(cx) Pin::new(&mut self.io).poll_close(cx)
} }