From 44a4dd9888ffdb0701ff6b8d0e266641a8df8561 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 26 Mar 2015 18:36:00 +0000 Subject: [PATCH] cosmetic: go vet --- nameserver/dns.go | 6 +++--- nameserver/mdns_client_test.go | 4 ++-- nameserver/mdns_server.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nameserver/dns.go b/nameserver/dns.go index fe98ca6c..a848243e 100644 --- a/nameserver/dns.go +++ b/nameserver/dns.go @@ -42,12 +42,12 @@ func makeAddressReply(r *dns.Msg, q *dns.Question, addrs []net.IP) *dns.Msg { switch q.Qtype { case dns.TypeA: if ip4 := addr.To4(); ip4 != nil { - answers[count] = &dns.A{*header, addr} + answers[count] = &dns.A{Hdr: *header, A: addr} count++ } case dns.TypeAAAA: if ip4 := addr.To4(); ip4 == nil { - answers[count] = &dns.AAAA{*header, addr} + answers[count] = &dns.AAAA{Hdr: *header, A: addr} count++ } } @@ -59,7 +59,7 @@ func makePTRReply(r *dns.Msg, q *dns.Question, names []string) *dns.Msg { answers := make([]dns.RR, len(names)) header := makeHeader(r, q) for i, name := range names { - answers[i] = &dns.PTR{*header, name} + answers[i] = &dns.PTR{Hdr: *header, Ptr: name} } return makeReply(r, answers) } diff --git a/nameserver/mdns_client_test.go b/nameserver/mdns_client_test.go index b3629d8d..de6abd08 100644 --- a/nameserver/mdns_client_test.go +++ b/nameserver/mdns_client_test.go @@ -48,7 +48,7 @@ func minimalServer(w dns.ResponseWriter, req *dns.Msg) { m.SetReply(req) hdr := dns.RR_Header{Name: m.Question[0].Name, Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: 3600} - a := &dns.A{hdr, testAddr} + a := &dns.A{Hdr: hdr, A: testAddr} m.Answer = append(m.Answer, a) sendAnswer(m) } else if req.Question[0].Qtype == dns.TypePTR && req.Question[0].Name == testInAddr { @@ -56,7 +56,7 @@ func minimalServer(w dns.ResponseWriter, req *dns.Msg) { m.SetReply(req) hdr := dns.RR_Header{Name: m.Question[0].Name, Rrtype: dns.TypePTR, Class: dns.ClassINET, Ttl: 3600} - a := &dns.PTR{hdr, successTestName} + a := &dns.PTR{Hdr: hdr, Ptr: successTestName} m.Answer = append(m.Answer, a) sendAnswer(m) } diff --git a/nameserver/mdns_server.go b/nameserver/mdns_server.go index 997b034b..2c7f5cbb 100644 --- a/nameserver/mdns_server.go +++ b/nameserver/mdns_server.go @@ -104,7 +104,7 @@ func (s *MDNSServer) makeHandler(qtype uint16, lookup LookupFunc) dns.HandlerFun Debug.Printf("[mdns msgid %d] Found local answer to mDNS query %s", r.MsgHdr.Id, q.Name) if err := s.sendResponse(m); err != nil { - Warning.Printf("[mdns msgid %d] Error writing to %s", + Warning.Printf("[mdns msgid %d] Error writing to %v", r.MsgHdr.Id, s.sendconn) } } else {