diff --git a/src/geoparsers/geoip2.rs b/src/geoparsers/geoip2.rs index 0258b1f..cf607d1 100644 --- a/src/geoparsers/geoip2.rs +++ b/src/geoparsers/geoip2.rs @@ -45,7 +45,7 @@ pub struct GeoIpService { impl GeoIpService { pub fn new(config: Config) -> Result> { - let path = config.geo_files.get(0).unwrap(); + let path = config.geo_files.first().unwrap(); let reader = Reader::open_readfile(path)?; Ok(Self { reader }) } diff --git a/src/geoparsers/geosite.rs b/src/geoparsers/geosite.rs index 4357bdc..2cdea50 100644 --- a/src/geoparsers/geosite.rs +++ b/src/geoparsers/geosite.rs @@ -2,7 +2,7 @@ use crate::geoparsers::v2ray::parsing::decode_geosite_stream; use crate::geoparsers::v2ray::types::{GeoSite, GeoSiteList}; use std::fs; -use std::io::{BufReader, Read}; +use std::io::BufReader; pub struct GeoSiteService { index: GeoSiteList, diff --git a/src/geoparsers/v2ray/types.rs b/src/geoparsers/v2ray/types.rs index d7c0436..b82fbbf 100644 --- a/src/geoparsers/v2ray/types.rs +++ b/src/geoparsers/v2ray/types.rs @@ -33,17 +33,7 @@ pub mod domain { } } /// Type of domain value. - #[derive( - Clone, - Copy, - Debug, - PartialEq, - Eq, - Hash, - PartialOrd, - Ord, - ::prost::Enumeration - )] + #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum Type { /// The value is used as is. diff --git a/src/sniffing/fakedns/resolver.rs b/src/sniffing/fakedns/resolver.rs index ba15380..aa4e70c 100644 --- a/src/sniffing/fakedns/resolver.rs +++ b/src/sniffing/fakedns/resolver.rs @@ -173,7 +173,6 @@ impl FakeIPOptions for FakeIPResolver { Arc::from(server.to_owned()), Some(Arc::from("/dns-query")), ), - _ => unreachable!(), }; let config = ResolverConfig::from_parts(None, vec![], vec![ns]); @@ -212,7 +211,7 @@ impl FakeIPOptions for FakeIPResolver { .unwrap() .lookup_ip(&domain) .await - .map_err(|e| std::io::Error::other(e))?; + .map_err(std::io::Error::other)?; let ip = lookup .into_iter() diff --git a/src/sniffing/fakedns/server.rs b/src/sniffing/fakedns/server.rs index eb1c819..cb1d809 100644 --- a/src/sniffing/fakedns/server.rs +++ b/src/sniffing/fakedns/server.rs @@ -427,10 +427,13 @@ mod tests { client.send_to(&qbytes, addr).await.unwrap(); let mut buf = [0u8; 1024]; - let (amt, _) = tokio::time::timeout(tokio::time::Duration::from_secs(2), client.recv_from(&mut buf)) - .await - .expect("UDP receive timed out") - .expect("UDP receive failed"); + let (amt, _) = tokio::time::timeout( + tokio::time::Duration::from_secs(2), + client.recv_from(&mut buf), + ) + .await + .expect("UDP receive timed out") + .expect("UDP receive failed"); let resp_msg = Message::from_vec(&buf[..amt]).unwrap(); assert_eq!(resp_msg.id, 55); @@ -492,8 +495,7 @@ mod tests { drop(probe); let resolver = Arc::new(RwLock::new(FakeIPResolver::new())); - let server = FakeIPServer::with_shared_resolver(addr, resolver.clone()) - .with_ttl(30); + let server = FakeIPServer::with_shared_resolver(addr, resolver.clone()).with_ttl(30); assert_eq!(server.bind(), addr); assert_eq!(server.ttl(), 30); @@ -514,10 +516,13 @@ mod tests { client_udp.send_to(&qbytes, addr).await.unwrap(); let mut buf = [0u8; 1024]; - let (amt, _) = tokio::time::timeout(tokio::time::Duration::from_secs(2), client_udp.recv_from(&mut buf)) - .await - .expect("UDP timeout") - .expect("UDP recv error"); + let (amt, _) = tokio::time::timeout( + tokio::time::Duration::from_secs(2), + client_udp.recv_from(&mut buf), + ) + .await + .expect("UDP timeout") + .expect("UDP recv error"); let resp_udp = Message::from_vec(&buf[..amt]).unwrap(); assert_eq!(resp_udp.id, 10); assert_eq!(resp_udp.answers.len(), 1); @@ -551,5 +556,3 @@ mod tests { server_task.abort(); } } - - diff --git a/src/sniffing/headers.rs b/src/sniffing/headers.rs index 8dab2c0..9c4fd90 100644 --- a/src/sniffing/headers.rs +++ b/src/sniffing/headers.rs @@ -1,6 +1,5 @@ use crate::sniffing::types::*; use std::fmt; -use tun::Error; // Here we will recieve bytes and try to get their destanation & apply Rules for them. use crate::config::Config; @@ -125,12 +124,7 @@ pub fn sniff_raw_packets(packet: &Packet) -> SniffedPacket { // Internet Header Length (IHL). let ihl = (packet[0] & 0x0F) as usize * 4; let dst_port = Port::from_be_bytes([packet[ihl + 2], packet[ihl + 3]]); - let dns; - if dst_port == 53 { - dns = true; - } else { - dns = false; - }; + let dns = dst_port == 53; let v4 = PacketInfo::V4 { src_ip: ::try_from(&packet[12..16])?, src_port: Port::from_be_bytes([packet[ihl], packet[ihl + 1]]), @@ -162,12 +156,8 @@ pub fn sniff_raw_packets(packet: &Packet) -> SniffedPacket { }); let dst_port = Port::from_be_bytes([packet[42], packet[43]]); - let dns; - if dst_port == 53 { - dns = true; - } else { - dns = false; - }; + + let dns = dst_port == 53; let v6 = PacketInfo::V6 { src_ip, src_port: Port::from_be_bytes([packet[40], packet[41]]), @@ -193,6 +183,6 @@ pub fn sniff_raw_packets(packet: &Packet) -> SniffedPacket { } } -pub fn apply_rules(config: Config, pinfo: PacketInfo) { +pub fn apply_rules(_config: Config, _pinfo: PacketInfo) { todo!() }