fix(#2211): problem that AAAA query returns A result

v2ray · Feb 4, 2020 · d520bc2 · d520bc2
1 parent 5dd8571
commit d520bc2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.DS_Store
 bazel-*
+.idea
diff --git a/app/dns/dohdns.go b/app/dns/dohdns.go
@@ -185,7 +185,6 @@ func (s *DoHNameServer) Cleanup() error {
 
 func (s *DoHNameServer) updateIP(req *dnsRequest, ipRec *IPRecord) {
  elapsed := time.Since(req.start)
- newError(s.name, " got answere: ", req.domain, " ", req.reqType, " -> ", ipRec.IP, " ", elapsed).AtInfo().WriteToLog()
 
  s.Lock()
  rec := s.ips[req.domain]
@@ -198,11 +197,19 @@ func (s *DoHNameServer) updateIP(req *dnsRequest, ipRec *IPRecord) {
  updated = true
  }
  case dnsmessage.TypeAAAA:
+ addr := make([]net.Address, 0)
+ for _, ip := range ipRec.IP {
+ if len(ip.IP()) == net.IPv6len {
+ addr = append(addr, ip)
+ }
+ }
+ ipRec.IP = addr
  if isNewer(rec.AAAA, ipRec) {
  rec.AAAA = ipRec
  updated = true
  }
  }
+ newError(s.name, " got answere: ", req.domain, " ", req.reqType, " -> ", ipRec.IP, " ", elapsed).AtInfo().WriteToLog()
 
  if updated {
  s.ips[req.domain] = rec