Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DoH性能问题、DoH下AAAA重新过滤、DNS查询分组订阅 #2212

Merged
merged 2 commits into from
Feb 5, 2020
Merged

DoH性能问题、DoH下AAAA重新过滤、DNS查询分组订阅 #2212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d520bc2
fix(#2211): problem that AAAA query returns A result
mzz2017 Feb 4, 2020
be9ce7f
feat/fix: dns query subscriptions group by A and AAAA. fix problem th…
mzz2017 Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Next Next commit
fix(#2211): problem that AAAA query returns A result
  • Loading branch information
@mzz2017
mzz2017 committed Feb 4, 2020
commit d520bc2b569ab3dd4bee7a23539f07fb5fc5696d
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.DS_Store
bazel-*
.idea
9 changes: 8 additions & 1 deletion app/dns/dohdns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down