github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

ignore if domain already lookup failed

pull/2037/head
weaving118 2019-11-21 02:32:09 +08:00
parent 1345185b81
commit debb7f0c44
No known key found for this signature in database
GPG Key ID: D1D2B8A0B60A4CBE
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/dns/server.go
View File

@ -295,12 +295,13 @@ func (s *Server) lookupIPInternal(domain string, option IPOption) ([]net.IP, err
} }
var lastErr error var lastErr error
var matchedClient Client
if s.domainMatcher != nil { if s.domainMatcher != nil {
idx := s.domainMatcher.Match(domain) idx := s.domainMatcher.Match(domain)
if idx > 0 { if idx > 0 {
ns := s.clients[s.domainIndexMap[idx]] matchedClient = s.clients[s.domainIndexMap[idx]]
newError("domain matched, direct lookup ip for domain ", domain, " at ", ns.Name()).WriteToLog() newError("domain matched, direct lookup ip for domain ", domain, " at ", matchedClient.Name()).WriteToLog()
ips, err := s.queryIPTimeout(s.domainIndexMap[idx], ns, domain, option) ips, err := s.queryIPTimeout(s.domainIndexMap[idx], matchedClient, domain, option)
if len(ips) > 0 { if len(ips) > 0 {
return ips, nil return ips, nil
} }
@ -308,15 +309,19 @@ func (s *Server) lookupIPInternal(domain string, option IPOption) ([]net.IP, err
return nil, err return nil, err
} }
if err != nil { if err != nil {
newError("failed to lookup ip for domain ", domain, " at server ", ns.Name()).Base(err).WriteToLog() newError("failed to lookup ip for domain ", domain, " at server ", matchedClient.Name()).Base(err).WriteToLog()
lastErr = err lastErr = err
} }
} }
} }
for idx, client := range s.clients { for idx, client := range s.clients {
newError("try to lookup ip for domain ", domain, " at server ", client.Name(), " idx:", idx).AtDebug().WriteToLog() if client == matchedClient {
newError("domain ", domain, " at server ", client.Name(), " idx:", idx, " already lookup failed, just ignore").AtDebug().WriteToLog()
continue
}
newError("try to lookup ip for domain ", domain, " at server ", client.Name(), " idx:", idx).AtDebug().WriteToLog()
ips, err := s.queryIPTimeout(uint32(idx), client, domain, option) ips, err := s.queryIPTimeout(uint32(idx), client, domain, option)
if len(ips) > 0 { if len(ips) > 0 {
newError("lookup ip for domain ", domain, " success: ", ips, " at server ", client.Name(), " idx:", idx).AtDebug().WriteToLog() newError("lookup ip for domain ", domain, " success: ", ips, " at server ", client.Name(), " idx:", idx).AtDebug().WriteToLog()