From 9594243ee25ef4ca06a77a9d285ccf0658327f78 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Tue, 2 May 2017 00:28:06 +0200 Subject: [PATCH] fix system dialer init --- transport/internet/system_dialer.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/transport/internet/system_dialer.go b/transport/internet/system_dialer.go index 324280b45..9cc7755a6 100644 --- a/transport/internet/system_dialer.go +++ b/transport/internet/system_dialer.go @@ -9,7 +9,7 @@ import ( ) var ( - effectiveSystemDialer SystemDialer + effectiveSystemDialer SystemDialer = DefaultSystemDialer{} ) type SystemDialer interface { @@ -19,7 +19,7 @@ type SystemDialer interface { type DefaultSystemDialer struct { } -func (v *DefaultSystemDialer) Dial(ctx context.Context, src v2net.Address, dest v2net.Destination) (net.Conn, error) { +func (DefaultSystemDialer) Dial(ctx context.Context, src v2net.Address, dest v2net.Destination) (net.Conn, error) { dialer := &net.Dialer{ Timeout: time.Second * 60, DualStack: true, @@ -64,11 +64,7 @@ func (v *SimpleSystemDialer) Dial(ctx context.Context, src v2net.Address, dest v // Caller must ensure there is no race condition. func UseAlternativeSystemDialer(dialer SystemDialer) { if dialer == nil { - effectiveSystemDialer = &DefaultSystemDialer{} + effectiveSystemDialer = DefaultSystemDialer{} } effectiveSystemDialer = dialer } - -func init() { - UseAlternativeSystemDialer(nil) -}