yeyinlaoying/vnt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除udp通道的arc包装

Browse Source
This commit is contained in:
lubeilin
2023-12-30 22:15:48 +08:00
parent cbc4a7378c
commit 858ca9bbe7
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vnt/src/channel/channel.rs
+7 -6
View File
@@ -20,7 +20,7 @@ use crate::handle::CurrentDeviceInfo;
pub struct ContextInner { pub struct ContextInner {
//udp用于打洞、服务端通信(可选) //udp用于打洞、服务端通信(可选)
pub(crate) main_channel: Arc<StdUdpSocket>, pub(crate) main_channel: StdUdpSocket,
//在udp的基础上，可以选择使用tcp和服务端通信 //在udp的基础上，可以选择使用tcp和服务端通信
pub(crate) main_tcp_channel: Option<Mutex<TcpStream>>, pub(crate) main_tcp_channel: Option<Mutex<TcpStream>>,
pub(crate) route_table: RwLock<HashMap<Ipv4Addr, Vec<(Route, AtomicCell<Instant>)>>>, pub(crate) route_table: RwLock<HashMap<Ipv4Addr, Vec<(Route, AtomicCell<Instant>)>>>,
@@ -39,7 +39,7 @@ pub struct Context {
impl Context { impl Context {
pub fn new( pub fn new(
main_channel: Arc<StdUdpSocket>, main_channel: StdUdpSocket,
main_tcp_channel: Option<TcpStream>, main_tcp_channel: Option<TcpStream>,
current_device: Arc<AtomicCell<CurrentDeviceInfo>>, current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
_channel_num: usize, _channel_num: usize,
@@ -484,7 +484,7 @@ impl Channel {
) { ) {
let handler = self.handler.clone(); let handler = self.handler.clone();
let context = self.context; let context = self.context;
let main_channel = context.inner.main_channel.clone(); let main_channel = context.inner.main_channel.try_clone().unwrap();
let buf_sender = if parallel > 1 { let buf_sender = if parallel > 1 {
let (buf_sender, buf_receiver) = buf_channel_group(parallel); let (buf_sender, buf_receiver) = buf_channel_group(parallel);
let mut num = 0; let mut num = 0;
@@ -521,7 +521,7 @@ impl Channel {
{ {
let worker = worker.worker("main_channel_udp"); let worker = worker.worker("main_channel_udp");
let context = context.clone(); let context = context.clone();
let main_channel = main_channel.clone(); let main_channel = main_channel.try_clone().unwrap();
let handler = handler.clone(); let handler = handler.clone();
let buf_sender = buf_sender.clone(); let buf_sender = buf_sender.clone();
thread::Builder::new() thread::Builder::new()
@@ -546,6 +546,7 @@ impl Channel {
} }
let mut cur_status = Status::Cone; let mut cur_status = Status::Cone;
let mut status_receiver = context.inner.status_receiver.clone(); let mut status_receiver = context.inner.status_receiver.clone();
let channel_num = context.inner.channel_num;
loop { loop {
tokio::select! { tokio::select! {
_=worker.stop_wait()=>{ _=worker.stop_wait()=>{
@@ -564,7 +565,7 @@ impl Channel {
continue; continue;
} }
cur_status = Status::Symmetric; cur_status = Status::Symmetric;
for _ in 0..symmetric_channel_num { for _ in 0..symmetric_channel_num - channel_num {
match UdpSocket::bind("0.0.0.0:0").await { match UdpSocket::bind("0.0.0.0:0").await {
Ok(udp) => { Ok(udp) => {
let udp = Arc::new(udp); let udp = Arc::new(udp);
@@ -595,7 +596,7 @@ impl Channel {
worker: VntWorker, worker: VntWorker,
context: Context, context: Context,
id: usize, id: usize,
udp: Arc<StdUdpSocket>, udp: StdUdpSocket,
handler: ChannelDataHandler, handler: ChannelDataHandler,
buf_sender: Option<BufSenderGroup>, buf_sender: Option<BufSenderGroup>,
head_reserve: usize, head_reserve: usize,
vnt/src/core/mod.rs
+1 -1
View File
@@ -242,7 +242,7 @@ impl VntUtil {
(None, None) (None, None)
}; };
let context = Context::new( let context = Context::new(
Arc::new(self.main_channel), self.main_channel,
tcp_sender, tcp_sender,
current_device.clone(), current_device.clone(),
1, 1,