daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* dnsforward: refactor code for default DNS servers logic

Browse Source
This commit is contained in:
Simon Zolin
2019-10-31 12:32:14 +03:00
parent 8bf75b54a4
commit 9b8cccdfcf
4 changed files with 39 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dnsforward/dnsforward_http.go
View File

@@ -5,7 +5,6 @@ import (
"fmt"
"net"
"net/http"
"runtime"
"strconv"
"strings"
@@ -15,12 +14,6 @@ import (
"github.com/miekg/dns"
)
var defaultDNS = []string{
"https://1.1.1.1/dns-query",
"https://1.0.0.1/dns-query",
}
var defaultBootstrap = []string{"1.1.1.1", "1.0.0.1"}
func httpError(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) {
text := fmt.Sprintf(format, args...)
log.Info("DNS: %s %s: %s", r.Method, r.URL, text)
@@ -58,14 +51,7 @@ func (s *Server) handleSetUpstreamConfig(w http.ResponseWriter, r *http.Request)
}
newconf := FilteringConfig{}
newconf.UpstreamDNS = defaultDNS
if runtime.GOARCH == "mips" || runtime.GOARCH == "mipsle" {
// Use plain DNS on MIPS, encryption is too slow
newconf.UpstreamDNS = []string{"1.1.1.1", "1.0.0.1"}
}
if len(req.Upstreams) != 0 {
newconf.UpstreamDNS = req.Upstreams
}
newconf.UpstreamDNS = req.Upstreams
// bootstrap servers are plain DNS only
for _, host := range req.BootstrapDNS {
@@ -74,10 +60,7 @@ func (s *Server) handleSetUpstreamConfig(w http.ResponseWriter, r *http.Request)
return
}
}
newconf.BootstrapDNS = defaultBootstrap
if len(req.BootstrapDNS) != 0 {
newconf.BootstrapDNS = req.BootstrapDNS
}
newconf.BootstrapDNS = req.BootstrapDNS
newconf.AllServers = req.AllServers
err = s.Reconfigure2(newconf)