Merge remote-tracking branch 'upstream/main' into dns-hosts

This commit is contained in:
j2rong4cn 2025-05-16 17:13:08 +08:00
commit a87e96b773
9 changed files with 29 additions and 71 deletions

View file

@ -248,21 +248,6 @@ func (s *DNS) LookupIP(domain string, option dns.IPOption) ([]net.IP, uint32, er
return nil, 0, dns.ErrEmptyResponse
}
// LookupHosts implements dns.HostsLookup.
func (s *DNS) LookupHosts(domain string) *net.Address {
domain = strings.TrimSuffix(domain, ".")
if domain == "" {
return nil
}
// Normalize the FQDN form query
addrs, err := s.hosts.Lookup(domain, *s.ipOption)
if err != nil || len(addrs) == 0 {
return nil
}
errors.LogInfo(s.ctx, "domain replaced: ", domain, " -> ", addrs[0].String())
return &addrs[0]
}
func (s *DNS) sortClients(domain string) []*Client {
clients := make([]*Client, 0, len(s.clients))
clientUsed := make([]bool, len(s.clients))