backup/Clash.Meta
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: 调整dns interface与adapter部分

Browse Source
This commit is contained in:
MetaCubeX
2022-06-05 12:52:29 +08:00
parent 4ad0294655
commit 6e03773134
4 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dns/client.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"crypto/tls"
"fmt"
"github.com/Dreamacro/clash/tunnel"
"go.uber.org/atomic"
"net"
"net/netip"
@@ -55,14 +56,16 @@ func (c *client) ExchangeContext(ctx context.Context, m *D.Msg) (*D.Msg, error)
}
var conn net.Conn
if c.proxyAdapter != "" {
conn, err = dialContextWithProxyAdapter(ctx, c.proxyAdapter, network, ip, c.port, options...)
if err == errProxyNotFound {
options = append(options[:0], dialer.WithInterface(c.proxyAdapter), dialer.WithRoutingMark(0))
if c.proxyAdapter == "" {
conn, err = dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port), options...)
} else {
_, ok := tunnel.Proxies()[c.proxyAdapter]
if ok {
conn, err = dialContextWithProxyAdapter(ctx, c.proxyAdapter, network, ip, c.port, options...)
} else {
options = append(options, dialer.WithInterface(c.proxyAdapter))
conn, err = dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port), options...)
}
} else {
conn, err = dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port), options...)
}
if err != nil {