增加打洞选项

vnt/src/channel/punch.rs

@@ -1,12 +1,32 @@
 use std::collections::HashMap;
 use std::io;
 use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
+use std::str::FromStr;
 use std::time::Duration;
 
 use rand::prelude::SliceRandom;
 
 use crate::channel::channel::Context;
 
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub enum PunchModel {
+    IPv4,
+    IPv6,
+    All,
+}
+
+impl FromStr for PunchModel {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().trim() {
+            "ipv4" => Ok(PunchModel::IPv4),
+            "ipv6" => Ok(PunchModel::IPv6),
+            _ => Ok(PunchModel::All),
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct NatInfo {
     pub public_ips: Vec<Ipv4Addr>,
@@ -49,10 +69,11 @@ pub struct Punch {
     context: Context,
     port_vec: Vec<u16>,
     port_index: HashMap<Ipv4Addr, usize>,
+    punch_model: PunchModel,
 }
 
 impl Punch {
-    pub fn new(context: Context) -> Self {
+    pub fn new(context: Context, punch_model: PunchModel) -> Self {
         let mut port_vec: Vec<u16> = (1..65535).collect();
         port_vec.push(65535);
         let mut rng = rand::thread_rng();
@@ -61,6 +82,7 @@ impl Punch {
             context,
             port_vec,
             port_index: HashMap::new(),
+            punch_model,
         }
     }
 }
@@ -76,12 +98,18 @@ impl Punch {
                 .send_main_udp(buf, SocketAddr::V4(nat_info.local_ipv4_addr))
                 .await;
         }
-        if !nat_info.ipv6_addr.ip().is_unspecified() && nat_info.ipv6_addr.port() != 0 {
+        if self.punch_model != PunchModel::IPv4
+            && !nat_info.ipv6_addr.ip().is_unspecified()
+            && nat_info.ipv6_addr.port() != 0
+        {
             let rs = self
                 .context
                 .send_main_udp(buf, SocketAddr::V6(nat_info.ipv6_addr))
                 .await;
             log::info!("发送到ipv6地址:{:?},rs={:?}", nat_info.ipv6_addr, rs);
+            if rs.is_ok() && self.punch_model == PunchModel::IPv6 {
+                return Ok(());
+            }
         }
         match nat_info.nat_type {
             NatType::Symmetric => {

vnt/src/core/mod.rs

@@ -12,7 +12,7 @@ use tokio::sync::mpsc::channel;
 
 use crate::channel::channel::{Channel, Context};
 use crate::channel::idle::Idle;
-use crate::channel::punch::{NatInfo, Punch};
+use crate::channel::punch::{NatInfo, Punch, PunchModel};
 use crate::channel::sender::ChannelSender;
 use crate::channel::{Route, RouteKey};
 use crate::cipher::{Cipher, CipherModel, RsaCipher};
@@ -164,14 +164,12 @@ impl VntUtil {
             Some(res) => res,
         };
         let device_type = if self.config.tap {
-            #[cfg(windows)]
             {
                 //删除tun网卡避免ip冲突，因为非正常退出会保留网卡
                 tun_tap_device::delete_device(tun_tap_device::DeviceType::Tun);
             }
             tun_tap_device::DeviceType::Tap
         } else {
-            #[cfg(windows)]
             {
                 //删除tap网卡避免ip冲突，非正常退出会保留网卡
                 tun_tap_device::delete_device(tun_tap_device::DeviceType::Tap);
@@ -253,7 +251,7 @@ impl VntUtil {
             current_device.clone(),
             1,
         );
-        let punch = Punch::new(context.clone());
+        let punch = Punch::new(context.clone(), config.punch_model);
         let idle = Idle::new(Duration::from_secs(16), context.clone());
         let channel_sender = ChannelSender::new(context.clone());
 
@@ -553,6 +551,7 @@ pub struct Config {
     pub parallel: usize,
     pub cipher_model: CipherModel,
     pub finger: bool,
+    pub punch_model: PunchModel,
 }
 
 impl Config {
@@ -576,6 +575,7 @@ impl Config {
         parallel: usize,
         cipher_model: CipherModel,
         finger: bool,
+        punch_model: PunchModel,
     ) -> Self {
         for x in stun_server.iter_mut() {
             if !x.contains(":") {
@@ -602,6 +602,7 @@ impl Config {
             parallel,
             cipher_model,
             finger,
+            punch_model,
         }
     }
 }

vnt/src/handle/punch_handler.rs

@@ -135,7 +135,8 @@ async fn start_punch_(
             current_device.virtual_ip(),
             &nat_info,
             info.virtual_ip,
-        )?;
+        )
+        .unwrap();
         let _ = sender
             .send_main(packet.buffer(), current_device.connect_server)
             .await;