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

fix ospf route panic (#1304)

Browse Source
This commit is contained in:
Sijie.Sun
2025-08-27 13:22:29 +08:00
committed by GitHub
parent a3806e0190
commit 2145ef40b9
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -575,7 +575,7 @@ impl SyncedRouteInfo {
let need_renew = is_newer let need_renew = is_newer
|| now || now
.duration_since(entry.last_update.unwrap().try_into().unwrap()) .duration_since(entry.last_update.unwrap().try_into().unwrap())
.unwrap() .unwrap_or(Duration::from_secs(0))
> UPDATE_PEER_INFO_PERIOD; > UPDATE_PEER_INFO_PERIOD;
if need_renew { if need_renew {
new_entry.version = std::cmp::max(new_entry.version + 1, now_version); new_entry.version = std::cmp::max(new_entry.version + 1, now_version);
@@ -597,7 +597,11 @@ impl SyncedRouteInfo {
assert!(!item.value().foreign_peer_ids.is_empty()); assert!(!item.value().foreign_peer_ids.is_empty());
self.foreign_network self.foreign_network
.entry(item.key().clone()) .entry(item.key().clone())
.and_modify(|v| panic!("key should not exist, {:?}", v)) .and_modify(|old_entry| {
if item.value().version > old_entry.version {
*old_entry = item.value().clone();
}
})
.or_insert_with(|| { .or_insert_with(|| {
let mut v = item.value().clone(); let mut v = item.value().clone();
v.version = now_version; v.version = now_version;
@@ -1522,6 +1526,9 @@ impl PeerRouteServiceImpl {
) -> Option<RouteForeignNetworkInfos> { ) -> Option<RouteForeignNetworkInfos> {
let mut foreign_networks = RouteForeignNetworkInfos::default(); let mut foreign_networks = RouteForeignNetworkInfos::default();
for item in self.synced_route_info.foreign_network.iter() { for item in self.synced_route_info.foreign_network.iter() {
if item.key().peer_id == session.dst_peer_id {
continue;
}
if session if session
.dst_saved_foreign_network_versions .dst_saved_foreign_network_versions
.get(item.key()) .get(item.key())