Fix: dial tcp with context to avoid margin of error

This commit is contained in:
Dreamacro
2019-10-12 23:55:39 +08:00
parent 0cdc40beb3
commit 7c4a359a2b
14 changed files with 47 additions and 30 deletions

View File

@ -1,6 +1,7 @@
package adapters
import (
"context"
"net"
C "github.com/Dreamacro/clash/constant"
@ -10,13 +11,13 @@ type Direct struct {
*Base
}
func (d *Direct) Dial(metadata *C.Metadata) (C.Conn, error) {
func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
address := net.JoinHostPort(metadata.Host, metadata.DstPort)
if metadata.DstIP != nil {
address = net.JoinHostPort(metadata.DstIP.String(), metadata.DstPort)
}
c, err := dialTimeout("tcp", address, tcpTimeout)
c, err := dialContext(ctx, "tcp", address)
if err != nil {
return nil, err
}