suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-14 13:47:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

↩ revert: 兼容性

Browse Source
This commit is contained in:
m1m1sha
2024-05-08 20:49:33 +08:00
parent 30ccfab288
commit e6ad308cd5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
easytier/src/peers/peer_ospf_route.rs
View File

@@ -68,7 +68,7 @@ struct RoutePeerInfo {
cost: u8, cost: u8,
ipv4_addr: Option<Ipv4Addr>, ipv4_addr: Option<Ipv4Addr>,
proxy_cidrs: Vec<String>, proxy_cidrs: Vec<String>,
hostname: String, hostname: Option<String>,
udp_stun_info: i8, udp_stun_info: i8,
last_update: SystemTime, last_update: SystemTime,
version: Version, version: Version,
@@ -82,7 +82,7 @@ impl RoutePeerInfo {
cost: 0, cost: 0,
ipv4_addr: None, ipv4_addr: None,
proxy_cidrs: Vec::new(), proxy_cidrs: Vec::new(),
hostname: String::new(), hostname: None,
udp_stun_info: 0, udp_stun_info: 0,
last_update: SystemTime::now(), last_update: SystemTime::now(),
version: 0, version: 0,
@@ -101,7 +101,7 @@ impl RoutePeerInfo {
.map(|x| x.to_string()) .map(|x| x.to_string())
.chain(global_ctx.get_vpn_portal_cidr().map(|x| x.to_string())) .chain(global_ctx.get_vpn_portal_cidr().map(|x| x.to_string()))
.collect(), .collect(),
hostname: global_ctx.get_hostname(), hostname: Some(global_ctx.get_hostname()),
udp_stun_info: global_ctx udp_stun_info: global_ctx
.get_stun_info_collector() .get_stun_info_collector()
.get_stun_info() .get_stun_info()
@@ -138,7 +138,7 @@ impl Into<crate::rpc::Route> for RoutePeerInfo {
next_hop_peer_id: 0, next_hop_peer_id: 0,
cost: self.cost as i32, cost: self.cost as i32,
proxy_cidrs: self.proxy_cidrs.clone(), proxy_cidrs: self.proxy_cidrs.clone(),
hostname: self.hostname, hostname: self.hostname.unwrap_or_default(),
stun_info: { stun_info: {
let mut stun_info = StunInfo::default(); let mut stun_info = StunInfo::default();
if let Ok(udp_nat_type) = NatType::try_from(self.udp_stun_info as i32) { if let Ok(udp_nat_type) = NatType::try_from(self.udp_stun_info as i32) {

6
easytier/src/peers/peer_rip_route.rs
View File

@@ -36,7 +36,7 @@ pub struct SyncPeerInfo {
pub cost: u32, pub cost: u32,
pub ipv4_addr: Option<Ipv4Addr>, pub ipv4_addr: Option<Ipv4Addr>,
pub proxy_cidrs: Vec<String>, pub proxy_cidrs: Vec<String>,
pub hostname: String, pub hostname: Option<String>,
pub udp_stun_info: i8, pub udp_stun_info: i8,
} }
@@ -52,7 +52,7 @@ impl SyncPeerInfo {
.map(|x| x.to_string()) .map(|x| x.to_string())
.chain(global_ctx.get_vpn_portal_cidr().map(|x| x.to_string())) .chain(global_ctx.get_vpn_portal_cidr().map(|x| x.to_string()))
.collect(), .collect(),
hostname: global_ctx.get_hostname(), hostname: Some(global_ctx.get_hostname()),
udp_stun_info: global_ctx udp_stun_info: global_ctx
.get_stun_info_collector() .get_stun_info_collector()
.get_stun_info() .get_stun_info()
@@ -585,7 +585,7 @@ impl Route for BasicRoute {
route.next_hop_peer_id = route_info.peer_id; route.next_hop_peer_id = route_info.peer_id;
route.cost = route_info.cost as i32; route.cost = route_info.cost as i32;
route.proxy_cidrs = route_info.proxy_cidrs.clone(); route.proxy_cidrs = route_info.proxy_cidrs.clone();
route.hostname = route_info.hostname.clone(); route.hostname = route_info.hostname.clone().unwrap_or_default();
let mut stun_info = StunInfo::default(); let mut stun_info = StunInfo::default();
if let Ok(udp_nat_type) = NatType::try_from(route_info.udp_stun_info as i32) { if let Ok(udp_nat_type) = NatType::try_from(route_info.udp_stun_info as i32) {