mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-05-06 17:59:11 +00:00
fix: force set tun fd when received (#1860)
This commit is contained in:
@@ -106,25 +106,18 @@ impl EasyTierLauncher {
|
|||||||
let mut tun_fd_receiver = data.tun_fd.1.lock().unwrap().take().unwrap();
|
let mut tun_fd_receiver = data.tun_fd.1.lock().unwrap().take().unwrap();
|
||||||
|
|
||||||
tasks.spawn(async move {
|
tasks.spawn(async move {
|
||||||
let mut old_tun_fd = None;
|
|
||||||
loop {
|
loop {
|
||||||
let Some(tun_fd) = tun_fd_receiver.recv().await.flatten() else {
|
let Some(tun_fd) = tun_fd_receiver.recv().await.flatten() else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
// iOS needs to re-setup nic ctx even if the tun fd is the same
|
let res = Instance::setup_nic_ctx_for_mobile(
|
||||||
if Some(tun_fd) != old_tun_fd || cfg!(target_os = "ios") {
|
nic_ctx.clone(),
|
||||||
let res = Instance::setup_nic_ctx_for_mobile(
|
global_ctx.clone(),
|
||||||
nic_ctx.clone(),
|
peer_mgr.clone(),
|
||||||
global_ctx.clone(),
|
peer_packet_receiver.clone(),
|
||||||
peer_mgr.clone(),
|
tun_fd,
|
||||||
peer_packet_receiver.clone(),
|
)
|
||||||
tun_fd,
|
.await;
|
||||||
)
|
|
||||||
.await;
|
|
||||||
if res.is_ok() {
|
|
||||||
old_tun_fd = Some(tun_fd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user