From a6c847bb455ef5ae37031f166d1830ef20e00378 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Fri, 1 Jun 2018 15:16:18 -0500 Subject: use snow with 'async' mode --- src/peer.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/peer.rs b/src/peer.rs index 798d61a..c02a4b8 100644 --- a/src/peer.rs +++ b/src/peer.rs @@ -93,7 +93,7 @@ impl Session { pub fn into_transport_mode(self) -> Result { Ok(Session { - noise : self.noise.into_transport_mode()?, + noise : self.noise.into_async_transport_mode()?, our_index : self.our_index, their_index : self.their_index, anti_replay : self.anti_replay, @@ -344,10 +344,9 @@ impl Peer { ensure!(session.birthday.elapsed() < *REJECT_AFTER_TIME, "exceeded REJECT-AFTER-TIME"); session.anti_replay.update(nonce)?; - let mut transport = session.noise.get_transport_state()?.clone(); - transport.set_receiving_nonce(nonce); + let mut transport = session.noise.get_async_transport_state()?.clone(); Ok(Box::new(future::lazy(move || { - let len = transport.read_transport_message(packet.payload(), &mut raw_packet).unwrap(); + let len = transport.read_transport_message(nonce, packet.payload(), &mut raw_packet).unwrap(); if len > 0 { let len = IpPacket::new(&raw_packet[..len]) .ok_or_else(||format_err!("invalid IP packet (len {})", len)).unwrap() -- cgit v1.2.3-59-g8ed1b