diff --git a/wg-event-gen/src/gen.rs b/wg-event-gen/src/gen.rs index 7b0a9d4..ebf9fdd 100644 --- a/wg-event-gen/src/gen.rs +++ b/wg-event-gen/src/gen.rs @@ -1,15 +1,7 @@ use crate::listener::*; use crate::*; use std::collections::{HashMap, HashSet}; -use std::env; -use std::fmt; -use std::io::prelude::*; -use std::io::{BufRead, BufReader, Error, ErrorKind, Result}; -use std::net::SocketAddr; -use std::os::unix::net::UnixStream; -use std::path::PathBuf; -use std::rc::Rc; -use std::{thread, time}; +use std::time; pub(crate) fn gen_events( state: &HashMap, @@ -115,7 +107,7 @@ mod test { .push(format!("rem {}", peer.public_key)); } - fn roaming<'a>(&self, peer: &'a Peer, previous_addr: SocketAddr) { + fn roaming<'a>(&self, peer: &'a Peer, _previous_addr: SocketAddr) { self.calls .borrow_mut() .push(format!("rom {}", peer.public_key)); @@ -227,7 +219,7 @@ mod test { calls.borrow_mut().clear(); - let mut peer_prev = peer.clone(); + let peer_prev = peer.clone(); peer_cur.last_handshake = Some(time::Duration::from_secs(5)); diff --git a/wg-event-gen/src/listener.rs b/wg-event-gen/src/listener.rs index 8658201..6faa331 100644 --- a/wg-event-gen/src/listener.rs +++ b/wg-event-gen/src/listener.rs @@ -84,7 +84,7 @@ impl ScriptListener { ScriptListener { script } } - fn peer_props<'a>(&self,peer: &'a Peer) -> String { + fn peer_props<'a>(&self, peer: &'a Peer) -> String { format!( "{id} {allowed_ips} {endpoint} {last_handshake} {persistent_keepalive} {traffic}", id = peer.public_key, diff --git a/wg-event-gen/src/main.rs b/wg-event-gen/src/main.rs index 00d5ee4..1ff273d 100644 --- a/wg-event-gen/src/main.rs +++ b/wg-event-gen/src/main.rs @@ -1,8 +1,7 @@ mod gen; mod listener; -use crate::gen::*; -use crate::listener::*; +use listener::*; use base64; use hex; @@ -135,16 +134,6 @@ impl State { pub fn push(&mut self, key: String, value: String) { self.kv_mut().push((key, value)); } - - pub fn delta(&self, other: Self) -> Vec { - let kv = self.kv(); - other - .kv() - .iter() - .filter(|pair| !kv.contains(pair)) - .map(|p| p.clone()) - .collect::>() - } } impl fmt::Display for State { @@ -180,12 +169,12 @@ impl Socket { let value = iter.collect::(); match key.as_ref() { "errno" if value != "0" => { - Err(Error::new( - ErrorKind::Other, - format!("Socket said error: {}", value), - ))?; - break; - }, + Err(Error::new( + ErrorKind::Other, + format!("Socket said error: {}", value), + ))?; + break; + } "public_key" | "private_key" => { state.push(cur); cur = if key == "private_key" {