diff options
author | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2019-10-23 14:14:08 +0200 |
---|---|---|
committer | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2019-10-23 14:14:08 +0200 |
commit | 3e829c04d1edfde1966a0d3f7f330fadd7ca9cd8 (patch) | |
tree | 5e749f39590eeedf56430c6cacf0a16af0fb2550 /src/platform/dummy | |
parent | Work on pure WireGuard test (diff) | |
download | wireguard-rs-3e829c04d1edfde1966a0d3f7f330fadd7ca9cd8.tar.xz wireguard-rs-3e829c04d1edfde1966a0d3f7f330fadd7ca9cd8.zip |
Fixed Ordering::Acquire -> Ordering::SeqCst typo
Diffstat (limited to 'src/platform/dummy')
-rw-r--r-- | src/platform/dummy/bind.rs | 2 | ||||
-rw-r--r-- | src/platform/dummy/tun.rs | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/platform/dummy/bind.rs b/src/platform/dummy/bind.rs index 5010597..984b886 100644 --- a/src/platform/dummy/bind.rs +++ b/src/platform/dummy/bind.rs @@ -7,7 +7,7 @@ use std::sync::Arc; use std::sync::Mutex; use super::super::bind::*; -use super::super::Endpoint; + use super::UnitEndpoint; pub struct VoidOwner {} diff --git a/src/platform/dummy/tun.rs b/src/platform/dummy/tun.rs index 9fe9480..fb87d2f 100644 --- a/src/platform/dummy/tun.rs +++ b/src/platform/dummy/tun.rs @@ -1,3 +1,4 @@ +use std::cmp::min; use std::error::Error; use std::fmt; use std::sync::atomic::{AtomicUsize, Ordering}; @@ -84,9 +85,10 @@ impl Reader for TunReader { fn read(&self, buf: &mut [u8], offset: usize) -> Result<usize, Self::Error> { match self.rx.recv() { - Ok(m) => { - buf[offset..].copy_from_slice(&m[..]); - Ok(m.len()) + Ok(msg) => { + let n = min(buf.len() - offset, msg.len()); + buf[offset..offset + n].copy_from_slice(&msg[..n]); + Ok(n) } Err(_) => Err(TunError::Disconnected), } |