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

ensure dst have session when we are initiator (#398)

Browse Source 
* ensure dst have session when we are initiator

* bump version to 2.0.1
This commit is contained in:
Sijie.Sun
2024-10-08 21:05:46 +08:00
committed by GitHub
parent a08a8e7f4c
commit 1be64223c8
7 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ use std::{
atomic::{AtomicBool, AtomicU32, Ordering},
Arc, Weak,
},
time::{Duration, SystemTime},
time::{Duration, Instant, SystemTime},
};
use crossbeam::atomic::AtomicCell;
@@ -1290,6 +1290,7 @@ impl PeerRouteServiceImpl {
&self,
dst_peer_id: PeerId,
peer_rpc: Arc<PeerRpcManager>,
sync_as_initiator: bool,
) -> bool {
let Some(session) = self.get_session(dst_peer_id) else {
// if session not exist, exit the sync loop.
@@ -1306,6 +1307,7 @@ impl PeerRouteServiceImpl {
&& conn_bitmap.is_none()
&& foreign_network.is_none()
&& !session.need_sync_initiator_info.load(Ordering::Relaxed)
&& !(sync_as_initiator && session.we_are_initiator.load(Ordering::Relaxed))
{
return true;
}
@@ -1462,6 +1464,7 @@ impl RouteSessionManager {
dst_peer_id: PeerId,
mut sync_now: tokio::sync::broadcast::Receiver<()>,
) {
let mut last_sync = Instant::now();
loop {
let mut first_time = true;
@@ -1479,8 +1482,16 @@ impl RouteSessionManager {
service_impl.update_my_infos().await;
}
// if we are initiator, we should ensure the dst has the session.
let sync_as_initiator = if last_sync.elapsed().as_secs() > 10 {
last_sync = Instant::now();
true
} else {
false
};
if service_impl
.sync_route_with_peer(dst_peer_id, peer_rpc.clone())
.sync_route_with_peer(dst_peer_id, peer_rpc.clone(), sync_as_initiator)
.await
{
break;