From 381e450943327744fda902c209aed317d562b8e5 Mon Sep 17 00:00:00 2001 From: Meow <197331664+Meo597@users.noreply.github.com> Date: Wed, 18 Nov 2026 19:50:30 +0800 Subject: [PATCH] DNS: Add `udp+local://` support and `udp://` (remote) as well (#7420) https://github.com/XTLS/Xray-core/pull/7380#issuecomment-6977561366 Closes https://github.com/XTLS/Xray-core/issues/7321#issuecomment-6674139825 --------- Co-authored-by: Ivan Zorin --- app/dns/nameserver.go | 4 ++++ app/dns/nameserver_udp.go | 45 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/app/dns/nameserver.go b/app/dns/nameserver.go index 5112f3581..7ba3a798f 100644 --- a/app/dns/nameserver.go +++ b/app/dns/nameserver.go @@ -68,6 +68,10 @@ func NewServer(ctx context.Context, dest net.Destination, dispatcher routing.Dis return NewTCPNameServer(u, dispatcher, disableCache, serveStale, serveExpiredTTL, clientIP) case strings.EqualFold(u.Scheme, "tcp+local"): // DNS-over-TCP Local mode return NewTCPLocalNameServer(u, disableCache, serveStale, serveExpiredTTL, clientIP) + case strings.EqualFold(u.Scheme, "udp"): // UDP DNS Remote mode + return NewUDPNameServer(u, dispatcher, false, disableCache, serveStale, serveExpiredTTL, clientIP) + case strings.EqualFold(u.Scheme, "udp+local"): // UDP DNS Local mode + return NewUDPNameServer(u, dispatcher, true, disableCache, serveStale, serveExpiredTTL, clientIP) case strings.EqualFold(u.String(), "fakedns"): var fd dns.FakeDNSEngine err = core.RequireFeatures(ctx, func(fdns dns.FakeDNSEngine) { diff --git a/app/dns/nameserver_udp.go b/app/dns/nameserver_udp.go index 7761662fb..4d303a735 100644 --- a/app/dns/nameserver_udp.go +++ b/app/dns/nameserver_udp.go @@ -2,12 +2,15 @@ package dns import ( "context" + "io" + "net/url" "strings" "sync" "sync/atomic" "time" "github.com/xtls/xray-core/common" + "github.com/xtls/xray-core/common/buf" "github.com/xtls/xray-core/common/errors" "github.com/xtls/xray-core/common/net" "github.com/xtls/xray-core/common/protocol/dns" @@ -15,6 +18,8 @@ import ( "github.com/xtls/xray-core/common/task" dns_feature "github.com/xtls/xray-core/features/dns" "github.com/xtls/xray-core/features/routing" + "github.com/xtls/xray-core/transport" + "github.com/xtls/xray-core/transport/internet" "github.com/xtls/xray-core/transport/internet/udp" "golang.org/x/net/dns/dnsmessage" ) @@ -59,6 +64,46 @@ func NewClassicNameServer(address net.Destination, dispatcher routing.Dispatcher return s } +// NewUDPNameServer creates a UDP DNS client from a URL. +func NewUDPNameServer(url *url.URL, dispatcher routing.Dispatcher, local bool, disableCache bool, serveStale bool, serveExpiredTTL uint32, clientIP net.IP) (*ClassicNameServer, error) { + if url.Hostname() == "" { + return nil, errors.New("missing UDP nameserver host") + } + port := net.Port(53) + if url.Port() != "" { + var err error + if port, err = net.PortFromString(url.Port()); err != nil { + return nil, err + } + } + if local { + dispatcher = &localUDPDispatcher{dispatcher} + } + s := NewClassicNameServer(net.UDPDestination(net.ParseAddress(url.Hostname()), port), dispatcher, disableCache, serveStale, serveExpiredTTL, clientIP) + if local { + s.cacheController.name = "UDPL//" + s.address.NetAddr() + } + return s, nil +} + +type localUDPDispatcher struct { + routing.Dispatcher +} + +func (*localUDPDispatcher) Dispatch(ctx context.Context, dest net.Destination) (*transport.Link, error) { + conn, err := internet.DialSystem(ctx, dest, nil) + if err != nil { + return nil, err + } + return &transport.Link{ + Reader: &struct { + buf.Reader + io.Closer + }{buf.NewPacketReader(conn), conn}, + Writer: buf.NewWriter(conn), + }, nil +} + // Name implements Server. func (s *ClassicNameServer) Name() string { return s.cacheController.name