dandri/dns-over-https
1
0
Fork 0
mirror of https://github.com/m13253/dns-over-https.git synced 2026-03-30 14:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove dns.ErrTruncated according to https://github.com/miekg/dns/pull/815

Browse Source
This commit is contained in:
Star Brilliant
2018-11-28 15:31:02 +08:00
parent 01d60df9cd
commit fa2bcf74a9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doh-client/client.go
View File

@@ -273,7 +273,7 @@ func (c *Client) handlerFunc(w dns.ResponseWriter, r *dns.Msg, isTCP bool) {
} else {
reply, _, err = c.tcpClient.Exchange(r, upstream)
}
if err == nil || err == dns.ErrTruncated {
if err == nil {
w.WriteMsg(reply)
return
}

2
doh-client/ietf.go
View File

@@ -205,7 +205,7 @@ func (c *Client) parseResponseIETF(ctx context.Context, w dns.ResponseWriter, r
fullReply := new(dns.Msg)
err = fullReply.Unpack(body)
if err != nil && err != dns.ErrTruncated {
if err != nil {
log.Println(err)
req.reply.Rcode = dns.RcodeServerFailure
w.WriteMsg(req.reply)

4
doh-server/server.go
View File

@@ -251,14 +251,14 @@ func (s *Server) doDNSQuery(ctx context.Context, req *DNSRequest) (resp *DNSRequ
req.currentUpstream = s.conf.Upstream[rand.Intn(numServers)]
if !s.conf.TCPOnly {
req.response, _, err = s.udpClient.Exchange(req.request, req.currentUpstream)
if err == dns.ErrTruncated {
if err == nil && req.response != nil && req.response.Truncated {
log.Println(err)
req.response, _, err = s.tcpClient.Exchange(req.request, req.currentUpstream)
}
} else {
req.response, _, err = s.tcpClient.Exchange(req.request, req.currentUpstream)
}
if err == nil || err == dns.ErrTruncated {
if err == nil {
return req, nil
}
log.Printf("DNS error from upstream %s: %s\n", req.currentUpstream, err.Error())