Merge pull request #58 from lbl8603/1.2.x

调整添加转发路径的逻辑

Cargo.lock

@@ -1536,9 +1536,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
+checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile",
@@ -1946,6 +1946,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tungstenite",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -2237,6 +2238,15 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "which"
 version = "4.4.2"

vnt/Cargo.toml

@@ -75,4 +75,4 @@ zstd_compress = ["zstd"]
 integrated_tun = ["tun"]
 upnp = ["igd"]
 ws = ["tokio-tungstenite"]
-wss = ["ws", "tokio-tungstenite/rustls-tls-native-roots", "rustls"]
+wss = ["ws", "tokio-tungstenite/rustls-tls-native-roots", "tokio-tungstenite/rustls-tls-webpki-roots", "rustls"]

vnt/src/channel/context.rs

@@ -353,18 +353,18 @@ impl RouteTable {
         }
         Err(io::Error::new(io::ErrorKind::NotFound, "route not found"))
     }
-    pub fn add_route_if_absent(&self, id: Ipv4Addr, route: Route) {
+    pub fn add_route_if_absent(&self, id: Ipv4Addr, route: Route) -> bool {
         self.add_route_(id, route, true)
     }
-    pub fn add_route(&self, id: Ipv4Addr, route: Route) {
+    pub fn add_route(&self, id: Ipv4Addr, route: Route) -> bool {
         self.add_route_(id, route, false)
     }
-    fn add_route_(&self, id: Ipv4Addr, route: Route, only_if_absent: bool) {
+    fn add_route_(&self, id: Ipv4Addr, route: Route, only_if_absent: bool) -> bool {
         // 限制通道类型
         match self.use_channel_type {
             UseChannelType::P2p => {
                 if !route.is_p2p() {
-                    return;
+                    return false;
                 }
             }
             _ => {}
@@ -372,10 +372,18 @@ impl RouteTable {
         let key = route.route_key();
         if only_if_absent {
             if let Some((_, list)) = self.route_table.read().get(&id) {
+                let mut p2p_num = 0;
                 for (x, _) in list {
-                    if x.route_key() == key {
-                        return;
+                    if x.is_p2p() {
+                        p2p_num += 1;
                     }
+                    if x.route_key() == key {
+                        return true;
+                    }
+                }
+                if !self.first_latency && p2p_num >= self.channel_num {
+                    // 非优先延迟的情况下，通道满了则不用再添加
+                    return false;
                 }
             }
         }
@@ -387,11 +395,11 @@ impl RouteTable {
         for (x, time) in list.iter_mut() {
             if x.metric < route.metric && !self.first_latency {
                 //非优先延迟的情况下 不能比当前的路径更长
-                return;
+                return false;
             }
             if x.route_key() == key {
                 if only_if_absent {
-                    return;
+                    return true;
                 }
                 x.metric = route.metric;
                 x.rt = route.rt;
@@ -406,7 +414,7 @@ impl RouteTable {
             //如果延迟都稳定了，则去除多余通道
             for (route, _) in list.iter() {
                 if route.rt == DEFAULT_RT {
-                    return;
+                    return true;
                 }
             }
             //延迟优先模式需要更多的通道探测延迟最低的路线
@@ -422,6 +430,9 @@ impl RouteTable {
                     //非优先延迟的情况下 添加了直连的则排除非直连的
                     list.retain(|(k, _)| k.is_p2p());
                 }
+                if self.channel_num <= list.len() {
+                    return false;
+                }
             };
             //增加路由表容量，避免波动
             let limit_len = self.channel_num * 2;
@@ -429,6 +440,7 @@ impl RouteTable {
             self.truncate_(list, limit_len);
             list.push((route, AtomicCell::new(Instant::now())));
         }
+        return true;
     }
     fn truncate_(&self, list: &mut Vec<(Route, AtomicCell<Instant>)>, len: usize) {
         if list.len() <= len {

vnt/src/handle/recv_data/client.rs

@@ -212,14 +212,18 @@ impl<Device: DeviceWrite> ClientPacketHandler<Device> {
         let source = net_packet.source();
         match ControlPacket::new(net_packet.transport_protocol(), net_packet.payload())? {
             ControlPacket::PingPacket(_) => {
-                net_packet.set_transport_protocol(control_packet::Protocol::Pong.into());
-                net_packet.set_source(current_device.virtual_ip);
-                net_packet.set_destination(source);
-                net_packet.first_set_ttl(MAX_TTL);
-                self.client_cipher.encrypt_ipv4(&mut net_packet)?;
-                context.send_by_key(&net_packet, route_key)?;
                 let route = Route::from_default_rt(route_key, metric);
-                context.route_table.add_route_if_absent(source, route);
+                if context.route_table.add_route_if_absent(source, route)
+                    || net_packet.source() < current_device.virtual_ip
+                {
+                    //在路由表中，或者来源比自己小，就需要回复，注意不能调换顺序
+                    net_packet.set_transport_protocol(control_packet::Protocol::Pong.into());
+                    net_packet.set_source(current_device.virtual_ip);
+                    net_packet.set_destination(source);
+                    net_packet.first_set_ttl(MAX_TTL);
+                    self.client_cipher.encrypt_ipv4(&mut net_packet)?;
+                    context.send_by_key(&net_packet, route_key)?;
+                }
             }
             ControlPacket::PongPacket(pong_packet) => {
                 let current_time = crate::handle::now_time() as u16;