refactor: rename badly named function
makeAddressReply handles both A and AAAA records
This commit is contained in:
1 parent
3cc7b383ad
commit
fda412a151
3 files changed
+5
-5
No files matched your search
+1
-1
@@ -24,7 +24,7 @@ func makeReply(r *dns.Msg, as []dns.RR) *dns.Msg {
|
|||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeAReply(r *dns.Msg, q *dns.Question, addrs []net.IP) *dns.Msg {
|
func makeAddressReply(r *dns.Msg, q *dns.Question, addrs []net.IP) *dns.Msg {
|
||||||
answers := make([]dns.RR, len(addrs))
|
answers := make([]dns.RR, len(addrs))
|
||||||
header := makeHeader(r, q)
|
header := makeHeader(r, q)
|
||||||
count := 0
|
count := 0
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ func (s *MDNSServer) Start(ifi *net.Interface) error {
|
|||||||
if len(r.Answer) == 0 && len(r.Question) > 0 {
|
if len(r.Answer) == 0 && len(r.Question) > 0 {
|
||||||
q := r.Question[0]
|
q := r.Question[0]
|
||||||
if ip, err := s.zone.MatchLocal(q.Name); err == nil {
|
if ip, err := s.zone.MatchLocal(q.Name); err == nil {
|
||||||
m := makeAReply(r, &q, []net.IP{ip})
|
m := makeAddressReply(r, &q, []net.IP{ip})
|
||||||
if err = s.sendResponse(m); err != nil {
|
if err = s.sendResponse(m); err != nil {
|
||||||
Warning.Printf("Error writing to %s", w)
|
Warning.Printf("Error writing to %s", w)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ func queryHandler(zone Zone, mdnsClient *MDNSClient) dns.HandlerFunc {
|
|||||||
Debug.Printf("Local query: %+v", q)
|
Debug.Printf("Local query: %+v", q)
|
||||||
if q.Qtype == dns.TypeA {
|
if q.Qtype == dns.TypeA {
|
||||||
if ip, err := zone.MatchLocal(q.Name); err == nil {
|
if ip, err := zone.MatchLocal(q.Name); err == nil {
|
||||||
m := makeAReply(r, &q, []net.IP{ip})
|
m := makeAddressReply(r, &q, []net.IP{ip})
|
||||||
w.WriteMsg(m)
|
w.WriteMsg(m)
|
||||||
} else {
|
} else {
|
||||||
Debug.Printf("Failed lookup for %s; sending mDNS query", q.Name)
|
Debug.Printf("Failed lookup for %s; sending mDNS query", q.Name)
|
||||||
@@ -54,7 +54,7 @@ func queryHandler(zone Zone, mdnsClient *MDNSClient) dns.HandlerFunc {
|
|||||||
}
|
}
|
||||||
var responseMsg *dns.Msg
|
var responseMsg *dns.Msg
|
||||||
if len(replies) > 0 {
|
if len(replies) > 0 {
|
||||||
responseMsg = makeAReply(r, &q, replies)
|
responseMsg = makeAddressReply(r, &q, replies)
|
||||||
} else {
|
} else {
|
||||||
responseMsg = makeDNSFailResponse(r)
|
responseMsg = makeDNSFailResponse(r)
|
||||||
}
|
}
|
||||||
@@ -105,7 +105,7 @@ func notUsHandler() dns.HandlerFunc {
|
|||||||
var responseMsg *dns.Msg
|
var responseMsg *dns.Msg
|
||||||
if q.Qtype == dns.TypeA {
|
if q.Qtype == dns.TypeA {
|
||||||
if addrs, err := net.LookupIP(q.Name); err == nil {
|
if addrs, err := net.LookupIP(q.Name); err == nil {
|
||||||
responseMsg = makeAReply(r, &q, addrs)
|
responseMsg = makeAddressReply(r, &q, addrs)
|
||||||
} else {
|
} else {
|
||||||
responseMsg = makeDNSFailResponse(r)
|
responseMsg = makeDNSFailResponse(r)
|
||||||
Debug.Print("Failed fallback lookup ", err)
|
Debug.Print("Failed fallback lookup ", err)
|
||||||
|
|||||||
Reference in new issue
Block a user