From fda412a151bbd815e4186f082c398ac8a7f92cf3 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 17 Nov 2014 12:06:06 +0000
Subject: [PATCH] refactor: rename badly named function makeAddressReply
 handles both A and AAAA records

---
 nameserver/dns.go         | 2 +-
 nameserver/mdns_server.go | 2 +-
 nameserver/server.go      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nameserver/dns.go b/nameserver/dns.go
index bd0466e0..ed5041f5 100644
--- a/nameserver/dns.go
+++ b/nameserver/dns.go
@@ -24,7 +24,7 @@ func makeReply(r *dns.Msg, as []dns.RR) *dns.Msg {
 	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))
 	header := makeHeader(r, q)
 	count := 0
diff --git a/nameserver/mdns_server.go b/nameserver/mdns_server.go
index 7cc25fae..1ea725d0 100644
--- a/nameserver/mdns_server.go
+++ b/nameserver/mdns_server.go
@@ -54,7 +54,7 @@ func (s *MDNSServer) Start(ifi *net.Interface) error {
 		if len(r.Answer) == 0 && len(r.Question) > 0 {
 			q := r.Question[0]
 			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 {
 					Warning.Printf("Error writing to %s", w)
 				}
diff --git a/nameserver/server.go b/nameserver/server.go
index bd492a57..ddbab9e4 100644
--- a/nameserver/server.go
+++ b/nameserver/server.go
@@ -40,7 +40,7 @@ func queryHandler(zone Zone, mdnsClient *MDNSClient) dns.HandlerFunc {
 		Debug.Printf("Local query: %+v", q)
 		if q.Qtype == dns.TypeA {
 			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)
 			} else {
 				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
 					if len(replies) > 0 {
-						responseMsg = makeAReply(r, &q, replies)
+						responseMsg = makeAddressReply(r, &q, replies)
 					} else {
 						responseMsg = makeDNSFailResponse(r)
 					}
@@ -105,7 +105,7 @@ func notUsHandler() dns.HandlerFunc {
 		var responseMsg *dns.Msg
 		if q.Qtype == dns.TypeA {
 			if addrs, err := net.LookupIP(q.Name); err == nil {
-				responseMsg = makeAReply(r, &q, addrs)
+				responseMsg = makeAddressReply(r, &q, addrs)
 			} else {
 				responseMsg = makeDNSFailResponse(r)
 				Debug.Print("Failed fallback lookup ", err)