fix: update timeout settings for tunnel connections in client and server handshake

yosebyte · web-flow · commit ba57d1158df4 · 2025-08-18T03:16:18.000Z
diff --git a/internal/client.go b/internal/client.go
@@ -144,7 +144,7 @@ func (c *Client) tunnelHandshake() error {
 	}
 
 	c.tunnelTCPConn = tunnelTCPConn.(*net.TCPConn)
-	c.bufReader = bufio.NewReader(&conn.TimeoutReader{Conn: c.tunnelTCPConn, Timeout: c.readTimeout})
+	c.bufReader = bufio.NewReader(&conn.TimeoutReader{Conn: c.tunnelTCPConn, Timeout: 2 * reportInterval})
 	c.tunnelTCPConn.SetKeepAlive(true)
 	c.tunnelTCPConn.SetKeepAlivePeriod(reportInterval)
 
diff --git a/internal/server.go b/internal/server.go
@@ -163,7 +163,7 @@ func (s *Server) tunnelHandshake() error {
 		}
 
 		s.tunnelTCPConn = tunnelTCPConn.(*net.TCPConn)
-		s.bufReader = bufio.NewReader(&conn.TimeoutReader{Conn: s.tunnelTCPConn, Timeout: s.readTimeout})
+		s.bufReader = bufio.NewReader(&conn.TimeoutReader{Conn: s.tunnelTCPConn, Timeout: 2 * reportInterval})
 		s.tunnelTCPConn.SetKeepAlive(true)
 		s.tunnelTCPConn.SetKeepAlivePeriod(reportInterval)
 

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ func (c *Client) tunnelHandshake() error {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`c.tunnelTCPConn = tunnelTCPConn.(*net.TCPConn)`
`147`		`- c.bufReader = bufio.NewReader(&conn.TimeoutReader{Conn: c.tunnelTCPConn, Timeout: c.readTimeout})`
	`147`	`+ c.bufReader = bufio.NewReader(&conn.TimeoutReader{Conn: c.tunnelTCPConn, Timeout: 2 * reportInterval})`
`148`	`148`	`c.tunnelTCPConn.SetKeepAlive(true)`
`149`	`149`	`c.tunnelTCPConn.SetKeepAlivePeriod(reportInterval)`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func (s *Server) tunnelHandshake() error {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`s.tunnelTCPConn = tunnelTCPConn.(*net.TCPConn)`
`166`		`- s.bufReader = bufio.NewReader(&conn.TimeoutReader{Conn: s.tunnelTCPConn, Timeout: s.readTimeout})`
	`166`	`+ s.bufReader = bufio.NewReader(&conn.TimeoutReader{Conn: s.tunnelTCPConn, Timeout: 2 * reportInterval})`
`167`	`167`	`s.tunnelTCPConn.SetKeepAlive(true)`
`168`	`168`	`s.tunnelTCPConn.SetKeepAlivePeriod(reportInterval)`
`169`	`169`