dan9i10/xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-05-08 14:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

DNS: Log rule matches and client order when finalQuery returns early (#5936)

Browse Source
This commit is contained in:
Meow
2026-04-15 20:06:13 +08:00
committed by GitHub
parent 5b91b152bb
commit 7c56b7beea
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/dns/dns.go
View File

@@ -288,6 +288,7 @@ func (s *DNS) sortClients(domain string) []*Client {
clientNames = append(clientNames, client.Name()) clientNames = append(clientNames, client.Name())
hasMatch = true hasMatch = true
if client.finalQuery { if client.finalQuery {
logDecision(s.ctx, domain, domainRules, clientNames)
return clients return clients
} }
} }
@@ -302,17 +303,13 @@ func (s *DNS) sortClients(domain string) []*Client {
clients = append(clients, client) clients = append(clients, client)
clientNames = append(clientNames, client.Name()) clientNames = append(clientNames, client.Name())
if client.finalQuery { if client.finalQuery {
logDecision(s.ctx, domain, domainRules, clientNames)
return clients return clients
} }
} }
} }
if len(domainRules) > 0 { logDecision(s.ctx, domain, domainRules, clientNames)
errors.LogDebug(s.ctx, "domain ", domain, " matches following rules: ", domainRules)
}
if len(clientNames) > 0 {
errors.LogDebug(s.ctx, "domain ", domain, " will use DNS in order: ", clientNames)
}
if len(clients) == 0 { if len(clients) == 0 {
if len(s.clients) > 0 { if len(s.clients) > 0 {
@@ -327,6 +324,15 @@ func (s *DNS) sortClients(domain string) []*Client {
return clients return clients
} }
func logDecision(ctx context.Context, domain string, domainRules []string, clientNames []string) {
if len(domainRules) > 0 {
errors.LogDebug(ctx, "domain ", domain, " matches following rules: ", domainRules)
}
if len(clientNames) > 0 {
errors.LogDebug(ctx, "domain ", domain, " will use DNS in order: ", clientNames)
}
}
func mergeQueryErrors(domain string, errs []error) error { func mergeQueryErrors(domain string, errs []error) error {
if len(errs) == 0 { if len(errs) == 0 {
return dns.ErrEmptyResponse return dns.ErrEmptyResponse