支持tap网卡,优化tun网卡配置

switch/src/nat/mod.rs

@@ -1,9 +1,9 @@
+use crate::proto::message::PunchNatType;
+use p2p_channel::punch::{NatInfo, NatType};
+use parking_lot::Mutex;
 use std::io;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::sync::Arc;
-use parking_lot::Mutex;
-use p2p_channel::punch::{NatInfo, NatType};
-use crate::proto::message::PunchNatType;
 
 pub mod check;
 
@@ -26,7 +26,7 @@ impl From<NatType> for PunchNatType {
     fn from(value: NatType) -> Self {
         match value {
             NatType::Symmetric => PunchNatType::Symmetric,
-            NatType::Cone => PunchNatType::Cone
+            NatType::Cone => PunchNatType::Cone,
         }
     }
 }
@@ -35,14 +35,26 @@ impl Into<NatType> for PunchNatType {
     fn into(self) -> NatType {
         match self {
             PunchNatType::Symmetric => NatType::Symmetric,
-            PunchNatType::Cone => NatType::Cone
+            PunchNatType::Cone => NatType::Cone,
         }
     }
 }
 
 impl NatTest {
-    pub fn new(nat_test_server: Vec<SocketAddr>, public_ip: Ipv4Addr, public_port: u16, local_ip: IpAddr, local_port: u16) -> NatTest {
-        let info = NatTest::re_test_(&nat_test_server, public_ip, public_port, local_ip, local_port);
+    pub fn new(
+        nat_test_server: Vec<SocketAddr>,
+        public_ip: Ipv4Addr,
+        public_port: u16,
+        local_ip: IpAddr,
+        local_port: u16,
+    ) -> NatTest {
+        let info = NatTest::re_test_(
+            &nat_test_server,
+            public_ip,
+            public_port,
+            local_ip,
+            local_port,
+        );
         NatTest {
             nat_test_server: Arc::new(nat_test_server),
             info: Arc::new(Mutex::new(info)),
@@ -51,12 +63,30 @@ impl NatTest {
     pub fn nat_info(&self) -> NatInfo {
         self.info.lock().clone()
     }
-    pub fn re_test(&self, public_ip: Ipv4Addr, public_port: u16, local_ip: IpAddr, local_port: u16) -> NatInfo {
-        let info = NatTest::re_test_(&self.nat_test_server, public_ip, public_port, local_ip, local_port);
+    pub fn re_test(
+        &self,
+        public_ip: Ipv4Addr,
+        public_port: u16,
+        local_ip: IpAddr,
+        local_port: u16,
+    ) -> NatInfo {
+        let info = NatTest::re_test_(
+            &self.nat_test_server,
+            public_ip,
+            public_port,
+            local_ip,
+            local_port,
+        );
         *self.info.lock() = info.clone();
         info
     }
-    fn re_test_(nat_test_server: &Vec<SocketAddr>, public_ip: Ipv4Addr, public_port: u16, local_ip: IpAddr, local_port: u16) -> NatInfo {
+    fn re_test_(
+        nat_test_server: &Vec<SocketAddr>,
+        public_ip: Ipv4Addr,
+        public_port: u16,
+        local_ip: IpAddr,
+        local_port: u16,
+    ) -> NatInfo {
         return match check::public_ip_list(nat_test_server) {
             Ok((nat_type, ips, port_range)) => {
                 let mut public_ips = Vec::new();
@@ -66,22 +96,26 @@ impl NatTest {
                         public_ips.push(IpAddr::from(ip));
                     }
                 }
-                NatInfo::new(public_ips,
-                             public_port,
-                             port_range,
-                             local_ip, local_port,
-                             nat_type, )
+                NatInfo::new(
+                    public_ips,
+                    public_port,
+                    port_range,
+                    local_ip,
+                    local_port,
+                    nat_type,
+                )
             }
             Err(e) => {
-                log::warn!("{:?}",e);
+                log::warn!("{:?}", e);
                 NatInfo::new(
                     vec![IpAddr::from(public_ip)],
                     public_port,
                     0,
-                    local_ip, local_port,
+                    local_ip,
+                    local_port,
                     NatType::Cone,
                 )
             }
         };
     }
-}
+}