From 20132861e992c1d361b0b0b1df8467cc8d523ad3 Mon Sep 17 00:00:00 2001
From: lubeilin <1791778603@qq.com>
Date: Thu, 14 Mar 2024 12:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vnt/src/handle/maintain/punch.rs   | 2 ++
 vnt/src/handle/recv_data/client.rs | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vnt/src/handle/maintain/punch.rs b/vnt/src/handle/maintain/punch.rs
index 3663eb2..1beb64b 100644
--- a/vnt/src/handle/maintain/punch.rs
+++ b/vnt/src/handle/maintain/punch.rs
@@ -27,6 +27,7 @@ pub struct PunchSender {
 }
 impl PunchSender {
     pub fn send(&self, src_peer: bool, ip: Ipv4Addr, info: NatInfo) -> bool {
+        log::info!("发送打洞协商消息,是否对端发起:{},ip:{},info:{:?}",src_peer,ip, info);
         if src_peer {
             self.sender_peer.send((ip, info)).is_ok()
         } else {
@@ -198,6 +199,7 @@ fn punch0(
             &nat_info,
             info.virtual_ip,
         )?;
+        log::info!("发起打洞协商请求，目标:{:?},{:?}", info.virtual_ip, nat_info);
         context.send_default(packet.buffer(), current_device.connect_server)?;
     }
     Ok(())
diff --git a/vnt/src/handle/recv_data/client.rs b/vnt/src/handle/recv_data/client.rs
index eb76625..d1459fe 100644
--- a/vnt/src/handle/recv_data/client.rs
+++ b/vnt/src/handle/recv_data/client.rs
@@ -176,8 +176,8 @@ impl ClientPacketHandler {
                 net_packet.first_set_ttl(MAX_TTL);
                 self.client_cipher.encrypt_ipv4(&mut net_packet)?;
                 context.send_by_key(net_packet.buffer(), route_key)?;
-                // let route = Route::from_default_rt(route_key, metric);
-                // context.route_table.add_route_if_absent(source, route);
+                let route = Route::from_default_rt(route_key, metric);
+                context.route_table.add_route_if_absent(source, route);
             }
             ControlPacket::PongPacket(pong_packet) => {
                 let current_time = crate::handle::now_time() as u16;
@@ -320,13 +320,11 @@ impl ClientPacketHandler {
                     punch_packet.set_source(current_device.virtual_ip());
                     punch_packet.set_destination(source);
                     punch_packet.set_payload(&bytes)?;
-                    log::info!("接收打洞请求={:?}", peer_nat_info);
                     if self.punch_sender.send(true, source, peer_nat_info) {
                         self.client_cipher.encrypt_ipv4(&mut punch_packet)?;
                         context.send_by_key(punch_packet.buffer(), route_key)?;
                     }
                 } else {
-                    log::info!("接收打洞请求回复={:?}", peer_nat_info);
                     self.punch_sender.send(false, source, peer_nat_info);
                 }
             }