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

🐞 fix: hostname empty

Browse Source
This commit is contained in:
m1m1sha
2024-05-08 16:18:09 +08:00
parent bde5b7f6ea
commit 30ccfab288
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/common/config.rs
+13 -8
View File
@@ -226,17 +226,22 @@ impl ConfigLoader for TomlConfigLoader {
match hostname { match hostname {
Some(hostname) => { Some(hostname) => {
let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap(); if !hostname.is_empty() {
let mut name = re.replace_all(&hostname, "").to_string(); let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap();
let mut name = re.replace_all(&hostname, "").to_string();
if name.len() > 32 { if name.len() > 32 {
name = name.chars().take(32).collect::<String>(); name = name.chars().take(32).collect::<String>();
} }
if hostname != name { if hostname != name {
self.set_hostname(Some(name.clone())); self.set_hostname(Some(name.clone()));
}
name
} else {
self.set_hostname(None);
gethostname::gethostname().to_string_lossy().to_string()
} }
name
} }
None => gethostname::gethostname().to_string_lossy().to_string(), None => gethostname::gethostname().to_string_lossy().to_string(),
} }