suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-16 06:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

show nodes version correctly

Browse Source
This commit is contained in:
sijie.sun
2024-09-18 22:25:47 +08:00
committed by Sijie.Sun
parent 6d7edcd486
commit 82f5dfd569
9 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
easytier/src/peers/peer_manager.rs
View File

@@ -19,7 +19,10 @@ use tokio::{
use tokio_stream::wrappers::ReceiverStream;
use crate::{
common::{error::Error, global_ctx::ArcGlobalCtx, stun::StunInfoCollectorTrait, PeerId},
common::{
constants::EASYTIER_VERSION, error::Error, global_ctx::ArcGlobalCtx,
stun::StunInfoCollectorTrait, PeerId,
},
peers::{
peer_conn::PeerConn,
peer_rpc::PeerRpcManagerTransport,
@@ -746,7 +749,7 @@ impl PeerManager {
.map(|x| x.to_string())
.collect(),
config: self.global_ctx.config.dump(),
version: env!("CARGO_PKG_VERSION").to_string(),
version: EASYTIER_VERSION.to_string(),
}
}

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

@@ -23,10 +23,12 @@ use tokio::{
};
use crate::{
common::{global_ctx::ArcGlobalCtx, stun::StunInfoCollectorTrait, PeerId},
common::{
constants::EASYTIER_VERSION, global_ctx::ArcGlobalCtx, stun::StunInfoCollectorTrait, PeerId,
},
peers::route_trait::{Route, RouteInterfaceBox},
proto::common::{NatType, StunInfo},
proto::{
common::{NatType, StunInfo},
peer_rpc::{
OspfRouteRpc, OspfRouteRpcClientFactory, OspfRouteRpcServer, PeerIdVersion,
RoutePeerInfo, RoutePeerInfos, SyncRouteInfoError, SyncRouteInfoRequest,
@@ -99,6 +101,7 @@ impl RoutePeerInfo {
udp_stun_info: 0,
last_update: Some(SystemTime::now().into()),
version: 0,
easytier_version: EASYTIER_VERSION.to_string(),
}
}
@@ -122,6 +125,8 @@ impl RoutePeerInfo {
// following fields do not participate in comparison.
last_update: self.last_update,
version: self.version,
easytier_version: EASYTIER_VERSION.to_string(),
};
let need_update_periodically = if let Ok(Ok(d)) =
@@ -162,7 +167,7 @@ impl Into<crate::proto::cli::Route> for RoutePeerInfo {
Some(stun_info)
},
inst_id: self.inst_id.map(|x| x.to_string()).unwrap_or_default(),
version: env!("CARGO_PKG_VERSION").to_string(),
version: self.easytier_version,
}
}
}