github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix system dialer init

pull/298/merge
Darien Raymond 2017-05-02 00:28:06 +02:00
parent c5aa4acb35
commit 9594243ee2
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transport/internet/system_dialer.go
View File

@ -9,7 +9,7 @@ import (
) )
var ( var (
effectiveSystemDialer SystemDialer effectiveSystemDialer SystemDialer = DefaultSystemDialer{}
) )
type SystemDialer interface { type SystemDialer interface {
@ -19,7 +19,7 @@ type SystemDialer interface {
type DefaultSystemDialer struct { 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{ dialer := &net.Dialer{
Timeout: time.Second * 60, Timeout: time.Second * 60,
DualStack: true, 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. // Caller must ensure there is no race condition.
func UseAlternativeSystemDialer(dialer SystemDialer) { func UseAlternativeSystemDialer(dialer SystemDialer) {
if dialer == nil { if dialer == nil {
effectiveSystemDialer = &DefaultSystemDialer{} effectiveSystemDialer = DefaultSystemDialer{}
} }
effectiveSystemDialer = dialer effectiveSystemDialer = dialer
} }
func init() {
UseAlternativeSystemDialer(nil)
}