xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: 调整dns interface与adapter部分

Browse source
This commit is contained in:
gVisor bot 2022-06-05 12:52:29 +08:00
parent 301796755d
commit b128d1d48d
4 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dns/client.go
View file

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

14
dns/doh.go
View file

@ -97,17 +97,11 @@ func newDoHClient(url string, r *Resolver, proxyAdapter string) *dohClient {
return nil, err return nil, err
} }
if proxyAdapter != "" { if proxyAdapter == "" {
var conn net.Conn return dialer.DialContext(ctx, "tcp", net.JoinHostPort(ip.String(), port))
conn, err = dialContextWithProxyAdapter(ctx, proxyAdapter, "tcp", ip, port) } else {
if err == errProxyNotFound { return dialContextWithProxyAdapter(ctx, proxyAdapter, "tcp", ip, port)
options := []dialer.Option{dialer.WithInterface(proxyAdapter), dialer.WithRoutingMark(0)}
conn, err = dialer.DialContext(ctx, "tcp", net.JoinHostPort(ip.String(), port), options...)
}
return conn, err
} }
return dialer.DialContext(ctx, "tcp", net.JoinHostPort(ip.String(), port))
}, },
}, },
} }

10
dns/doq.go
View file

@ -168,19 +168,15 @@ func (dc *quicClient) openSession() (quic.Connection, error) {
} }
} else { } else {
conn, err := dialContextWithProxyAdapter(context.Background(), dc.proxyAdapter, "udp", ip, port) conn, err := dialContextWithProxyAdapter(context.Background(), dc.proxyAdapter, "udp", ip, port)
if err == errProxyNotFound { if err != nil {
options := []dialer.Option{dialer.WithInterface(dc.proxyAdapter), dialer.WithRoutingMark(0)}
conn, err = dialContextWithProxyAdapter(context.Background(), dc.proxyAdapter, "udp", ip, port, options...)
if err != nil {
return nil, err
}
} else {
return nil, err return nil, err
} }
wrapConn, ok := conn.(*wrapPacketConn) wrapConn, ok := conn.(*wrapPacketConn)
if !ok { if !ok {
return nil, fmt.Errorf("quio create packet failed") return nil, fmt.Errorf("quio create packet failed")
} }
udp = wrapConn udp = wrapConn
} }

3
dns/util.go
View file

@ -3,7 +3,6 @@ package dns
import ( import (
"context" "context"
"crypto/tls" "crypto/tls"
"errors"
"fmt" "fmt"
"net" "net"
"net/netip" "net/netip"
@ -20,8 +19,6 @@ import (
D "github.com/miekg/dns" D "github.com/miekg/dns"
) )
var errProxyNotFound = errors.New("proxy adapter not found")
func putMsgToCache(c *cache.LruCache[string, *D.Msg], key string, msg *D.Msg) { func putMsgToCache(c *cache.LruCache[string, *D.Msg], key string, msg *D.Msg) {
var ttl uint32 var ttl uint32
switch { switch {