处理默认路由

vnt-cli/src/main.rs

@@ -39,7 +39,7 @@ async fn main0() {
     opts.optopt("e", "", "NAT探测服务器地址,使用逗号分隔", "<addr1,addr2>");
     opts.optflag("a", "", "使用tap模式,默认使用tun模式");
     opts.optmulti("i", "", "配置点对网(IP代理)时使用,-i 192.168.0.0/24,10.26.0.3 \n表示允许接收网段192.168.0.0/24的数据并转发到10.26.0.3", "<in-ip>");
-    opts.optmulti("o", "", "配置点对网时使用,-o 192.168.0.0/24 \n表示允许目标为192.168.0.0/24的数据转发出去", "<out-ip>");
+    opts.optmulti("o", "", "配置点对网时使用,-o 192.168.0.0/24 \n表示允许将数据转发到192.168.0.0/24", "<out-ip>");
     opts.optopt("w", "", "使用该密码生成的密钥对客户端数据进行加密,并且服务端无法解密,使用相同密码的客户端才能通信", "<password>");
     opts.optflag("m", "", "模拟组播,默认情况下组播数据会被当作广播发送,开启后会模拟真实组播的数据发送");
     opts.optopt("u", "", "自定义mtu(默认为1430)", "<mtu>");

vnt/src/channel/channel.rs

@@ -251,7 +251,7 @@ impl Context {
     }
     pub fn route_one(&self, id: &Ipv4Addr) -> Option<Route> {
         if let Some(v) = self.inner.route_table.get(id) {
-            v.value().iter().max_by_key(|k| k.sort_key()).map(|k| *k)
+            v.value().first().map(|v| *v)
         } else {
             None
         }

vnt/src/handle/recv_handler.rs

@@ -99,6 +99,7 @@ impl ChannelDataHandler {
             return Ok(());
         }
         let source = net_packet.source();
+        context.update_read_time(&source, route_key);
         let current_device = self.current_device.load();
         let destination = net_packet.destination();
         let not_broadcast = !destination.is_broadcast() && !destination.is_multicast() && destination != current_device.broadcast_address;
@@ -361,17 +362,15 @@ impl ChannelDataHandler {
         let metric = net_packet.source_ttl() - net_packet.ttl() + 1;
         match ControlPacket::new(net_packet.transport_protocol(), net_packet.payload())? {
             ControlPacket::PingPacket(_) => {
-                context.update_read_time(&source, route_key);
                 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);
                 context.send_by_key(net_packet.buffer(), route_key).await?;
-                let route = Route::from(*route_key, metric, 99);
+                let route = Route::from(*route_key, metric, 199);
                 context.add_route_if_absent(source, route);
             }
             ControlPacket::PongPacket(pong_packet) => {
-                context.update_read_time(&source, route_key);
                 let current_time = crate::handle::now_time() as u16;
                 if current_time < pong_packet.time() {
                     return Ok(());
@@ -403,7 +402,7 @@ impl ChannelDataHandler {
                 net_packet.set_destination(source);
                 net_packet.first_set_ttl(1);
                 context.send_by_key(net_packet.buffer(), route_key).await?;
-                let route = Route::from(*route_key, metric, 99);
+                let route = Route::from(*route_key, metric, 199);
                 context.add_route_if_absent(source, route);
             }
             ControlPacket::PunchResponse => {
@@ -411,7 +410,7 @@ impl ChannelDataHandler {
                     return Ok(());
                 }
                 // log::info!("PunchResponse route_key:{:?}",route_key);
-                let route = Route::from(*route_key, metric, 99);
+                let route = Route::from(*route_key, metric, 199);
                 context.add_route_if_absent(source, route);
             }
             ControlPacket::AddrRequest => {