aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake McGinty <me@jake.su>2018-06-01 15:16:18 -0500
committerJake McGinty <me@jake.su>2018-06-03 12:02:38 -0500
commit13d28ffadbb274932fb3e499ce8210edf8da65e7 (patch)
tree6bba19d76247373a54d8a41e17d086b4818d7162
parenttests: add convenient iperf test script (diff)
downloadwireguard-rs-13d28ffadbb274932fb3e499ce8210edf8da65e7.tar.xz
wireguard-rs-13d28ffadbb274932fb3e499ce8210edf8da65e7.zip
use snow with 'async' mode
-rw-r--r--src/peer.rs7
1 files 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<Session, Error> {
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()