adapt tun device to zerocopy (#57)

This commit is contained in:
Sijie.Sun
2024-04-25 23:25:37 +08:00
committed by GitHub
parent 3467890270
commit 57c9f11371
15 changed files with 405 additions and 150 deletions

View File

@@ -1,5 +1,4 @@
use dashmap::DashSet;
use std::sync::Arc;
use std::sync::{Arc, Mutex};
use tokio::task::JoinSet;
use crate::common::global_ctx::ArcGlobalCtx;
@@ -11,7 +10,7 @@ pub mod udp_proxy;
#[derive(Debug)]
struct CidrSet {
global_ctx: ArcGlobalCtx,
cidr_set: Arc<DashSet<cidr::IpCidr>>,
cidr_set: Arc<Mutex<Vec<cidr::IpCidr>>>,
tasks: JoinSet<()>,
}
@@ -19,7 +18,7 @@ impl CidrSet {
pub fn new(global_ctx: ArcGlobalCtx) -> Self {
let mut ret = Self {
global_ctx,
cidr_set: Arc::new(DashSet::new()),
cidr_set: Arc::new(Mutex::new(vec![])),
tasks: JoinSet::new(),
};
ret.run_cidr_updater();
@@ -35,9 +34,9 @@ impl CidrSet {
let cidrs = global_ctx.get_proxy_cidrs();
if cidrs != last_cidrs {
last_cidrs = cidrs.clone();
cidr_set.clear();
cidr_set.lock().unwrap().clear();
for cidr in cidrs.iter() {
cidr_set.insert(cidr.clone());
cidr_set.lock().unwrap().push(cidr.clone());
}
}
tokio::time::sleep(std::time::Duration::from_secs(1)).await;
@@ -47,10 +46,16 @@ impl CidrSet {
pub fn contains_v4(&self, ip: std::net::Ipv4Addr) -> bool {
let ip = ip.into();
return self.cidr_set.iter().any(|cidr| cidr.contains(&ip));
let s = self.cidr_set.lock().unwrap();
for cidr in s.iter() {
if cidr.contains(&ip) {
return true;
}
}
false
}
pub fn is_empty(&self) -> bool {
return self.cidr_set.is_empty();
self.cidr_set.lock().unwrap().is_empty()
}
}