修改线程名称

vnt/src/channel/tcp_channel.rs

@@ -49,7 +49,7 @@ where
     };
 
     thread::Builder::new()
-        .name("tcp读事件处理线程".into())
+        .name("tcpRead".into())
         .spawn(move || {
             if let Err(e) = tcp_listen0(
                 poll,
@@ -173,7 +173,7 @@ fn init_writable_handler(
     {
         let writable_notify = writable_notify.clone();
         thread::Builder::new()
-            .name("tcp-writeable-listen".into())
+            .name("tcpWriteableListen".into())
             .spawn(move || {
                 if let Err(e) = tcp_writable_listen(receiver, poll, writable_notify, &context) {
                     log::error!("{:?}", e);

vnt/src/channel/udp_channel.rs

@@ -49,7 +49,7 @@ where
     };
     let accept = AcceptSocketSender::new(waker.clone(), udp_sender);
     thread::Builder::new()
-        .name("sub_udp读事件处理线程".into())
+        .name("subUdp".into())
         .spawn(move || {
             if let Err(e) = sub_udp_listen0(poll, recv_handler, context, waker, udp_receiver) {
                 log::error!("{:?}", e);
@@ -153,7 +153,7 @@ where
         }
     })?;
     thread::Builder::new()
-        .name("main_udp".into())
+        .name("mainUdp".into())
         .spawn(move || {
             if let Err(e) = main_udp_listen0(poll, recv_handler, context) {
                 log::error!("{:?}", e);

vnt/src/handle/maintain/re_nat_type.rs

@@ -25,21 +25,24 @@ fn retrieve_nat_type0(
     nat_test: NatTest,
     udp_socket_sender: AcceptSocketSender<Option<Vec<mio::net::UdpSocket>>>,
 ) {
-    thread::spawn(move || {
+    thread::Builder::new()
-        if nat_test.can_update() {
+        .name("natTest".into())
-            let local_ipv4 = nat::local_ipv4();
+        .spawn(move || {
-            let local_ipv6 = nat::local_ipv6();
+            if nat_test.can_update() {
-            match nat_test.re_test(local_ipv4, local_ipv6) {
+                let local_ipv4 = nat::local_ipv4();
-                Ok(nat_info) => {
+                let local_ipv6 = nat::local_ipv6();
-                    log::info!("当前nat信息:{:?}", nat_info);
+                match nat_test.re_test(local_ipv4, local_ipv6) {
-                    if let Err(e) = context.switch(nat_info.nat_type, &udp_socket_sender) {
+                    Ok(nat_info) => {
-                        log::warn!("{:?}", e);
+                        log::info!("当前nat信息:{:?}", nat_info);
+                        if let Err(e) = context.switch(nat_info.nat_type, &udp_socket_sender) {
+                            log::warn!("{:?}", e);
+                        }
                     }
-                }
+                    Err(e) => {
-                Err(e) => {
+                        log::warn!("nat re_test {:?}", e);
-                    log::warn!("nat re_test {:?}", e);
+                    }
-                }
+                };
-            };
+            }
-        }
+        })
-    });
+        .expect("natTest");
 }

vnt/src/handle/tun_tap/tun_handler.rs

@@ -111,7 +111,7 @@ pub fn start(
             let client_cipher = client_cipher.clone();
             let server_cipher = server_cipher.clone();
             thread::Builder::new()
-                .name(format!("tun_handler_{}", index))
+                .name(format!("tunHandler-{}", index))
                 .spawn(move || {
                     while let Ok((mut buf, len)) = receiver.recv() {
                         #[cfg(not(target_os = "macos"))]
@@ -139,7 +139,7 @@ pub fn start(
                 })?;
         }
         thread::Builder::new()
-            .name("tun_handler".into())
+            .name("tunHandlerM".into())
             .spawn(move || {
                 if let Err(e) = start_multi(stop_manager, device, sender, &mut up_counter) {
                     log::warn!("stop:{}", e);
@@ -148,7 +148,7 @@ pub fn start(
             })?;
     } else {
         thread::Builder::new()
-            .name("tun_handler".into())
+            .name("tunHandlerS".into())
             .spawn(move || {
                 if let Err(e) = start_simple(
                     stop_manager,

vnt/src/ip_proxy/icmp_proxy.rs

@@ -47,18 +47,21 @@ impl IcmpProxy {
             Arc::new(Mutex::new(HashMap::with_capacity(16)));
         {
             let nat_map = nat_map.clone();
-            thread::spawn(move || {
+            thread::Builder::new()
-                if let Err(e) = icmp_proxy(
+                .name("icmpProxy".into())
-                    mio_icmp_socket,
+                .spawn(move || {
-                    nat_map,
+                    if let Err(e) = icmp_proxy(
-                    context,
+                        mio_icmp_socket,
-                    stop_manager,
+                        nat_map,
-                    current_device,
+                        context,
-                    client_cipher,
+                        stop_manager,
-                ) {
+                        current_device,
-                    log::warn!("icmp_proxy:{:?}", e);
+                        client_cipher,
-                }
+                    ) {
-            });
+                        log::warn!("icmp_proxy:{:?}", e);
+                    }
+                })
+                .expect("icmpProxy");
         }
         Ok(Self {
             icmp_socket: Arc::new(std_socket),

vnt/src/ip_proxy/tcp_proxy.rs

@@ -38,11 +38,14 @@ impl TcpProxy {
         let port = tcp_listener.local_addr()?.port();
         {
             let nat_map = nat_map.clone();
-            thread::spawn(move || {
+            thread::Builder::new()
-                if let Err(e) = tcp_proxy(tcp_listener, nat_map, stop_manager) {
+                .name("tcpProxy".into())
-                    log::warn!("tcp_proxy:{:?}", e);
+                .spawn(move || {
-                }
+                    if let Err(e) = tcp_proxy(tcp_listener, nat_map, stop_manager) {
-            });
+                        log::warn!("tcp_proxy:{:?}", e);
+                    }
+                })
+                .expect("tcpProxy");
         }
         Ok(Self { port, nat_map })
     }

vnt/src/ip_proxy/udp_proxy.rs

@@ -40,11 +40,14 @@ impl UdpProxy {
         let port = udp.local_addr()?.port();
         {
             let nat_map = nat_map.clone();
-            thread::spawn(move || {
+            thread::Builder::new()
-                if let Err(e) = udp_proxy(udp, nat_map, scheduler, stop_manager) {
+                .name("udpProxy".into())
-                    log::warn!("udp_proxy:{:?}", e);
+                .spawn(move || {
-                }
+                    if let Err(e) = udp_proxy(udp, nat_map, scheduler, stop_manager) {
-            });
+                        log::warn!("udp_proxy:{:?}", e);
+                    }
+                })
+                .expect("udpProxy");
         }
         Ok(Self { port, nat_map })
     }

vnt/src/util/scheduler.rs

@@ -52,7 +52,7 @@ impl Scheduler {
                 run(receiver, s_inner);
                 worker.stop_all();
             })
-            .unwrap();
+            .expect("Scheduler");
         Ok(s)
     }
     pub fn timeout<F>(&self, time: Duration, f: F) -> bool