From ab13073ce45e78e357cbed65c030401e0a6b1cab Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Sat, 13 Nov 2021 22:32:23 +0000 Subject: [PATCH] fix bug introduced in adding tcp keep alive adjustment --- transport/internet/system_dialer.go | 2 +- transport/internet/system_listener.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/transport/internet/system_dialer.go b/transport/internet/system_dialer.go index a696f26d3..578e434d2 100644 --- a/transport/internet/system_dialer.go +++ b/transport/internet/system_dialer.go @@ -64,7 +64,7 @@ func (d *DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest ne }, nil } goStdKeepAlive := time.Duration(0) - if sockopt.TcpKeepAliveIdle != 0 { + if sockopt != nil && sockopt.TcpKeepAliveIdle != 0 { goStdKeepAlive = time.Duration(-1) } dialer := &net.Dialer{ diff --git a/transport/internet/system_listener.go b/transport/internet/system_listener.go index 56c5d7ece..a6a7ee902 100644 --- a/transport/internet/system_listener.go +++ b/transport/internet/system_listener.go @@ -50,7 +50,7 @@ func (dl *DefaultListener) Listen(ctx context.Context, addr net.Addr, sockopt *S network = addr.Network() address = addr.String() lc.Control = getControlFunc(ctx, sockopt, dl.controllers) - if sockopt.TcpKeepAliveIdle != 0 { + if sockopt != nil && sockopt.TcpKeepAliveIdle != 0 { lc.KeepAlive = time.Duration(-1) } case *net.UnixAddr: