fix: enable_tun block the process (#232)

libnyanpasu · Jan 4, 2024 · de1c4a0 · de1c4a0
1 parent eacfcf3
commit de1c4a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/backend/tauri/src/core/core.rs b/backend/tauri/src/core/core.rs
@@ -112,21 +112,13 @@ impl CoreManager {
             if enable_tun {
                 log::debug!(target: "app", "try to set system dns");
 
-                match (|| async {
-                    let tun_device_ip = Config::clash().clone().latest().get_tun_device_ip();
-                    // 执行 networksetup -setdnsservers Wi-Fi $tun_device_ip
-                    Command::new("networksetup")
-                        .args(["-setdnsservers", "Wi-Fi", tun_device_ip.as_str()])
-                        .output()
-                })()
-                .await
-                {
-                    Ok(_) => return Ok(()),
-                    Err(err) => {
-                        // 修改这个值，免得stop出错
-                        log::error!(target: "app", "{err}");
-                    }
-                }
+                let tun_device_ip = Config::clash().clone().latest().get_tun_device_ip();
+                // 执行 networksetup -setdnsservers Wi-Fi $tun_device_ip
+                let (mut rx, _) = Command::new("networksetup")
+                    .args(["-setdnsservers", "Wi-Fi", tun_device_ip.as_str()])
+                    .spawn()?;
+                let event = rx.recv().await;
+                log::debug!(target: "app", "{event:?}");
             }
         }
         #[cfg(target_os = "windows")]

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.74.1"