lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 15:36:41 -05:00
Code Issues Releases Wiki Activity

fix bug introduced in adding tcp keep alive adjustment

Browse Source
This commit is contained in:
Shelikhoo 2021-11-13 22:32:23 +00:00 committed by Xiaokang Wang
parent 1a3d6eeca8
commit 3e42fc417b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transport/internet/system_dialer.go
View File

@ -64,7 +64,7 @@ func (d *DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest ne
}, nil }, nil
} }
goStdKeepAlive := time.Duration(0) goStdKeepAlive := time.Duration(0)
if sockopt.TcpKeepAliveIdle != 0 { if sockopt != nil && sockopt.TcpKeepAliveIdle != 0 {
goStdKeepAlive = time.Duration(-1) goStdKeepAlive = time.Duration(-1)
} }
dialer := &net.Dialer{ dialer := &net.Dialer{

2
transport/internet/system_listener.go
View File

@ -50,7 +50,7 @@ func (dl *DefaultListener) Listen(ctx context.Context, addr net.Addr, sockopt *S
network = addr.Network() network = addr.Network()
address = addr.String() address = addr.String()
lc.Control = getControlFunc(ctx, sockopt, dl.controllers) lc.Control = getControlFunc(ctx, sockopt, dl.controllers)
if sockopt.TcpKeepAliveIdle != 0 { if sockopt != nil && sockopt.TcpKeepAliveIdle != 0 {
lc.KeepAlive = time.Duration(-1) lc.KeepAlive = time.Duration(-1)
} }
case *net.UnixAddr: case *net.UnixAddr: