Backups/mihomo
1
0 Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2026-10-11 17:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: use our internal DNS resolution logic for tailscale

Browse Source
This commit is contained in:
wwqgtxx committed 2026-05-14 16:21:31 +08:00
1 parent 6ea4373eba
commit 2f11d9635f
1 file changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files
adapter/outbound/tailscale.go
+12 -12
View File
@@ -14,6 +14,7 @@ import (
N "github.com/metacubex/mihomo/common/net"
"github.com/metacubex/mihomo/component/ca"
"github.com/metacubex/mihomo/component/dialer"
"github.com/metacubex/mihomo/component/resolver"
C "github.com/metacubex/mihomo/constant"
"github.com/metacubex/mihomo/dns"
@@ -294,11 +295,16 @@ func (t *Tailscale) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.
if err = t.ensureStarted(ctx); err != nil {
return nil, err
}
address := metadata.RemoteAddress()
if err = t.checkTailscaleRoute(ctx, "tcp", address); err != nil {
return nil, err
}
conn, err := t.server.Dial(ctx, "tcp", address)
options := t.DialOptions()
options = append(options, dialer.WithResolver(t.dnsResolver))
options = append(options, dialer.WithNetDialer(dialer.NetDialerFunc(func(ctx context.Context, network, address string) (net.Conn, error) {
if err = t.checkTailscaleRoute(ctx, network, address); err != nil {
return nil, err
}
return t.server.Dial(ctx, network, address)
})))
var conn net.Conn
conn, err = dialer.NewDialer(options...).DialContext(ctx, "tcp", metadata.RemoteAddress())
if err != nil {
return nil, err
}
@@ -309,9 +315,6 @@ func (t *Tailscale) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.
}
func (t *Tailscale) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
if !t.option.UDP {
return nil, C.ErrNotSupport
}
if err = t.ensureStarted(ctx); err != nil {
return nil, err
}
@@ -330,14 +333,11 @@ func (t *Tailscale) ListenPacketContext(ctx context.Context, metadata *C.Metadat
return nil, errors.New("packet conn is nil")
}
rAddr := metadata.UDPAddr()
if rAddr == nil {
return nil, errors.New("packet destination is invalid")
}
return newPacketConn(N.NewThreadSafePacketConn(&tailscaleConnPacketConn{Conn: conn, rAddr: rAddr}), t), nil
}
func (t *Tailscale) ResolveUDP(ctx context.Context, metadata *C.Metadata) error {
if !metadata.Resolved() && metadata.Host != "" {
if metadata.Host != "" {
ip, err := t.resolveIPWithTransport(ctx, metadata.Host)
if err != nil {
return fmt.Errorf("can't resolve ip: %w", err)