From 837ef29c15cf9c0f1219085c87557479b09e001b Mon Sep 17 00:00:00 2001
From: lbl <1791778603@qq.com>
Date: Thu, 20 Aug 2026 23:12:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(tun):=20TUN=20=E8=AF=BB=E5=86=99=E4=BB=BB?=
 =?UTF-8?q?=E4=B8=80=E6=96=B9=E5=90=91=E7=BB=93=E6=9D=9F=E5=8D=B3=E6=95=B4?=
 =?UTF-8?q?=E4=BD=93=E9=80=80=E5=87=BA=EF=BC=8C=E6=B6=88=E9=99=A4=E5=8D=8A?=
 =?UTF-8?q?=E5=BC=80=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

此前 in_tun_loop/out_tun_loop 是两个独立任务，任一方向出错后
另一方向继续运行：TUN 处于半开状态，一个方向的流量被静默吞掉，
无恢复也无上报。

修复：两个方向合并为单个任务并用 tokio::select! 组合，任一方向
结束（出错或设备关闭）即取消另一方向并记录日志。DeviceTask
相应合并为单 SubTask。

注：依赖真实 TUN 设备，未做端到端测试；全部既有单测通过。
---
 vnt-core/src/tun/general.rs | 38 ++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/vnt-core/src/tun/general.rs b/vnt-core/src/tun/general.rs
index c4f4c3f..f6a34e2 100644
--- a/vnt-core/src/tun/general.rs
+++ b/vnt-core/src/tun/general.rs
@@ -20,8 +20,7 @@ pub struct DeviceIOManager {
 type DeviceMutex = Arc<tokio::sync::Mutex<(Option<DeviceTask>, Option<(Ipv4Addr, u8)>)>>;
 pub struct DeviceTask {
     device: Arc<AsyncDevice>,
-    task_recv: SubTask,
-    task_send: SubTask,
+    task: SubTask,
 }
 #[derive(Debug, Default)]
 pub struct DeviceConfig {
@@ -69,8 +68,7 @@ impl DeviceIOManager {
     pub async fn stop_task(&self) {
         let mut guard = self.device.lock().await;
         if let Some(dev) = guard.0.take() {
-            dev.task_recv.stop().await;
-            dev.task_send.stop().await;
+            dev.task.stop().await;
         }
     }
     pub async fn start_task(
@@ -158,22 +156,28 @@ fn create(
     let device_framed_read = DeviceFramedRead::new(device.clone(), BytesCodec::new());
     let device_framed_write = DeviceFramedWrite::new(device.clone(), BytesCodec::new());
 
-    let task_recv = task_group.spawn(async move {
-        if let Err(e) = in_tun_loop(receiver, device_framed_write).await {
-            log::error!("in_tun_loop error: {e:?}")
-        }
-    });
-    let task_send = task_group.spawn(async move {
-        if let Err(e) = out_tun_loop(device_framed_read, enhanced_outbound).await {
-            log::error!("out_tun_loop error: {e:?}");
+    // 读写两个方向合并为一个任务：任一方向结束（出错或设备关闭）即
+    // 通过 select! 取消另一方向，避免单侧失败后另一侧继续运行的半开状态
+    let task = task_group.spawn(async move {
+        tokio::select! {
+            rs = in_tun_loop(receiver, device_framed_write) => {
+                if let Err(e) = rs {
+                    log::error!("in_tun_loop error, stopping out_tun_loop: {e:?}");
+                } else {
+                    log::warn!("in_tun_loop exited, stopping out_tun_loop");
+                }
+            }
+            rs = out_tun_loop(device_framed_read, enhanced_outbound) => {
+                if let Err(e) = rs {
+                    log::error!("out_tun_loop error, stopping in_tun_loop: {e:?}");
+                } else {
+                    log::warn!("out_tun_loop exited, stopping in_tun_loop");
+                }
+            }
         }
     });
 
-    DeviceTask {
-        device,
-        task_recv,
-        task_send,
-    }
+    DeviceTask { device, task }
 }
 
 async fn in_tun_loop(