chore: remove tcp timeout, it causes perceptible disconnection

Itsusinn · Jan 8, 2025 · d3a6b1a · d3a6b1a
1 parent 51a667f
commit d3a6b1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/tuic-server/src/connection/handle_task.rs b/tuic-server/src/connection/handle_task.rs
@@ -62,7 +62,7 @@ impl Connection {
                 // a -> b tx
                 // a <- b rx
                 let (tx, rx, err) =
-                    exchange_tcp(&mut conn, &mut stream, self.ctx.cfg.stream_timeout).await;
+                    exchange_tcp(&mut conn, &mut stream).await;
 
                 _ = conn.reset(ERROR_CODE);
                 _ = stream.shutdown().await;

diff --git a/tuic-server/src/io.rs b/tuic-server/src/io.rs
@@ -6,8 +6,7 @@ const BUFFER_SIZE: usize = 8 * 1024;
 
 pub async fn exchange_tcp(
     a: &mut tuic_quinn::Connect,
-    b: &mut tokio::net::TcpStream,
-    timeout: Duration,
+    b: &mut tokio::net::TcpStream
 ) -> (usize, usize, Option<eyre::Error>) {
     let mut a2b = [0u8; BUFFER_SIZE];
     let mut b2a = [0u8; BUFFER_SIZE];
@@ -16,15 +15,9 @@ pub async fn exchange_tcp(
     let mut b2a_num = 0;
 
     let mut last_err = None;
-    let mut timeout = tokio::time::interval(timeout);
-    timeout.reset();
 
     loop {
         tokio::select! {
-            _ = timeout.tick() => {
-                last_err = Some(eyre::eyre!("TCP stream timeout"));
-                break;
-            },
             a2b_res = a.recv.read(&mut a2b) => match a2b_res {
                 Ok(Some(num)) => {
                     a2b_num += num;