From ecdb359bbd14a54f75883fd58ddd829c2290334a Mon Sep 17 00:00:00 2001 From: lbl <1791778603@qq.com> Date: Mon, 23 Feb 2026 20:17:11 +0800 Subject: [PATCH] fmt --- vnt-core/src/crypto/mod.rs | 4 +++- vnt-core/src/protocol/ip_packet_protocol.rs | 2 +- vnt-core/src/tunnel_core/p2p/outbound.rs | 5 ++++- vnt-core/src/tunnel_core/p2p/route_table.rs | 3 +-- vnt-core/src/tunnel_core/server/inbound.rs | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/vnt-core/src/crypto/mod.rs b/vnt-core/src/crypto/mod.rs index bdf6666..6b9ae6c 100644 --- a/vnt-core/src/crypto/mod.rs +++ b/vnt-core/src/crypto/mod.rs @@ -18,7 +18,9 @@ impl PacketCrypto { pub(crate) fn new_from_str(s: Option<&str>) -> Self { Self { - crypto: s.map(chacha20_poly1305::PacketCrypto::new_from_str).map(Arc::new), + crypto: s + .map(chacha20_poly1305::PacketCrypto::new_from_str) + .map(Arc::new), } } pub(crate) fn encrypt_reserve(&self) -> usize { diff --git a/vnt-core/src/protocol/ip_packet_protocol.rs b/vnt-core/src/protocol/ip_packet_protocol.rs index 27ac2fc..07bbb00 100644 --- a/vnt-core/src/protocol/ip_packet_protocol.rs +++ b/vnt-core/src/protocol/ip_packet_protocol.rs @@ -225,7 +225,7 @@ impl + AsMut<[u8]>> NetPacket { self.header_mut().set_msg_type(msg_type.into()); } - pub fn decr_ttl(&mut self){ + pub fn decr_ttl(&mut self) { self.header_mut().decr_ttl() } diff --git a/vnt-core/src/tunnel_core/p2p/outbound.rs b/vnt-core/src/tunnel_core/p2p/outbound.rs index 962041a..d5c9a2a 100644 --- a/vnt-core/src/tunnel_core/p2p/outbound.rs +++ b/vnt-core/src/tunnel_core/p2p/outbound.rs @@ -68,7 +68,10 @@ impl P2pOutbound { self.route_table.get_route_by_id(id).ok() } pub fn get_p2p_route_by_id(&self, id: &Ipv4Addr) -> Option { - self.route_table.get_route_by_id(id).ok().filter(|v| v.is_direct()) + self.route_table + .get_route_by_id(id) + .ok() + .filter(|v| v.is_direct()) } pub fn exists_route_by_id(&self, id: &Ipv4Addr) -> bool { self.route_table.exists(id) diff --git a/vnt-core/src/tunnel_core/p2p/route_table.rs b/vnt-core/src/tunnel_core/p2p/route_table.rs index 64a972a..1f4b5dd 100644 --- a/vnt-core/src/tunnel_core/p2p/route_table.rs +++ b/vnt-core/src/tunnel_core/p2p/route_table.rs @@ -1,11 +1,10 @@ use parking_lot::{Mutex, RwLock}; -use rust_p2p_core::route::{RouteKey, DEFAULT_RTT}; +use rust_p2p_core::route::{DEFAULT_RTT, RouteKey}; use std::collections::HashMap; use std::net::Ipv4Addr; use std::sync::Arc; use std::time::Instant; - #[derive(Copy, Clone, Debug)] pub struct Route { route_key: RouteKey, diff --git a/vnt-core/src/tunnel_core/server/inbound.rs b/vnt-core/src/tunnel_core/server/inbound.rs index abe9e78..c6c464f 100644 --- a/vnt-core/src/tunnel_core/server/inbound.rs +++ b/vnt-core/src/tunnel_core/server/inbound.rs @@ -76,7 +76,7 @@ impl ServerTurnInboundHandler { } pub async fn handle_server_data( - & self, + &self, transport_client: &mut TransportClient, network_addr: NetworkAddr, data: TransmissionBytes, @@ -254,7 +254,7 @@ impl ServerTurnInboundHandler { net_packet.set_payload(&bytes_mut)?; self.packet_crypto.encrypt_in_place(&mut net_packet)?; transport_client.send_turn(net_packet).await?; - }else{ + } else { log::info!("限制打洞频率") } }