dandri/dns-over-https
1
0 Fork 0
mirror of https://github.com/m13253/dns-over-https.git synced 2026-10-23 19:32:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #110 from gdm85/fix/simplify

Browse Source 
Simplify doDNSQuery call
This commit is contained in:
Star Brilliant authored and GitHub committed 2021-05-15 12:16:35 +00:00
2 parents 56a01679ad 8a13f085a6
commit f172a7b7fb
1 file changed
+5 -6
Download Patch File Download Diff File Expand all files Collapse all files
doh-server/server.go
+5 -6
View File
@@ -268,8 +268,7 @@ func (s *Server) handlerFunc(w http.ResponseWriter, r *http.Request) {
req = s.patchRootRD(req) req = s.patchRootRD(req)
var err error err := s.doDNSQuery(ctx, req)
req, err = s.doDNSQuery(ctx, req)
if err != nil { if err != nil {
jsondns.FormatError(w, fmt.Sprintf("DNS query failure (%s)", err.Error()), 503) jsondns.FormatError(w, fmt.Sprintf("DNS query failure (%s)", err.Error()), 503)
return return
@@ -340,7 +339,7 @@ func (s *Server) indexQuestionType(msg *dns.Msg, qtype uint16) int {
return -1 return -1
} }
func (s *Server) doDNSQuery(ctx context.Context, req *DNSRequest) (resp *DNSRequest, err error) { func (s *Server) doDNSQuery(ctx context.Context, req *DNSRequest) (err error) {
numServers := len(s.conf.Upstream) numServers := len(s.conf.Upstream)
for i := uint(0); i < s.conf.Tries; i++ { for i := uint(0); i < s.conf.Tries; i++ {
req.currentUpstream = s.conf.Upstream[rand.Intn(numServers)] req.currentUpstream = s.conf.Upstream[rand.Intn(numServers)]
@@ -350,7 +349,7 @@ func (s *Server) doDNSQuery(ctx context.Context, req *DNSRequest) (resp *DNSRequ
switch t { switch t {
default: default:
log.Printf("invalid DNS type %q in upstream %q", t, upstream) log.Printf("invalid DNS type %q in upstream %q", t, upstream)
return nil, &configError{"invalid DNS type"} return &configError{"invalid DNS type"}
// Use DNS-over-TLS (DoT) if configured to do so // Use DNS-over-TLS (DoT) if configured to do so
case "tcp-tls": case "tcp-tls":
req.response, _, err = s.tcpClientTLS.ExchangeContext(ctx, req.request, upstream) req.response, _, err = s.tcpClientTLS.ExchangeContext(ctx, req.request, upstream)
@@ -375,9 +374,9 @@ func (s *Server) doDNSQuery(ctx context.Context, req *DNSRequest) (resp *DNSRequ
} }
if err == nil { if err == nil {
return req, nil return nil
} }
log.Printf("DNS error from upstream %s: %s\n", req.currentUpstream, err.Error()) log.Printf("DNS error from upstream %s: %s\n", req.currentUpstream, err.Error())
} }
return req, err return err
} }