mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-05-06 17:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix win tun name, clean up custom tun name (#234)

Browse Source
This commit is contained in:
WillisXue
2024-08-08 23:03:41 +08:00
committed by GitHub
parent 232165eff3
commit 7cae63cb17
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/instance/virtual_nic.rs
+8 -7
View File
@@ -243,7 +243,7 @@ pub struct VirtualNic {
ifcfg: Box<dyn IfConfiguerTrait + Send + Sync + 'static>, ifcfg: Box<dyn IfConfiguerTrait + Send + Sync + 'static>,
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
pub fn checkreg() -> io::Result<()> { pub fn checkreg(dev_name:&str) -> io::Result<()> {
use winreg::{enums::HKEY_LOCAL_MACHINE, enums::KEY_ALL_ACCESS, RegKey}; use winreg::{enums::HKEY_LOCAL_MACHINE, enums::KEY_ALL_ACCESS, RegKey};
let hklm = RegKey::predef(HKEY_LOCAL_MACHINE); let hklm = RegKey::predef(HKEY_LOCAL_MACHINE);
let profiles_key = hklm.open_subkey_with_flags( let profiles_key = hklm.open_subkey_with_flags(
@@ -262,7 +262,7 @@ pub fn checkreg() -> io::Result<()> {
// check if ProfileName contains "et" // check if ProfileName contains "et"
match subkey.get_value::<String, _>("ProfileName") { match subkey.get_value::<String, _>("ProfileName") {
Ok(profile_name) => { Ok(profile_name) => {
if profile_name.contains("et_") { if profile_name.contains("et_") || (!dev_name.is_empty() && dev_name == profile_name) {
keys_to_delete.push(subkey_name); keys_to_delete.push(subkey_name);
} }
} }
@@ -280,7 +280,7 @@ pub fn checkreg() -> io::Result<()> {
// check if ProfileName contains "et" // check if ProfileName contains "et"
match subkey.get_value::<String, _>("Description") { match subkey.get_value::<String, _>("Description") {
Ok(profile_name) => { Ok(profile_name) => {
if profile_name.contains("et_") { if profile_name.contains("et_") || (!dev_name.is_empty() && dev_name == profile_name) {
keys_to_delete_unmanaged.push(subkey_name); keys_to_delete_unmanaged.push(subkey_name);
} }
} }
@@ -342,7 +342,9 @@ impl VirtualNic {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
{ {
match checkreg() { let dev_name = self.global_ctx.get_flags().dev_name;
match checkreg(&dev_name) {
Ok(_) => tracing::trace!("delete successful!"), Ok(_) => tracing::trace!("delete successful!"),
Err(e) => tracing::error!("An error occurred: {}", e), Err(e) => tracing::error!("An error occurred: {}", e),
} }
@@ -355,12 +357,11 @@ impl VirtualNic {
.map(char::from) .map(char::from)
.collect::<String>() .collect::<String>()
.to_lowercase(); .to_lowercase();
let dev_name = self.global_ctx.get_flags().dev_name;
if !dev_name.is_empty() { if !dev_name.is_empty() {
config.tun_name(format!("{}", dev_name)); config.tun_name(format!("{}", dev_name));
} else { } else {
config.tun_name(format!("et{}_{}", c, s)); config.tun_name(format!("et_{}_{}", c, s));
} }
config.platform_config(|config| { config.platform_config(|config| {