From ee13f7a562668e0e456eca1ae3b227b2fd7880dd Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Sat, 12 Jan 2019 09:44:51 +0100 Subject: [PATCH] fix bind addr check --- transport/internet/system_dialer.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transport/internet/system_dialer.go b/transport/internet/system_dialer.go index c3a079766..d0ab52bb0 100644 --- a/transport/internet/system_dialer.go +++ b/transport/internet/system_dialer.go @@ -40,7 +40,7 @@ func resolveSrcAddr(network net.Network, src net.Address) net.Addr { } func hasBindAddr(sockopt *SocketConfig) bool { - return len(sockopt.BindAddress) > 0 && sockopt.BindPort > 0 + return sockopt != nil && len(sockopt.BindAddress) > 0 && sockopt.BindPort > 0 } func (d *DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest net.Destination, sockopt *SocketConfig) (net.Conn, error) { @@ -67,7 +67,7 @@ func (d *DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest ne } dialer := &net.Dialer{ - Timeout: time.Second * 60, + Timeout: time.Second * 16, DualStack: true, LocalAddr: resolveSrcAddr(dest.Network, src), }