diff --git a/src-tauri/src/enhance/mod.rs b/src-tauri/src/enhance/mod.rs index 11355e87..2beebae5 100644 --- a/src-tauri/src/enhance/mod.rs +++ b/src-tauri/src/enhance/mod.rs @@ -60,6 +60,7 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) { global_merge, global_script, profile_name, + dns_enhanced_mode, ) = { let profiles = Config::profiles(); let profiles = profiles.latest(); @@ -130,6 +131,13 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) { .and_then(|item| item.name.clone()) .unwrap_or_default(); + let dns_enhanced_mode = current + .get("dns") + .and_then(|val| val.get("enhanced-mode")) + .and_then(|val| val.as_str()) + .unwrap_or("redir-host") + .to_string(); + ( current, merge, @@ -140,6 +148,7 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) { global_merge, global_script, name, + dns_enhanced_mode, ) }; @@ -259,7 +268,7 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) { }); } - config = use_tun(config, enable_tun).await; + config = use_tun(config, enable_tun, dns_enhanced_mode).await; config = use_sort(config); let mut exists_set = HashSet::new(); diff --git a/src-tauri/src/enhance/tun.rs b/src-tauri/src/enhance/tun.rs index cc012acf..87e71252 100644 --- a/src-tauri/src/enhance/tun.rs +++ b/src-tauri/src/enhance/tun.rs @@ -18,7 +18,7 @@ macro_rules! append { }; } -pub async fn use_tun(mut config: Mapping, enable: bool) -> Mapping { +pub async fn use_tun(mut config: Mapping, enable: bool, origin_enhanced_mode: String) -> Mapping { let tun_key = Value::from("tun"); let tun_val = config.get(&tun_key); let mut tun_val = tun_val.map_or(Mapping::new(), |val| { @@ -41,7 +41,7 @@ pub async fn use_tun(mut config: Mapping, enable: bool) -> Mapping { crate::utils::resolve::set_public_dns("8.8.8.8".to_string()).await; } } else { - revise!(dns_val, "enhanced-mode", "redir-host"); + revise!(dns_val, "enhanced-mode", origin_enhanced_mode.as_str()); #[cfg(target_os = "macos")] crate::utils::resolve::restore_public_dns().await; }