From 0b570130e83410bb2bfa2bf6cf47c87a5d9eeec7 Mon Sep 17 00:00:00 2001 From: lbl8603 <49143209+lbl8603@users.noreply.github.com> Date: Sun, 21 Apr 2024 18:48:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86tcp=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vnt/src/channel/context.rs | 5 +---- vnt/src/handle/recv_data/server.rs | 8 +++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/vnt/src/channel/context.rs b/vnt/src/channel/context.rs index f462953..8f47f8b 100644 --- a/vnt/src/channel/context.rs +++ b/vnt/src/channel/context.rs @@ -199,10 +199,7 @@ impl ContextInner { self.send_main_udp(self.main_index.load(Ordering::Relaxed), buf, addr) } } - pub fn is_default_route(&self, route_key: RouteKey) -> bool { - self.is_tcp == route_key.is_tcp - && self.main_index.load(Ordering::Relaxed) == route_key.index - } + pub fn change_main_index(&self) { let index = (self.main_index.load(Ordering::Relaxed) + 1) % self.main_udp_socket.len(); self.main_index.store(index, Ordering::Relaxed); diff --git a/vnt/src/handle/recv_data/server.rs b/vnt/src/handle/recv_data/server.rs index 58c6408..1a6279a 100644 --- a/vnt/src/handle/recv_data/server.rs +++ b/vnt/src/handle/recv_data/server.rs @@ -394,11 +394,9 @@ impl ServerPacketHandler { self.set_device_info_list(response.device_info_list, response.epoch as _); } service_packet::Protocol::SecretHandshakeResponse => { - if context.is_default_route(route_key) { - log::info!("SecretHandshakeResponse"); - //加密握手结束,发送注册数据 - self.register(current_device, context)?; - } + log::info!("SecretHandshakeResponse"); + //加密握手结束,发送注册数据 + self.register(current_device, context)?; } _ => { log::warn!(