Merge branch 'master' into dev

2023-12-28 17:33:48 +08:00
parent 590a6ae6ff e1ae379048
commit 4e1a70ec6d
5 changed files with 13 additions and 5 deletions
--- a/dialer/kcp/dialer.go
+++ b/dialer/kcp/dialer.go
@ -149,7 +149,9 @@ func (d *kcpDialer) initSession(ctx context.Context, addr net.Addr, conn net.Pac
 	smuxConfig.Version = config.SmuxVer
 	smuxConfig.MaxReceiveBuffer = config.SmuxBuf
 	smuxConfig.MaxStreamBuffer = config.StreamBuf
-	smuxConfig.KeepAliveInterval = time.Duration(config.KeepAlive) * time.Second
+	if config.KeepAlive > 0 {
+		smuxConfig.KeepAliveInterval = time.Duration(config.KeepAlive) * time.Second
+	}
 	var cc net.Conn = kcpconn
 	if !config.NoComp {
 		cc = kcp_util.CompStreamConn(kcpconn)