Merge pull request #6 from Dounutsubtly/dev

fix(server): improve error handling in connection acceptance loop.
Itsusinn · Aug 25, 2024 · d7a7f67 · d7a7f67
2 parents c9147bf + 8d4cb11
commit d7a7f67
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/tuic-server/src/server.rs b/tuic-server/src/server.rs
@@ -146,24 +146,30 @@ impl Server {
         );
 
         loop {
-            let Some(conn) = self.ep.accept().await else {
-                return;
-            };
-            let Ok(conn) = conn.accept() else {
-                return;
-            };
-
-            tokio::spawn(Connection::handle(
-                conn,
-                self.users.clone(),
-                self.udp_relay_ipv6,
-                self.zero_rtt_handshake,
-                self.auth_timeout,
-                self.task_negotiation_timeout,
-                self.max_external_pkt_size,
-                self.gc_interval,
-                self.gc_lifetime,
-            ));
+            match self.ep.accept().await {
+                Some(conn) => match conn.accept() {
+                    Ok(conn) => {
+                        tokio::spawn(Connection::handle(
+                            conn,
+                            self.users.clone(),
+                            self.udp_relay_ipv6,
+                            self.zero_rtt_handshake,
+                            self.auth_timeout,
+                            self.task_negotiation_timeout,
+                            self.max_external_pkt_size,
+                            self.gc_interval,
+                            self.gc_lifetime,
+                        ));
+                    }
+                    Err(e) => {
+                        log::debug!("[Incoming] Failed to accept connection: {e}");
+                    }
+                },
+                None => {
+                    log::debug!("[Incoming] ep.accept() returned None.");
+                    return;
+                }
+            }
         }
     }
 }