From 30b1e71aa171acae7609076f8be98888fa7d036d Mon Sep 17 00:00:00 2001 From: lubeilin <1791778603@qq.com> Date: Tue, 19 Mar 2024 23:54:33 +0800 Subject: [PATCH] fmt --- vnt-cli/build.rs | 14 +++++++------- vnt-cli/src/callback.rs | 1 + vnt-cli/src/main.rs | 2 +- vnt/src/channel/punch.rs | 2 +- vnt/src/handle/maintain/addr_request.rs | 4 ++-- vnt/src/handle/maintain/heartbeat.rs | 4 ++-- vnt/src/handle/maintain/idle.rs | 1 - vnt/src/handle/recv_data/server.rs | 3 +-- vnt/src/handle/tun_tap/mod.rs | 2 +- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/vnt-cli/build.rs b/vnt-cli/build.rs index 7dabdb0..7cbf232 100644 --- a/vnt-cli/build.rs +++ b/vnt-cli/build.rs @@ -1,16 +1,16 @@ +use rand::Rng; use std::fs::File; use std::io::Write; -use rand::Rng; fn main() { // 生成随机序列号 - let serial_number = format!("{}-{}-{}",rand::thread_rng().gen_range(100..1000) - ,rand::thread_rng().gen_range(100..1000) - ,rand::thread_rng().gen_range(100..1000)); - let generated_code = format!( - r#"pub const SERIAL_NUMBER: &str = "{}";"#, - serial_number + let serial_number = format!( + "{}-{}-{}", + rand::thread_rng().gen_range(100..1000), + rand::thread_rng().gen_range(100..1000), + rand::thread_rng().gen_range(100..1000) ); + let generated_code = format!(r#"pub const SERIAL_NUMBER: &str = "{}";"#, serial_number); let dest_path = "src/generated_serial_number.rs"; let mut file = File::create(&dest_path).unwrap(); file.write_all(generated_code.as_bytes()).unwrap(); diff --git a/vnt-cli/src/callback.rs b/vnt-cli/src/callback.rs index 69a7d7d..7ac67c7 100644 --- a/vnt-cli/src/callback.rs +++ b/vnt-cli/src/callback.rs @@ -31,6 +31,7 @@ impl VntCallback for VntHandler { } fn error(&self, info: ErrorInfo) { + log::error!("error {:?}", info); println!("{}", style(format!("error {}", info)).red()); match info.code { ErrorType::TokenError diff --git a/vnt-cli/src/main.rs b/vnt-cli/src/main.rs index 09c861a..7c1bac4 100644 --- a/vnt-cli/src/main.rs +++ b/vnt-cli/src/main.rs @@ -15,8 +15,8 @@ use vnt::core::{Config, Vnt}; mod command; mod config; mod console_out; -mod root_check; mod generated_serial_number; +mod root_check; pub fn app_home() -> io::Result { let root_path = match std::env::current_exe() { diff --git a/vnt/src/channel/punch.rs b/vnt/src/channel/punch.rs index cff86db..bb935ea 100644 --- a/vnt/src/channel/punch.rs +++ b/vnt/src/channel/punch.rs @@ -226,7 +226,7 @@ impl Punch { } pub fn punch(&mut self, buf: &[u8], id: Ipv4Addr, nat_info: NatInfo) -> io::Result<()> { if !self.context.route_table.need_punch(&id) { - log::info!("已打洞成功,无需打洞:{:?}",id); + log::info!("已打洞成功,无需打洞:{:?}", id); return Ok(()); } if self.is_tcp && nat_info.tcp_port != 0 { diff --git a/vnt/src/handle/maintain/addr_request.rs b/vnt/src/handle/maintain/addr_request.rs index 3a11cad..32ff1a1 100644 --- a/vnt/src/handle/maintain/addr_request.rs +++ b/vnt/src/handle/maintain/addr_request.rs @@ -19,8 +19,8 @@ pub fn addr_request( config: BaseConfigInfo, ) { addr_request0(&context, ¤t_device_info, &server_cipher, &config); - // 9秒发送一次 - let rs = scheduler.timeout(Duration::from_secs(9), |s| { + // 17秒发送一次 + let rs = scheduler.timeout(Duration::from_secs(17), |s| { addr_request(s, context, current_device_info, server_cipher, config) }); if !rs { diff --git a/vnt/src/handle/maintain/heartbeat.rs b/vnt/src/handle/maintain/heartbeat.rs index 82be33d..9101791 100644 --- a/vnt/src/handle/maintain/heartbeat.rs +++ b/vnt/src/handle/maintain/heartbeat.rs @@ -12,7 +12,7 @@ use crate::cipher::Cipher; use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo}; use crate::protocol::body::ENCRYPTION_RESERVED; use crate::protocol::control_packet::PingPacket; -use crate::protocol::{control_packet, NetPacket, Protocol, Version, MAX_TTL}; +use crate::protocol::{control_packet, NetPacket, Protocol, Version}; use crate::util::Scheduler; /// 定时发送心跳包 @@ -216,7 +216,7 @@ fn heartbeat_packet( net_packet.set_version(Version::V1); net_packet.set_protocol(Protocol::Control); net_packet.set_transport_protocol(control_packet::Protocol::Ping.into()); - net_packet.first_set_ttl(MAX_TTL); + net_packet.first_set_ttl(5); net_packet.set_source(src); net_packet.set_destination(dest); let mut ping = PingPacket::new(net_packet.payload_mut())?; diff --git a/vnt/src/handle/maintain/idle.rs b/vnt/src/handle/maintain/idle.rs index ddbd513..1697880 100644 --- a/vnt/src/handle/maintain/idle.rs +++ b/vnt/src/handle/maintain/idle.rs @@ -86,7 +86,6 @@ fn idle_gateway0( ErrorType::Disconnect, format!("connect:{},error:{:?}", cur.connect_server, e), )); - log::warn!("{:?}", e); } } fn idle_route0( diff --git a/vnt/src/handle/recv_data/server.rs b/vnt/src/handle/recv_data/server.rs index 55b68ca..f17187c 100644 --- a/vnt/src/handle/recv_data/server.rs +++ b/vnt/src/handle/recv_data/server.rs @@ -268,6 +268,7 @@ impl ServerPacketHandler { log::info!("ip发生变化,old:{:?},response={:?}", old, response); } if let Err(e) = self.device.set_ip(virtual_ip, virtual_netmask) { + log::error!("LocalIpExists {:?}", e); self.callback.error(ErrorInfo::new_msg( ErrorType::LocalIpExists, format!("set_ip {:?}", e), @@ -421,12 +422,10 @@ impl ServerPacketHandler { self.callback.error(err); } InErrorPacket::IpAlreadyExists => { - log::error!("IpAlreadyExists"); let err = ErrorInfo::new(ErrorType::IpAlreadyExists); self.callback.error(err); } InErrorPacket::InvalidIp => { - log::error!("InvalidIp"); let err = ErrorInfo::new(ErrorType::InvalidIp); self.callback.error(err); } diff --git a/vnt/src/handle/tun_tap/mod.rs b/vnt/src/handle/tun_tap/mod.rs index eab26af..002203a 100644 --- a/vnt/src/handle/tun_tap/mod.rs +++ b/vnt/src/handle/tun_tap/mod.rs @@ -97,7 +97,7 @@ pub fn base_handle( net_packet.set_version(Version::V1); net_packet.set_protocol(protocol::Protocol::IpTurn); net_packet.set_transport_protocol(ip_turn_packet::Protocol::Ipv4.into()); - net_packet.first_set_ttl(3); + net_packet.first_set_ttl(6); net_packet.set_source(src_ip); net_packet.set_destination(dest_ip); if dest_ip == current_device.virtual_gateway {