fix: KCP session is closing while listener tries to input #30

Matrix-Zhang · Jun 12, 2023 · 89979a8 · 89979a8
1 parent 2ab3f2b
commit 89979a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/listener.rs b/src/listener.rs
@@ -120,7 +120,9 @@ impl KcpListener {
                                 // if let Err(err) = kcp.input(packet) {
                                 //     error!("kcp.input failed, peer: {}, conv: {}, error: {}, packet: {:?}", peer_addr, conv, err, ByteStr::new(packet));
                                 // }
-                                session.input(packet).await;
+                                if session.input(packet).await.is_err() {
+                                    trace!("[SESSION] KCP session is closing while listener tries to input");
+                                }
                             }
                         }
                     }

diff --git a/src/session.rs b/src/session.rs
@@ -255,8 +255,8 @@ impl KcpSession {
         self.notify();
     }
 
-    pub async fn input(&self, buf: &[u8]) {
-        self.input_tx.send(buf.to_owned()).await.expect("input channel closed")
+    pub async fn input(&self, buf: &[u8]) -> Result<(), SessionClosedError> {
+        self.input_tx.send(buf.to_owned()).await.map_err(|_| SessionClosedError)
     }
 
     pub async fn conv(&self) -> u32 {
@@ -269,6 +269,8 @@ impl KcpSession {
     }
 }
 
+pub struct SessionClosedError;
+
 struct KcpSessionUniq(Arc<KcpSession>);
 
 impl Drop for KcpSessionUniq {