cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-09 23:20:28 +00:00
Code Releases Activity

use DialContext

Browse Source
This commit is contained in:
Arceliar 2021-06-12 05:58:14 -05:00
parent acdc3dd3c0
commit 3815b13ad5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/tcp.go
View File

@ -270,7 +270,9 @@ func (t *tcp) call(saddr string, options tcpOptions, sintf string) {
if err != nil { if err != nil {
return return
} }
conn, err = dialer.Dial("tcp", saddr) ctx, done := context.WithTimeout(context.Background(), default_timeout)
conn, err = dialer.(proxy.ContextDialer).DialContext(ctx, "tcp", saddr)
done()
if err != nil { if err != nil {
return return
} }
@ -292,7 +294,6 @@ func (t *tcp) call(saddr string, options tcpOptions, sintf string) {
} }
dialer := net.Dialer{ dialer := net.Dialer{
Control: t.tcpContext, Control: t.tcpContext,
Timeout: time.Second * 5,
} }
if sintf != "" { if sintf != "" {
dialer.Control = t.getControl(sintf) dialer.Control = t.getControl(sintf)
@ -338,7 +339,9 @@ func (t *tcp) call(saddr string, options tcpOptions, sintf string) {
} }
} }
} }
conn, err = dialer.Dial("tcp", dst.String()) ctx, done := context.WithTimeout(context.Background(), default_timeout)
conn, err = dialer.DialContext(ctx, "tcp", dst.String())
done()
if err != nil { if err != nil {
t.links.core.log.Debugf("Failed to dial %s: %s", callproto, err) t.links.core.log.Debugf("Failed to dial %s: %s", callproto, err)
return return