From c8eecc87fdfb90a70e93788c9df8f550268d6b6f Mon Sep 17 00:00:00 2001 From: lubeilin <1791778603@qq.com> Date: Fri, 22 Sep 2023 18:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BF=83=E8=B7=B3=E9=97=B4?= =?UTF-8?q?=E9=9A=94=EF=BC=8C=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=92=8C=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=BF=83=E8=B7=B3=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vnt/src/core/mod.rs | 10 +++- vnt/src/handle/heartbeat_handler.rs | 86 ++++++++++++++++++++++------- 2 files changed, 74 insertions(+), 22 deletions(-) diff --git a/vnt/src/core/mod.rs b/vnt/src/core/mod.rs index 628ac3c..348b825 100644 --- a/vnt/src/core/mod.rs +++ b/vnt/src/core/mod.rs @@ -403,12 +403,20 @@ impl VntUtil { let device_list = device_list.clone(); let current_device = current_device.clone(); // 定时心跳 + heartbeat_handler::start_heartbeat_main( + vnt_status_manager.worker("main-heartbeat"), + channel_sender.clone(), + device_list.clone(), + current_device.clone(), + config.server_address_str, + client_cipher.clone(), + self.server_cipher.clone(), + ); heartbeat_handler::start_heartbeat( vnt_status_manager.worker("heartbeat"), channel_sender.clone(), device_list.clone(), current_device.clone(), - config.server_address_str, client_cipher.clone(), self.server_cipher.clone(), ); diff --git a/vnt/src/handle/heartbeat_handler.rs b/vnt/src/handle/heartbeat_handler.rs index 60d464c..d521c3b 100644 --- a/vnt/src/handle/heartbeat_handler.rs +++ b/vnt/src/handle/heartbeat_handler.rs @@ -43,6 +43,28 @@ async fn start_idle_(idle: Idle, sender: ChannelSender) -> io::Result<()> { } pub fn start_heartbeat( + mut worker: VntWorker, + sender: ChannelSender, + device_list: Arc)>>, + current_device: Arc>, + client_cipher: Cipher, + server_cipher: Cipher, +) { + tokio::spawn(async move { + tokio::select! { + _=worker.stop_wait()=>{ + return; + } + rs=start_heartbeat_(sender, device_list, current_device,client_cipher,server_cipher)=>{ + if let Err(e) = rs { + log::warn!("心跳任务停止:{:?}", e); + } + } + } + worker.stop_all(); + }); +} +pub fn start_heartbeat_main( mut worker: VntWorker, sender: ChannelSender, device_list: Arc)>>, @@ -56,11 +78,11 @@ pub fn start_heartbeat( _=worker.stop_wait()=>{ return; } - rs=start_heartbeat_(sender, device_list, current_device,server_address_str,client_cipher,server_cipher)=>{ + rs=start_heartbeat_main_(sender, device_list, current_device,server_address_str,client_cipher,server_cipher)=>{ if let Err(e) = rs { - log::warn!("心跳任务停止:{:?}", e); + log::warn!("主心跳任务停止:{:?}", e); } - } + } } worker.stop_all(); }); @@ -97,7 +119,7 @@ fn heartbeat_packet( net_packet } -async fn start_heartbeat_( +async fn start_heartbeat_main_( sender: ChannelSender, device_list: Arc)>>, current_device: Arc>, @@ -106,26 +128,14 @@ async fn start_heartbeat_( server_cipher: Cipher, ) -> io::Result<()> { let mut count = 0; - log::info!("启动心跳任务"); + log::info!("启动主心跳任务"); loop { if sender.is_close() { return Ok(()); } let mut current_dev = current_device.load(); - //如果和服务端使用tcp连接，则维持udp洞的频率要更高些 - if (sender.is_main_tcp() && count % 2 == 0) || (!sender.is_main_tcp() && count % 20 == 1) { - let mut packet = NetPacket::new_encrypt([0; 12 + ENCRYPTION_RESERVED])?; - packet.set_version(Version::V1); - packet.set_gateway_flag(true); - packet.set_protocol(Protocol::Control); - packet.set_transport_protocol(control_packet::Protocol::AddrRequest.into()); - packet.first_set_ttl(MAX_TTL); - packet.set_source(current_dev.virtual_ip()); - packet.set_destination(current_dev.virtual_gateway); - server_cipher.encrypt_ipv4(&mut packet)?; - let _ = sender.send_main_udp(packet.buffer(), current_dev.connect_server); - } - if count % 20 == 19 { + let src = current_dev.virtual_ip(); + if count % 40 == 19 { if let Ok(mut addr) = server_address_str.to_socket_addrs() { if let Some(addr) = addr.next() { if addr != current_dev.connect_server { @@ -143,7 +153,6 @@ async fn start_heartbeat_( } } } - let src = current_dev.virtual_ip(); let server_packet = heartbeat_packet( MAX_TTL, &device_list, @@ -156,6 +165,41 @@ async fn start_heartbeat_( if let Err(e) = sender.send_main(server_packet.buffer(), current_dev.connect_server) { log::warn!("connect_server:{:?},e:{:?}", current_dev.connect_server, e); } + count += 1; + tokio::time::sleep(Duration::from_millis(3000)).await; + } +} + +async fn start_heartbeat_( + sender: ChannelSender, + device_list: Arc)>>, + current_device: Arc>, + client_cipher: Cipher, + server_cipher: Cipher, +) -> io::Result<()> { + let mut count = 0; + log::info!("启动心跳任务"); + loop { + if sender.is_close() { + return Ok(()); + } + let current_dev = current_device.load(); + //如果和服务端使用tcp连接，则维持udp洞的频率要更高些 + if (sender.is_main_tcp() && count % 4 == 0) || (!sender.is_main_tcp() && count % 40 == 1) { + let mut packet = NetPacket::new_encrypt([0; 12 + ENCRYPTION_RESERVED])?; + packet.set_version(Version::V1); + packet.set_gateway_flag(true); + packet.set_protocol(Protocol::Control); + packet.set_transport_protocol(control_packet::Protocol::AddrRequest.into()); + packet.first_set_ttl(MAX_TTL); + packet.set_source(current_dev.virtual_ip()); + packet.set_destination(current_dev.virtual_gateway); + server_cipher.encrypt_ipv4(&mut packet)?; + let _ = sender.send_main_udp(packet.buffer(), current_dev.connect_server); + } + + let src = current_dev.virtual_ip(); + if count < 7 || count % 7 == 0 { let mut route_list: Option)>> = None; let peer_list = { device_list.lock().1.clone() }; @@ -251,6 +295,6 @@ async fn start_heartbeat_( } count += 1; - tokio::time::sleep(Duration::from_millis(5000)).await; + tokio::time::sleep(Duration::from_millis(3000)).await; } }