Backups/mihomo
1
0
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2026-10-10 04:03:11 +08:00
Code Issues Wiki Activity

fix: domain resolve logic in zerotier outbound

Browse Source
This commit is contained in:
wwqgtxx
2026-08-02 01:31:49 +08:00
parent 9a9c4c6eb0
commit 7ac597bd46
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adapter/outbound/zerotier.go
+15 -15
View File
@@ -1084,16 +1084,17 @@ func (z *ZeroTier) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.C
remoteResolver := z.resolver
z.stateMu.RUnlock()
var conn net.Conn
if metadata.Resolved() && remoteResolver == nil {
conn, err = (zeroTierNetDialer{zeroTier: z}).DialContext(ctx, "tcp", metadata.RemoteAddress())
} else {
if !metadata.Resolved() || remoteResolver != nil {
r := resolver.DefaultResolver
if remoteResolver != nil {
r = remoteResolver
}
options := z.DialOptions()
options = append(options, dialer.WithResolver(r), dialer.WithNetDialer(zeroTierNetDialer{zeroTier: z}))
options = append(options, dialer.WithResolver(r))
options = append(options, dialer.WithNetDialer(zeroTierNetDialer{zeroTier: z}))
conn, err = dialer.NewDialer(options...).DialContext(ctx, "tcp", metadata.RemoteAddress())
} else {
conn, err = (zeroTierNetDialer{zeroTier: z}).DialContext(ctx, "tcp", metadata.AddrPort().String())
}
if err != nil {
return nil, err
@@ -1126,21 +1127,20 @@ func (z *ZeroTier) ListenPacketContext(ctx context.Context, metadata *C.Metadata
}
func (z *ZeroTier) ResolveUDP(ctx context.Context, metadata *C.Metadata) error {
if metadata.Host == "" {
return nil
}
z.stateMu.RLock()
remoteResolver := z.resolver
z.stateMu.RUnlock()
r := resolver.DefaultResolver
if remoteResolver != nil {
r = remoteResolver
if (!metadata.Resolved() || remoteResolver != nil) && metadata.Host != "" {
r := resolver.DefaultResolver
if remoteResolver != nil {
r = remoteResolver
}
ip, err := resolveIPWithResolver(ctx, metadata.Host, z.prefer, r)
if err != nil {
return fmt.Errorf("can't resolve ip: %w", err)
}
metadata.DstIP = ip
}
address, err := resolveIPWithResolver(ctx, metadata.Host, z.prefer, r)
if err != nil {
return fmt.Errorf("can't resolve IP: %w", err)
}
metadata.DstIP = address
return nil
}