注册失败时重试

vnt-core/src/core/mod.rs

@@ -9,6 +9,7 @@ use crate::enhanced_tunnel::outbound::EnhancedOutbound;
 use crate::fec::{FecDecoder, FecEncoder};
 use crate::nat::internal_nat::{InternalNatInbound, PortMappingManager};
 use crate::nat::{AllowSubnetExternalRoute, SubnetExternalRoute};
+use crate::protocol::control_message::ErrorResponseMsg;
 use crate::tun::enhanced_tun::EnhancedTunInbound;
 use crate::tun::{DeviceConfig, DeviceIOManager, TunDataInbound, TunReceiver, tun_channel};
 use crate::tunnel_core::outbound::{BasicOutbound, HybridOutbound};
@@ -47,6 +48,10 @@ pub struct NetworkManager {
     tun_receiver: Option<TunReceiver>,
     registration_context: Option<Box<RegistrationContext>>,
 }
+pub enum RegisterResponse {
+    Success(NetworkAddr),
+    Failed(ErrorResponseMsg),
+}
 
 impl NetworkManager {
     pub async fn create_network(
@@ -202,47 +207,41 @@ impl NetworkManager {
     /// Register with server(s) and start data handling tasks.
     /// This method can only be called once.
     /// Returns the registration response on success.
-    pub async fn register(&mut self) -> anyhow::Result<NetworkAddr> {
+    pub async fn register(&mut self) -> anyhow::Result<RegisterResponse> {
         let Some(mut ctx) = self.registration_context.take() else {
             bail!("register can only be called once");
         };
 
         let is_multi_server = ctx.server_managers.len() > 1;
 
-        let reg_response = if is_multi_server {
+        let response = if is_multi_server {
             // Multi-server: coordinated pre-registration
             log::info!(
                 "Multi-server mode: performing coordinated registration for {} servers",
                 ctx.server_managers.len()
             );
-            let reg_response = coordinated_registration(&mut ctx.server_managers).await?;
-            log::info!(
-                "Coordinated registration completed, IP: {}, prefix_len: {}",
-                reg_response.ip,
-                reg_response.prefix_len
-            );
-            reg_response
+            coordinated_registration(&mut ctx.server_managers).await?
         } else {
             // Single-server: normal registration
             log::info!("Single-server mode: performing normal registration");
-            let response = ctx.server_managers[0]
+            ctx.server_managers[0]
                 .connect_and_reg(crate::protocol::control_message::RegistrationMode::Normal)
-                .await?;
-            match response {
-                crate::protocol::control_message::ResponseMessage::Reg(reg) => {
-                    log::info!(
-                        "Registration completed, IP: {}, prefix_len: {}",
-                        reg.ip,
-                        reg.prefix_len
-                    );
-                    reg
-                }
-                crate::protocol::control_message::ResponseMessage::Error(e) => {
-                    bail!("Registration failed: {}", e.message);
-                }
-                crate::protocol::control_message::ResponseMessage::ConfirmReg(_) => {
-                    bail!("Unexpected ConfirmReg response");
-                }
+                .await?
+        };
+        let reg_response = match response {
+            crate::protocol::control_message::ResponseMessage::Reg(reg) => {
+                log::info!(
+                    "Registration completed, IP: {}, prefix_len: {}",
+                    reg.ip,
+                    reg.prefix_len
+                );
+                reg
+            }
+            crate::protocol::control_message::ResponseMessage::Error(e) => {
+                return Ok(RegisterResponse::Failed(e));
+            }
+            crate::protocol::control_message::ResponseMessage::ConfirmReg(_) => {
+                bail!("Unexpected ConfirmReg response");
             }
         };
         let network_addr = NetworkAddr {
@@ -256,10 +255,9 @@ impl NetworkManager {
         // 保存服务器版本信息
         if !reg_response.server_version.is_empty() {
             for (index, _) in ctx.server_managers.iter().enumerate() {
-                self.app_state.server_info_collection.set_server_version(
-                    index as u32,
-                    reg_response.server_version.clone(),
-                );
+                self.app_state
+                    .server_info_collection
+                    .set_server_version(index as u32, reg_response.server_version.clone());
             }
         }
 
@@ -283,7 +281,7 @@ impl NetworkManager {
             turn_manager.data_handle_task_connected(&self.task_group, handler_config, network_addr);
         }
 
-        Ok(network_addr)
+        Ok(RegisterResponse::Success(network_addr))
     }
 
     pub fn is_no_tun(&self) -> bool {