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

fix: 适配Cidr忽略/32格式路由

Browse Source
This commit is contained in:
FrankHan
2026-05-08 23:24:47 +08:00
parent bf427a5d6f
commit 1d652bac08
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier-contrib/easytier-ohrs/src/kernel_bridge/routing.rs
+14 -4
View File
@@ -4,6 +4,7 @@ use easytier::proto::api::manage::NetworkConfig;
use ipnet::IpNet; use ipnet::IpNet;
use ohos_hilog_binding::hilog_debug; use ohos_hilog_binding::hilog_debug;
use std::collections::HashSet; use std::collections::HashSet;
use std::net::IpAddr;
pub(crate) fn load_manual_routes(config_id: &str) -> Vec<String> { pub(crate) fn load_manual_routes(config_id: &str) -> Vec<String> {
load_config_json(config_id) load_config_json(config_id)
@@ -13,10 +14,19 @@ pub(crate) fn load_manual_routes(config_id: &str) -> Vec<String> {
} }
fn normalize_route_cidr(route: &str) -> Option<String> { fn normalize_route_cidr(route: &str) -> Option<String> {
route.parse::<IpNet>().ok().map(|network| match network { route
IpNet::V4(net) => net.trunc().to_string(), .parse::<IpNet>()
IpNet::V6(net) => net.trunc().to_string(), .ok()
}) .map(|network| match network {
IpNet::V4(net) => net.trunc().to_string(),
IpNet::V6(net) => net.trunc().to_string(),
})
.or_else(|| {
route.parse::<IpAddr>().ok().map(|addr| match addr {
IpAddr::V4(ip) => format!("{}/32", ip),
IpAddr::V6(ip) => format!("{}/128", ip),
})
})
} }
fn simplify_routes(routes: Vec<String>) -> Vec<String> { fn simplify_routes(routes: Vec<String>) -> Vec<String> {