From f58ead2d2994510d778ca4b36863e03f095c20af Mon Sep 17 00:00:00 2001
From: alex <asxalex@163.com>
Date: Mon, 27 Apr 2026 19:39:35 +0800
Subject: [PATCH] removed some output and ipv6

---
 .vscode/settings.json     |  2 +-
 src/bin/punchnet/main.rs  |  2 +-
 src/network/async_main.rs |  8 ++++----
 src/network/ipv6.rs       |  1 +
 src/network/tun_linux.rs  | 12 +++++++-----
 src/utils/acl_session.rs  |  2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9eb94d8..fb0827b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
-    "rust-analyzer.cargo.target": "x86_64-pc-windows-gnu",
+    // "rust-analyzer.cargo.target": "x86_64-pc-windows-gnu",
     // "rust-analyzer.cargo.features": ["tun"]
 }
\ No newline at end of file
diff --git a/src/bin/punchnet/main.rs b/src/bin/punchnet/main.rs
index c784346..2a6c35b 100755
--- a/src/bin/punchnet/main.rs
+++ b/src/bin/punchnet/main.rs
@@ -3,7 +3,6 @@ mod local_udp_info;
 
 use std::collections::HashMap;
 use std::fs;
-use std::fs::OpenOptions;
 use std::process;
 
 use clap::Parser;
@@ -412,6 +411,7 @@ fn main() {
 
     #[cfg(not(target_os = "windows"))]
     if should_daemonize {
+        use std::fs::OpenOptions;
         let out = OpenOptions::new()
             .create(true)
             .truncate(true)
diff --git a/src/network/async_main.rs b/src/network/async_main.rs
index 87fafe1..ad888fa 100755
--- a/src/network/async_main.rs
+++ b/src/network/async_main.rs
@@ -11,7 +11,7 @@ use crate::tcp::{init_quic_conn, send_stun_request};
 use crate::utils::{send_to_sock, CommandLine};
 use crate::{ConnectionInfo};
 use bytes::BytesMut;
-use etherparse::{PacketBuilder, SlicedPacket};
+use etherparse::{PacketBuilder};
 use sdlan_sn_rs::peer::{SdlanSock};
 use sdlan_sn_rs::utils::{get_current_timestamp, ip_to_string, is_multi_broadcast};
 use sdlan_sn_rs::utils::{Mac, Result};
@@ -231,8 +231,8 @@ async fn loop_tap(eee: &'static Node, cancel: CancellationToken) {
                     if let Ok(mut dns) = simple_dns::Packet::parse(&data) {
                         let transaction_id = dns.id();
                         if let Some((ip, port, origin_transaction_id)) = eee.dns_matcher.get_client_info(transaction_id) {
-                            warn!("got dns reply from global 223.5.5.5: {:?}, will send to {}:{}", 
-                                data, ip_to_string(&ip), port);
+                            warn!("got dns reply from global 223.5.5.5, will send to {}:{}", 
+                                ip_to_string(&ip), port);
 
                             let dstmac = eee.device_config.get_mac();
                             let srcmac = eee.device_config.dns_mac;
@@ -245,7 +245,7 @@ async fn loop_tap(eee: &'static Node, cancel: CancellationToken) {
                             let new_dns_resp = dns.build_bytes_vec().unwrap();
                             let mut response_packet = Vec::with_capacity(builder.size(new_dns_resp.len()));
                             if let Ok(_) = builder.write(&mut response_packet, &new_dns_resp) {
-                                warn!("will send to tun with packet: {:?}", response_packet);
+                                // warn!("will send to tun with packet: {:?}", response_packet);
                                 if let Err(_e) = eee.device.handle_packet_from_net(&response_packet).await {
                                     error!("failed to write dns packet to device");
                                 }
diff --git a/src/network/ipv6.rs b/src/network/ipv6.rs
index 346f49a..1055945 100755
--- a/src/network/ipv6.rs
+++ b/src/network/ipv6.rs
@@ -69,6 +69,7 @@ pub async fn run_ipv6(edge: &'static Node, mut v6_may_change: Receiver<bool>) {
 }
 
 pub fn get_current_ipv6() -> Option<Ipv6Addr> {
+    return None;
     let Ok(ips) = local_ip_address::list_afinet_netifas() else {
         error!("failed to get ip address");
         return None;
diff --git a/src/network/tun_linux.rs b/src/network/tun_linux.rs
index ec07aa5..195d281 100755
--- a/src/network/tun_linux.rs
+++ b/src/network/tun_linux.rs
@@ -518,12 +518,14 @@ impl TunTapPacketHandler for Iface {
 
         let size = data.len();
 
-        let Ok(encrypted) = edge.encryptor.load().encrypt(&data) else {
-            // let Ok(encrypted) = edge.encryptor.read().unwrap().encrypt(&data) else {
-            // let Ok(encrypted) = aes_encrypt(encrypt_key, &data) else {
-            error!("failed to encrypt packet request");
-            return Ok(());
+        let encrypted = match edge.encryptor.load().encrypt(&data) {
+            Ok(data) => data,
+            Err(e) => {
+                error!("failed to encrypt packet request: {}", e.as_str());
+                return Ok(());
+            }
         };
+
         let data_bytes = Bytes::from(encrypted);
         let data = SdlData {
             is_p2p: true,
diff --git a/src/utils/acl_session.rs b/src/utils/acl_session.rs
index 3f97a93..1fde0e3 100644
--- a/src/utils/acl_session.rs
+++ b/src/utils/acl_session.rs
@@ -134,7 +134,7 @@ impl RuleCache {
     }
 
     pub fn touch_packet(&self, info: FiveTuple) {
-        error!("touch a packet: {:?}", info);
+        // error!("touch a packet: {:?}", info);
         self.session_table.add_session_info(info);
     }