From 953bc182791148745ba58a49eeca9c46934060be Mon Sep 17 00:00:00 2001 From: Aram Peres Date: Sat, 8 Jan 2022 15:20:21 -0500 Subject: [PATCH] Remove some clippy suppressions for udp files --- src/tunnel/mod.rs | 1 - src/tunnel/udp.rs | 12 ++++-------- src/virtual_iface/udp.rs | 2 -- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/tunnel/mod.rs b/src/tunnel/mod.rs index 1676d7a..eadf8b0 100644 --- a/src/tunnel/mod.rs +++ b/src/tunnel/mod.rs @@ -8,7 +8,6 @@ use crate::tunnel::udp::UdpPortPool; use crate::wg::WireGuardTunnel; pub mod tcp; -#[allow(unused)] pub mod udp; pub async fn port_forward( diff --git a/src/tunnel/udp.rs b/src/tunnel/udp.rs index d9bd43d..76005a9 100644 --- a/src/tunnel/udp.rs +++ b/src/tunnel/udp.rs @@ -1,22 +1,18 @@ -use std::collections::{BTreeMap, HashMap, VecDeque}; +use std::collections::{HashMap, VecDeque}; use std::net::{IpAddr, SocketAddr}; use std::ops::Range; -use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use std::time::Instant; use crate::events::{Bus, Event}; use anyhow::Context; use priority_queue::double_priority_queue::DoublePriorityQueue; -use priority_queue::priority_queue::PriorityQueue; use rand::seq::SliceRandom; use rand::thread_rng; use tokio::net::UdpSocket; use crate::config::{PortForwardConfig, PortProtocol}; -use crate::virtual_iface::udp::UdpVirtualInterface; -use crate::virtual_iface::{VirtualInterfacePoll, VirtualPort}; -use crate::wg::WireGuardTunnel; +use crate::virtual_iface::VirtualPort; const MAX_PACKET: usize = 65536; const MIN_PORT: u16 = 1000; @@ -210,13 +206,13 @@ impl UdpPortPool { pub async fn update_last_transmit(&self, port: VirtualPort) { let mut inner = self.inner.write().await; if let Some(peer) = inner.peer_addr_by_port.get(&port.num()).copied() { - let mut pq: &mut DoublePriorityQueue = inner + let pq: &mut DoublePriorityQueue = inner .peer_port_usage .entry(peer.ip()) .or_insert_with(Default::default); pq.push(port.num(), Instant::now()); } - let mut pq: &mut DoublePriorityQueue = &mut inner.port_usage; + let pq: &mut DoublePriorityQueue = &mut inner.port_usage; pq.push(port.num(), Instant::now()); } diff --git a/src/virtual_iface/udp.rs b/src/virtual_iface/udp.rs index f1725e7..68de77a 100644 --- a/src/virtual_iface/udp.rs +++ b/src/virtual_iface/udp.rs @@ -1,5 +1,3 @@ -#![allow(dead_code)] - use anyhow::Context; use std::collections::{HashMap, HashSet, VecDeque}; use std::net::IpAddr;