mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-08-05 20:19:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: route_update message is not lag (#2355)

Browse Source
This commit is contained in:
韩嘉乐
2026-06-16 00:00:48 +08:00
committed by GitHub
parent 8909e88484
commit 16b666ad25
1 changed files with 61 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier-contrib/easytier-ohrs/src/kernel_bridge/socket_server.rs
+61 -80
View File
@@ -119,7 +119,9 @@ fn sync_tun_event_receivers(receivers: &mut HashMap<String, EventBusSubscriber>)
fn event_needs_tun_refresh(event: &GlobalCtxEvent) -> bool { fn event_needs_tun_refresh(event: &GlobalCtxEvent) -> bool {
matches!( matches!(
event, event,
GlobalCtxEvent::DhcpIpv4Changed(_, _) | GlobalCtxEvent::ProxyCidrsUpdated(_, _) GlobalCtxEvent::DhcpIpv4Changed(_, _)
| GlobalCtxEvent::ProxyCidrsUpdated(_, _)
| GlobalCtxEvent::PublicIpv6RoutesUpdated(_, _)
) )
} }
@@ -476,89 +478,68 @@ pub fn start_local_socket_server() -> bool {
.retain(|instance_id, _| active_tun_candidate_ids.contains(instance_id)); .retain(|instance_id, _| active_tun_candidate_ids.contains(instance_id));
shrink_hash_set_if_sparse(&mut delivered_tun_requests); shrink_hash_set_if_sparse(&mut delivered_tun_requests);
shrink_hash_map_if_sparse(&mut last_tun_route_signatures); shrink_hash_map_if_sparse(&mut last_tun_route_signatures);
let has_undelivered_tun_candidate = active_tun_candidate_ids
.iter()
.any(|instance_id| !delivered_tun_requests.contains(instance_id));
let should_evaluate_tun =
tun_refresh || !tun_bootstrap_done || has_undelivered_tun_candidate;
let mut saw_running_instance = false; let mut saw_running_instance = false;
let mut saw_tun_candidate = false; let mut saw_tun_candidate = false;
if should_evaluate_tun { for instance in snapshot.instances.iter() {
for instance in snapshot.instances.iter() { if instance.running {
if instance.running { saw_running_instance = true;
saw_running_instance = true;
}
if instance.running && instance.tun_required {
saw_tun_candidate = true;
let virtual_ipv4 = instance
.my_node_info
.as_ref()
.and_then(|info| info.virtual_ipv4.clone());
let virtual_ipv4_cidr = instance
.my_node_info
.as_ref()
.and_then(|info| info.virtual_ipv4_cidr.clone());
if clients.is_empty() {
continue;
}
if virtual_ipv4.is_none() || virtual_ipv4_cidr.is_none() {
continue;
}
let aggregated_routes = aggregate_tun_routes(instance);
let route_signature = serde_json::to_string(&(
&virtual_ipv4,
&virtual_ipv4_cidr,
&aggregated_routes,
instance.magic_dns_enabled,
instance.need_exit_node,
))
.unwrap_or_else(|_| "[]".to_string());
let allow_route_signature_refresh = tun_refresh || !tun_bootstrap_done;
let should_send = !delivered_tun_requests.contains(&instance.instance_id)
|| (allow_route_signature_refresh
&& last_tun_route_signatures
.get(&instance.instance_id)
.map(|value| value != &route_signature)
.unwrap_or(true));
if !should_send {
continue;
}
let payload = TunRequestPayload {
config_id: instance.config_id.clone(),
instance_id: instance.instance_id.clone(),
display_name: instance.display_name.clone(),
virtual_ipv4,
virtual_ipv4_cidr,
aggregated_routes,
magic_dns_enabled: instance.magic_dns_enabled,
need_exit_node: instance.need_exit_node,
};
let payload_json = match serde_json::to_string(&payload) {
Ok(json) => json,
Err(err) => {
ohrs_log_error!("[Rust] serialize tun request failed: {}", err);
continue;
}
};
if broadcast_local_socket_message(
&mut clients,
"tun_request",
&payload_json,
) {
delivered_tun_requests.insert(instance.instance_id.clone());
last_tun_route_signatures
.insert(instance.instance_id.clone(), route_signature);
}
}
} }
} else { if !(instance.running && instance.tun_required) {
for instance in snapshot.instances.iter() { continue;
if instance.running { }
saw_running_instance = true;
} saw_tun_candidate = true;
if instance.running && instance.tun_required { let virtual_ipv4 = instance
saw_tun_candidate = true; .my_node_info
.as_ref()
.and_then(|info| info.virtual_ipv4.clone());
let virtual_ipv4_cidr = instance
.my_node_info
.as_ref()
.and_then(|info| info.virtual_ipv4_cidr.clone());
if clients.is_empty() {
continue;
}
if virtual_ipv4.is_none() || virtual_ipv4_cidr.is_none() {
continue;
}
let aggregated_routes = aggregate_tun_routes(instance);
let route_signature = serde_json::to_string(&(
&virtual_ipv4,
&virtual_ipv4_cidr,
&aggregated_routes,
instance.magic_dns_enabled,
instance.need_exit_node,
))
.unwrap_or_else(|_| "[]".to_string());
let should_send = !delivered_tun_requests.contains(&instance.instance_id)
|| last_tun_route_signatures
.get(&instance.instance_id)
.map(|value| value != &route_signature)
.unwrap_or(true);
if !should_send {
continue;
}
let payload = TunRequestPayload {
config_id: instance.config_id.clone(),
instance_id: instance.instance_id.clone(),
display_name: instance.display_name.clone(),
virtual_ipv4,
virtual_ipv4_cidr,
aggregated_routes,
magic_dns_enabled: instance.magic_dns_enabled,
need_exit_node: instance.need_exit_node,
};
let payload_json = match serde_json::to_string(&payload) {
Ok(json) => json,
Err(err) => {
ohrs_log_error!("[Rust] serialize tun request failed: {}", err);
continue;
} }
};
if broadcast_local_socket_message(&mut clients, "tun_request", &payload_json) {
delivered_tun_requests.insert(instance.instance_id.clone());
last_tun_route_signatures.insert(instance.instance_id.clone(), route_signature);
} }
} }
if !delivered_tun_requests.is_empty() if !delivered_tun_requests.is_empty()