mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-15 21:07:15 +03:00
Code Issues Releases Activity

Resolve conflicting changes in DNS #309 #341 (#346)

Browse Source 
Co-authored-by: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
This commit is contained in:
Jim Han
2021-03-07 15:12:50 +08:00
committed by GitHub
parent f50eff5ebb
commit d7cd71b741
3 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dns/server.go
View File

@ -30,7 +30,7 @@ type Server struct {
sync.Mutex
hosts *StaticHosts
clientIP net.IP
clients []Client // clientIdx -> Client
clients []Client // clientIdx -> Client
ctx context.Context
ipIndexMap []*MultiGeoIPMatcher // clientIdx -> *MultiGeoIPMatcher
domainRules [][]string // clientIdx -> domainRuleIdx -> DomainRule
@ -307,7 +307,7 @@ func (s *Server) queryIPTimeout(idx int, client Client, domain string, option dn
Tag: s.tag,
})
}
ctx = internet.ContextWithLookupDomain(ctx, Fqdn(domain))
ctx = internet.ContextWithLookupDomain(ctx, domain)
ips, err := client.QueryIP(ctx, domain, option)
cancel()