shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 04:53:44 +08:00
Code Packages Projects Releases Activity

fix: fixer #2158

Browse Source
This commit is contained in:
huzibaca 2024-11-27 05:47:08 +08:00
parent e25d71c6c8
commit 94d22ecfc3
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src-tauri/src/enhance/mod.rs
View File

@ -60,6 +60,7 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
global_merge, global_merge,
global_script, global_script,
profile_name, profile_name,
dns_enhanced_mode,
) = { ) = {
let profiles = Config::profiles(); let profiles = Config::profiles();
let profiles = profiles.latest(); let profiles = profiles.latest();
@ -130,6 +131,13 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
.and_then(|item| item.name.clone()) .and_then(|item| item.name.clone())
.unwrap_or_default(); .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, current,
merge, merge,
@ -140,6 +148,7 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
global_merge, global_merge,
global_script, global_script,
name, name,
dns_enhanced_mode,
) )
}; };
@ -259,7 +268,7 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
}); });
} }
config = use_tun(config, enable_tun).await; config = use_tun(config, enable_tun, dns_enhanced_mode).await;
config = use_sort(config); config = use_sort(config);
let mut exists_set = HashSet::new(); let mut exists_set = HashSet::new();

4
src-tauri/src/enhance/tun.rs
View File

@ -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_key = Value::from("tun");
let tun_val = config.get(&tun_key); let tun_val = config.get(&tun_key);
let mut tun_val = tun_val.map_or(Mapping::new(), |val| { 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; crate::utils::resolve::set_public_dns("8.8.8.8".to_string()).await;
} }
} else { } else {
revise!(dns_val, "enhanced-mode", "redir-host"); revise!(dns_val, "enhanced-mode", origin_enhanced_mode.as_str());
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
crate::utils::resolve::restore_public_dns().await; crate::utils::resolve::restore_public_dns().await;
} }