mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-08-06 12:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into tcp-stun

Browse Source
This commit is contained in:
fanyang
2026-06-14 20:06:01 +08:00
committed by GitHub
parent 26afbbebd6 8909e88484
commit e299509944
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/common/config.rs
+8 -3
View File
@@ -602,7 +602,10 @@ impl TomlConfigLoader {
Self::normalize_config_source(&mut config);
config.flags_struct = Some(Self::gen_flags(config.flags.clone().unwrap_or_default()));
config.flags_struct = Some(
Self::gen_flags(config.flags.clone().unwrap_or_default())
.context("failed to parse flags")?,
);
let has_network_identity = config.network_identity.is_some();
let config = TomlConfigLoader {
@@ -642,13 +645,15 @@ impl TomlConfigLoader {
Ok(ret)
}
fn gen_flags(flags_hashmap: serde_json::Map<String, serde_json::Value>) -> Flags {
fn gen_flags(
flags_hashmap: serde_json::Map<String, serde_json::Value>,
) -> serde_json::Result<Flags> {
let mut merged_hashmap = match serde_json::to_value(gen_default_flags()) {
Ok(serde_json::Value::Object(map)) => map,
_ => serde_json::Map::new(),
};
merged_hashmap.extend(flags_hashmap);
serde_json::from_value(serde_json::Value::Object(merged_hashmap)).unwrap()
serde_json::from_value(serde_json::Value::Object(merged_hashmap))
}
}