lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

internal/dns: fix staticcheck issues

Browse Source 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
This commit is contained in:
Matt Layher 2020-05-09 17:02:06 -04:00
parent b8c40958e8
commit 9f6257b046
No known key found for this signature in database
GPG Key ID: 77BFE531397EDE94
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/dns/dns.go
View File

@ -327,7 +327,7 @@ func isLocalInAddrArpa(q string) bool {
return local return local
} }
var sentinelEmpty = errors.New("no answers") var errEmpty = errors.New("no answers")
func (s *Server) resolve(q dns.Question) (rr dns.RR, err error) { func (s *Server) resolve(q dns.Question) (rr dns.RR, err error) {
if q.Qclass != dns.ClassINET { if q.Qclass != dns.ClassINET {
@ -350,7 +350,7 @@ func (s *Server) resolve(q dns.Question) (rr dns.RR, err error) {
if q.Qtype == dns.TypeA { if q.Qtype == dns.TypeA {
return dns.NewRR(q.Name + " 3600 IN A " + host) return dns.NewRR(q.Name + " 3600 IN A " + host)
} }
return nil, sentinelEmpty return nil, errEmpty
} }
} }
if q.Qtype == dns.TypePTR { if q.Qtype == dns.TypePTR {
@ -373,7 +373,7 @@ func (s *Server) handleInternal(w dns.ResponseWriter, r *dns.Msg) {
} }
rr, err := s.resolve(r.Question[0]) rr, err := s.resolve(r.Question[0])
if err != nil { if err != nil {
if err == sentinelEmpty { if err == errEmpty {
m := new(dns.Msg) m := new(dns.Msg)
m.SetReply(r) m.SetReply(r)
w.WriteMsg(m) w.WriteMsg(m)
@ -457,7 +457,7 @@ func (s *Server) resolveSubname(hostname string, q dns.Question) (dns.RR, error)
if q.Qtype == dns.TypeA { if q.Qtype == dns.TypeA {
return dns.NewRR(q.Name + " 3600 IN A " + host) return dns.NewRR(q.Name + " 3600 IN A " + host)
} }
return nil, sentinelEmpty return nil, errEmpty
} }
if ip, ok := s.subname(hostname, name); ok { if ip, ok := s.subname(hostname, name); ok {
@ -467,7 +467,7 @@ func (s *Server) resolveSubname(hostname string, q dns.Question) (dns.RR, error)
if q.Qtype == dns.TypeAAAA && ip.To4() == nil { if q.Qtype == dns.TypeAAAA && ip.To4() == nil {
return dns.NewRR(q.Name + " 3600 IN AAAA " + ip.String()) return dns.NewRR(q.Name + " 3600 IN AAAA " + ip.String())
} }
return nil, sentinelEmpty return nil, errEmpty
} }
} }
return nil, nil return nil, nil
@ -481,7 +481,7 @@ func (s *Server) subnameHandler(hostname string) func(w dns.ResponseWriter, r *d
rr, err := s.resolveSubname(hostname, r.Question[0]) rr, err := s.resolveSubname(hostname, r.Question[0])
if err != nil { if err != nil {
if err == sentinelEmpty { if err == errEmpty {
m := new(dns.Msg) m := new(dns.Msg)
m.SetReply(r) m.SetReply(r)
w.WriteMsg(m) w.WriteMsg(m)

3
internal/dns/dns_test.go
View File

@ -15,7 +15,6 @@
package dns package dns
import ( import (
"bytes"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net" "net"
@ -412,7 +411,7 @@ func TestLocalhost(t *testing.T) {
if _, ok := a.(*dns.AAAA); !ok { if _, ok := a.(*dns.AAAA); !ok {
t.Fatalf("unexpected response type: got %T, want dns.A", a) t.Fatalf("unexpected response type: got %T, want dns.A", a)
} }
if got, want := a.(*dns.AAAA).AAAA, (net.ParseIP("::1")); !bytes.Equal(got, want) { if got, want := a.(*dns.AAAA).AAAA, (net.ParseIP("::1")); !got.Equal(want) {
t.Fatalf("unexpected response IP: got %v, want %v", got, want) t.Fatalf("unexpected response IP: got %v, want %v", got, want)
} }
}) })