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

Merge branch 'master' into docs_and_code_fixes

Browse Source
This commit is contained in:
Pierre Krieger 2019-12-12 12:58:26 +01:00 committed by GitHub
commit 550fdce016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@
pub mod handshake; pub mod handshake;
use futures::Poll; use futures::{Async, Poll};
use log::{debug, trace}; use log::{debug, trace};
use snow; use snow;
use snow::error::{StateProblem, Error as SnowError}; use snow::error::{StateProblem, Error as SnowError};
@ -313,7 +313,7 @@ impl<T: io::Write> io::Write for NoiseOutput<T> {
let buffer = self.buffer.borrow_mut(); let buffer = self.buffer.borrow_mut();
loop { loop {
match self.write_state { match self.write_state {
WriteState::Init => return Ok(()), WriteState::Init => return self.io.flush(),
WriteState::BufferData { off } => { WriteState::BufferData { off } => {
trace!("flush: encrypting {} bytes", off); trace!("flush: encrypting {} bytes", off);
if let Ok(n) = self.session.write_message(&buffer.write[.. off], buffer.write_crypto) { if let Ok(n) = self.session.write_message(&buffer.write[.. off], buffer.write_crypto) {
@ -360,7 +360,6 @@ impl<T: io::Write> io::Write for NoiseOutput<T> {
if len == *off { if len == *off {
trace!("flush: finished writing {} bytes", len); trace!("flush: finished writing {} bytes", len);
self.write_state = WriteState::Init; self.write_state = WriteState::Init;
return Ok(())
} }
} }
WriteState::Eof => { WriteState::Eof => {
@ -381,7 +380,11 @@ impl<T: AsyncRead> AsyncRead for NoiseOutput<T> {
impl<T: AsyncWrite> AsyncWrite for NoiseOutput<T> { impl<T: AsyncWrite> AsyncWrite for NoiseOutput<T> {
fn shutdown(&mut self) -> Poll<(), io::Error> { fn shutdown(&mut self) -> Poll<(), io::Error> {
self.io.shutdown() match io::Write::flush(self) {
Ok(_) => self.io.shutdown(),
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => Ok(Async::NotReady),
Err(e) => Err(e),
}
} }
} }