aramperes/onetun
1
0
Fork 0
mirror of https://github.com/aramperes/onetun.git synced 2025-09-09 12:38:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove some clippy suppressions for udp files

Browse source
This commit is contained in:
Aram 🍐 2022-01-08 15:20:21 -05:00
parent b3776c8b05
commit 953bc18279
3 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tunnel/mod.rs
View file

@ -8,7 +8,6 @@ use crate::tunnel::udp::UdpPortPool;
use crate::wg::WireGuardTunnel; use crate::wg::WireGuardTunnel;
pub mod tcp; pub mod tcp;
#[allow(unused)]
pub mod udp; pub mod udp;
pub async fn port_forward( pub async fn port_forward(

12
src/tunnel/udp.rs
View file

@ -1,22 +1,18 @@
use std::collections::{BTreeMap, HashMap, VecDeque}; use std::collections::{HashMap, VecDeque};
use std::net::{IpAddr, SocketAddr}; use std::net::{IpAddr, SocketAddr};
use std::ops::Range; use std::ops::Range;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc; use std::sync::Arc;
use std::time::Instant; use std::time::Instant;
use crate::events::{Bus, Event}; use crate::events::{Bus, Event};
use anyhow::Context; use anyhow::Context;
use priority_queue::double_priority_queue::DoublePriorityQueue; use priority_queue::double_priority_queue::DoublePriorityQueue;
use priority_queue::priority_queue::PriorityQueue;
use rand::seq::SliceRandom; use rand::seq::SliceRandom;
use rand::thread_rng; use rand::thread_rng;
use tokio::net::UdpSocket; use tokio::net::UdpSocket;
use crate::config::{PortForwardConfig, PortProtocol}; use crate::config::{PortForwardConfig, PortProtocol};
use crate::virtual_iface::udp::UdpVirtualInterface; use crate::virtual_iface::VirtualPort;
use crate::virtual_iface::{VirtualInterfacePoll, VirtualPort};
use crate::wg::WireGuardTunnel;
const MAX_PACKET: usize = 65536; const MAX_PACKET: usize = 65536;
const MIN_PORT: u16 = 1000; const MIN_PORT: u16 = 1000;
@ -210,13 +206,13 @@ impl UdpPortPool {
pub async fn update_last_transmit(&self, port: VirtualPort) { pub async fn update_last_transmit(&self, port: VirtualPort) {
let mut inner = self.inner.write().await; let mut inner = self.inner.write().await;
if let Some(peer) = inner.peer_addr_by_port.get(&port.num()).copied() { if let Some(peer) = inner.peer_addr_by_port.get(&port.num()).copied() {
let mut pq: &mut DoublePriorityQueue<u16, Instant> = inner let pq: &mut DoublePriorityQueue<u16, Instant> = inner
.peer_port_usage .peer_port_usage
.entry(peer.ip()) .entry(peer.ip())
.or_insert_with(Default::default); .or_insert_with(Default::default);
pq.push(port.num(), Instant::now()); pq.push(port.num(), Instant::now());
} }
let mut pq: &mut DoublePriorityQueue<u16, Instant> = &mut inner.port_usage; let pq: &mut DoublePriorityQueue<u16, Instant> = &mut inner.port_usage;
pq.push(port.num(), Instant::now()); pq.push(port.num(), Instant::now());
} }

2
src/virtual_iface/udp.rs
View file

@ -1,5 +1,3 @@
#![allow(dead_code)]
use anyhow::Context; use anyhow::Context;
use std::collections::{HashMap, HashSet, VecDeque}; use std::collections::{HashMap, HashSet, VecDeque};
use std::net::IpAddr; use std::net::IpAddr;