diff options
author | Jake McGinty <me@jake.su> | 2018-02-14 15:36:02 +0000 |
---|---|---|
committer | Jake McGinty <me@jake.su> | 2018-02-14 15:36:02 +0000 |
commit | 956492a28c975d73113bdac0547cea46bc504f4b (patch) | |
tree | 377050c39f197408df9cc107cf1dad288ce2e141 /src/router.rs | |
parent | clear unused imports (diff) | |
download | wireguard-rs-956492a28c975d73113bdac0547cea46bc504f4b.tar.xz wireguard-rs-956492a28c975d73113bdac0547cea46bc504f4b.zip |
clippy knows all
Diffstat (limited to 'src/router.rs')
-rw-r--r-- | src/router.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/router.rs b/src/router.rs index 252a653..dc6443e 100644 --- a/src/router.rs +++ b/src/router.rs @@ -1,4 +1,4 @@ -use failure::Error; +use failure::{Error, err_msg}; use interface::SharedPeer; use treebitmap::{IpLookupTable, IpLookupTableOps}; use std::net::{Ipv4Addr, Ipv6Addr, IpAddr}; @@ -18,7 +18,7 @@ impl Router { } } - pub fn add_allowed_ips(&mut self, allowed_ips: &[(IpAddr, u32)], peer: SharedPeer) { + pub fn add_allowed_ips(&mut self, allowed_ips: &[(IpAddr, u32)], peer: &SharedPeer) { for &(ip_addr, mask) in allowed_ips { self.add_allowed_ip(ip_addr, mask, peer.clone()); } @@ -39,17 +39,17 @@ impl Router { } pub fn route_to_peer(&self, packet: &[u8]) -> Option<SharedPeer> { - match IpPacket::new(&packet) { + match IpPacket::new(packet) { Some(packet) => self.get_peer_from_ip(packet.get_destination()), _ => None } } pub fn validate_source(&self, packet: &[u8], peer: &SharedPeer) -> Result<(), Error> { - let routed_peer = match IpPacket::new(&packet) { + let routed_peer = match IpPacket::new(packet) { Some(packet) => self.get_peer_from_ip(packet.get_source()), _ => None - }.ok_or_else(|| format_err!("no peer found on route"))?; + }.ok_or_else(|| err_msg("no peer found on route"))?; ensure!(&routed_peer == peer, "peer mismatch"); Ok(()) |