4 Commits

Author SHA1 Message Date
2e8f91b1af fix .lan 2020-06-29 18:17:47 -07:00
1049057f69 Set the recursion available flag 2020-06-23 02:16:56 -07:00
0622e00f64 Add JSON tags 2020-06-23 02:16:56 -07:00
c0f98d4a25 DNS changes
go mod tidy
2020-06-23 02:16:53 -07:00

View File

@ -172,8 +172,6 @@ func (m measurement) String() string {
}
func (s *Server) probeUpstreamLatency() {
if !s.once {
s.once = true
upstreams := s.upstreams()
results := make([]measurement, len(upstreams))
var wg sync.WaitGroup
@ -201,7 +199,7 @@ func (s *Server) probeUpstreamLatency() {
sort.Slice(results, func(i, j int) bool {
return results[i].rtt < results[j].rtt
})
log.Printf("probe results: %v %v", s.once, results)
log.Printf("probe results: %v", results)
for idx, result := range results {
upstreams[idx] = result.upstream
}
@ -209,7 +207,6 @@ func (s *Server) probeUpstreamLatency() {
defer s.upstreamMu.Unlock()
s.upstream = upstreams
}
}
func (s *Server) hostByName(n lcHostname) (string, bool) {
s.mu.Lock()
@ -480,6 +477,7 @@ func (s *Server) handleInternal(w dns.ResponseWriter, r *dns.Msg) {
if err == errEmpty {
m := new(dns.Msg)
m.SetReply(r)
m.RecursionAvailable = true
w.WriteMsg(m)
return
}
@ -488,6 +486,7 @@ func (s *Server) handleInternal(w dns.ResponseWriter, r *dns.Msg) {
if rr != nil {
m := new(dns.Msg)
m.SetReply(r)
m.RecursionAvailable = true
m.Answer = append(m.Answer, rr)
w.WriteMsg(m)
return
@ -495,6 +494,7 @@ func (s *Server) handleInternal(w dns.ResponseWriter, r *dns.Msg) {
// Send an authoritative NXDOMAIN for local:
m := new(dns.Msg)
m.SetReply(r)
m.RecursionAvailable = true
m.SetRcode(r, dns.RcodeNameError)
w.WriteMsg(m)
}
@ -550,6 +550,7 @@ func (s *Server) resolveSubname(domain string, q dns.Question) (dns.RR, error) {
name := strings.TrimSuffix(q.Name, ".")
name = strings.TrimSuffix(name, "."+string(s.domain)) // trim server domain
name = strings.TrimSuffix(name, "."+strings.TrimSuffix(domain, "."+string(s.domain))) // trim function domain
name = strings.TrimSuffix(name, ".lan") // trim function domain
if ip, ok := s.subname(domain, name); ok {
if q.Qtype == dns.TypeA && ip.IPv4.To4() != nil {
return dns.NewRR(q.Name + " 3600 IN A " + ip.IPv4.String())
@ -582,6 +583,7 @@ func (s *Server) subnameHandler(hostname lcHostname) func(w dns.ResponseWriter,
if err == errEmpty {
m := new(dns.Msg)
m.SetReply(r)
m.RecursionAvailable = true
w.WriteMsg(m)
return
}
@ -591,6 +593,7 @@ func (s *Server) subnameHandler(hostname lcHostname) func(w dns.ResponseWriter,
s.promInc("local", r)
m := new(dns.Msg)
m.SetReply(r)
m.RecursionAvailable = true
m.Answer = append(m.Answer, rr)
w.WriteMsg(m)
return
@ -601,6 +604,7 @@ func (s *Server) subnameHandler(hostname lcHostname) func(w dns.ResponseWriter,
s.promInc("local", r)
m := new(dns.Msg)
m.SetReply(r)
m.RecursionAvailable = true
m.SetRcode(r, dns.RcodeNameError)
w.WriteMsg(m)
return