From 335845a9b2ffb3ec22474d586d2f98d3a0f65929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E6=89=87=E6=BB=91=E7=BF=94=E7=BF=BC?= Date: Thu, 20 Mar 2025 19:21:21 +0800 Subject: [PATCH] DNS: Ensure order for DNS server match (#4510) Fixes https://github.com/XTLS/Xray-core/issues/4508 --- app/dns/dns.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/dns/dns.go b/app/dns/dns.go index db59f292..bc544a5a 100644 --- a/app/dns/dns.go +++ b/app/dns/dns.go @@ -4,6 +4,7 @@ package dns import ( "context" "fmt" + "sort" "strings" "sync" @@ -250,7 +251,11 @@ func (s *DNS) sortClients(domain string) []*Client { // Priority domain matching hasMatch := false - for _, match := range s.domainMatcher.Match(domain) { + MatchSlice := s.domainMatcher.Match(domain) + sort.Slice(MatchSlice, func(i, j int) bool { + return MatchSlice[i] < MatchSlice[j] + }) + for _, match := range MatchSlice { info := s.matcherInfos[match] client := s.clients[info.clientIdx] domainRule := client.domains[info.domainRuleIdx]