v1.1

switch/src/handle/mod.rs

@@ -1,38 +1,17 @@
 use std::net::{Ipv4Addr, SocketAddr};
-use std::sync::atomic::AtomicI64;
-use std::time::Duration;
-
-use chrono::Local;
-use dashmap::DashMap;
-use lazy_static::lazy_static;
-use moka::sync::Cache;
-use parking_lot::{const_mutex, Mutex};
-
-use crate::proto::message::NatType;
 
 pub mod heartbeat_handler;
 pub mod punch_handler;
 pub mod registration_handler;
 pub mod tun_handler;
-pub mod udp_recv_handler;
-lazy_static! {
-    /// 0. 机器纪元，每一次上线或者下线都会增1，由服务端维护，用于感知网络中机器变化
-    /// 服务端和客户端的不一致，则服务端会推送新的设备列表
-    /// 1. 网络中的虚拟ip列表
-    pub static ref DEVICE_LIST:Mutex<(u32,Vec<PeerDeviceInfo>)> = const_mutex((0,Vec::new()));
-    /// 服务器延迟
-    pub static ref SERVER_RT:AtomicI64 = AtomicI64::new(-1);
-    /// id
-    pub static ref ID:AtomicI64 = AtomicI64::new(0);
-    /// 直连路由表
-    pub static ref DIRECT_ROUTE_TABLE:DashMap<Ipv4Addr,Route> = DashMap::new();
-    /// 地址映射
-    pub static ref ADDR_TABLE:Cache<SocketAddr,Ipv4Addr> = Cache::builder()
-        .time_to_idle(Duration::from_secs(60*5)).build();
-    /// 当前设备的nat信息
-    pub static ref NAT_INFO:Mutex<Option<NatInfo>> = const_mutex(None);
-    static ref NAT_TEST_ADDRESS:Mutex<Vec<SocketAddr>> = const_mutex(Vec::new());
+pub mod recv_handler;
+
+/// 是否在一个网段
+fn check_dest(dest: Ipv4Addr, virtual_netmask: Ipv4Addr, virtual_network: Ipv4Addr) -> bool {
+    u32::from_be_bytes(dest.octets()) & u32::from_be_bytes(virtual_netmask.octets())
+        == u32::from_be_bytes(virtual_network.octets())
 }
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PeerDeviceInfo {
     pub virtual_ip: Ipv4Addr,
@@ -74,82 +53,15 @@ impl From<u8> for PeerDeviceStatus {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum ApplicationStatus {
-    Starting,
-    Stopping,
-}
-
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum ConnectStatus {
     Connecting,
     Connected,
 }
 
-impl Into<u8> for ConnectStatus {
-    fn into(self) -> u8 {
-        match self {
-            ConnectStatus::Connecting => 0,
-            ConnectStatus::Connected => 1,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct NatInfo {
-    pub public_ips: Vec<u32>,
-    pub public_port: u16,
-    pub public_port_range: u16,
-    pub nat_type: NatType,
-}
-
-impl NatInfo {
-    pub fn new(
-        public_ips: Vec<u32>,
-        public_port: u16,
-        public_port_range: u16,
-        nat_type: NatType,
-    ) -> Self {
-        Self {
-            public_ips,
-            public_port,
-            public_port_range,
-            nat_type,
-        }
-    }
-}
-
-pub fn init_nat_test_addr(addrs: Vec<SocketAddr>) {
-    NAT_TEST_ADDRESS.lock().extend_from_slice(&addrs);
-}
-
-/// 初始化nat信息
-pub fn init_nat_info(public_ip: u32, public_port: u16) {
-    let addrs = NAT_TEST_ADDRESS.lock().clone();
-    match crate::nat::check::public_ip_list(&addrs) {
-        Ok((nat_type, ips, port_range)) => {
-            let mut public_ips = Vec::new();
-            public_ips.push(public_ip);
-            for ip in ips {
-                let ip = u32::from_be_bytes(ip.octets());
-                if ip != public_ip {
-                    public_ips.push(ip);
-                }
-            }
-            let nat_info = NatInfo::new(public_ips, public_port, port_range, nat_type);
-            // println!("nat信息:{:?}",nat_info);
-            let mut nat_info_lock = NAT_INFO.lock();
-            nat_info_lock.replace(nat_info);
-        }
-        Err(e) => {
-            println!("获取nat数据失败，将无法进行udp打洞:{:?}", e);
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub struct CurrentDeviceInfo {
-    pub virtual_ip: Ipv4Addr,
+    virtual_ip: Ipv4Addr,
     pub virtual_gateway: Ipv4Addr,
     pub virtual_netmask: Ipv4Addr,
     //网络地址
@@ -182,40 +94,16 @@ impl CurrentDeviceInfo {
             connect_server,
         }
     }
-}
-
-#[derive(Clone, Debug)]
-pub struct Route {
-    pub route_type: RouteType,
-    pub address: SocketAddr,
-    //用心跳探测延迟，收包时更新
-    pub rt: i64,
-    //收包时更新，如果太久没有收到消息则剔除
-    pub recv_time: i64,
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum RouteType {
-    ServerRelay,
-    P2P,
-}
-
-impl Into<u8> for RouteType {
-    fn into(self) -> u8 {
-        match self {
-            RouteType::ServerRelay => 0,
-            RouteType::P2P => 1,
-        }
+    #[inline]
+    pub fn virtual_ip(&self) -> Ipv4Addr {
+        self.virtual_ip
+    }
+    #[inline]
+    pub fn virtual_gateway(&self) -> Ipv4Addr {
+        self.virtual_gateway
     }
 }
 
-impl Route {
-    pub fn new(address: SocketAddr) -> Self {
-        Self {
-            route_type: RouteType::P2P,
-            address,
-            rt: -1,
-            recv_time: Local::now().timestamp_millis(),
-        }
-    }
-}
+
+
+