修改对称网络处理逻辑

vnt/src/channel/channel.rs

@@ -523,7 +523,6 @@ impl Channel {
             let context = context.clone();
             let main_channel = main_channel.try_clone().unwrap();
             let handler = handler.clone();
-            let buf_sender = buf_sender.clone();
             thread::Builder::new()
                 .name("channel_udp".into())
                 .spawn(move || {
@@ -570,7 +569,7 @@ impl Channel {
                                             Ok(udp) => {
                                                 let udp = Arc::new(udp);
                                                 let context = context.clone();
-                                                tokio::spawn(Self::start_(worker.worker("symmetric_channel"),context, udp,handler.clone(),buf_sender.clone(), head_reserve, false));
+                                                tokio::spawn(Self::start_(worker.worker("symmetric_channel"),context, udp,handler.clone(), head_reserve));
                                             }
                                             Err(e) => {
                                                 log::error!("{}",e);
@@ -653,9 +652,7 @@ impl Channel {
         context: Context,
         udp: Arc<UdpSocket>,
         handler: ChannelDataHandler,
-        buf_sender: Option<BufSenderGroup>,
         head_reserve: usize,
-        is_core: bool,
     ) {
         let mut status_receiver = context.inner.status_receiver.clone();
         #[cfg(target_os = "windows")]
@@ -668,8 +665,6 @@ impl Channel {
         let id = 3 + udp.as_raw_fd() as usize;
 
         context.insert_udp(id, udp.clone());
-        match buf_sender {
-            None => {
         let mut buf = [0; 4096];
         loop {
             tokio::select! {
@@ -688,10 +683,8 @@ impl Channel {
                             Ok(_) => {
                                 match *status_receiver.borrow() {
                                     Status::Cone => {
-                                                if !is_core{
                                         break;
                                     }
-                                            }
                                     Status::Close=>{
                                         break;
                                     }
@@ -708,52 +701,6 @@ impl Channel {
                 }
             }
         }
-            }
-            Some(mut buf_sender) => loop {
-                let mut buf = vec![0; 4096];
-                tokio::select! {
-                    rs=udp.recv_from(&mut buf[head_reserve..])=>{
-                         match rs {
-                            Ok((len, addr)) => {
-                                if !buf_sender.send((buf,head_reserve,head_reserve+len,RouteKey::new(id, addr))){
-                                     log::error!("udp buf_sender发送数据失败");
-                                     break;
-                                }
-                            }
-                            Err(e) => {
-                                log::error!("{:?}",e)
-                            }
-                        }
-                    }
-                    changed=status_receiver.changed()=>{
-                            match changed {
-                                Ok(_) => {
-                                    match *status_receiver.borrow() {
-                                        Status::Cone => {
-                                            if !is_core{
-                                                break;
-                                            }
-                                        }
-                                        Status::Close=>{
-                                            break;
-                                        }
-                                        Status::Symmetric => {}
-                                    }
-                                }
-                                Err(_) => {
-                                    break;
-                                }
-                            }
-                    }
-                    _=worker.stop_wait()=>{
-                        break;
-                    }
-                }
-            },
-        }
         context.remove_udp(id);
-        if is_core {
-            worker.stop_all();
-        }
     }
 }