cosmetic: go vet

This commit is contained in:
Matthias Radestock committed 2015-03-26 18:36:00 +00:00
1 parent 7a4a88aeb9
commit 44a4dd9888
3 files changed
+6 -6

No files matched your search

+3 -3
View File
@@ -42,12 +42,12 @@ func makeAddressReply(r *dns.Msg, q *dns.Question, addrs []net.IP) *dns.Msg {
switch q.Qtype { switch q.Qtype {
case dns.TypeA: case dns.TypeA:
if ip4 := addr.To4(); ip4 != nil { if ip4 := addr.To4(); ip4 != nil {
answers[count] = &dns.A{*header, addr} answers[count] = &dns.A{Hdr: *header, A: addr}
count++ count++
} }
case dns.TypeAAAA: case dns.TypeAAAA:
if ip4 := addr.To4(); ip4 == nil { if ip4 := addr.To4(); ip4 == nil {
answers[count] = &dns.AAAA{*header, addr} answers[count] = &dns.AAAA{Hdr: *header, A: addr}
count++ count++
} }
} }
@@ -59,7 +59,7 @@ func makePTRReply(r *dns.Msg, q *dns.Question, names []string) *dns.Msg {
answers := make([]dns.RR, len(names)) answers := make([]dns.RR, len(names))
header := makeHeader(r, q) header := makeHeader(r, q)
for i, name := range names { for i, name := range names {
answers[i] = &dns.PTR{*header, name} answers[i] = &dns.PTR{Hdr: *header, Ptr: name}
} }
return makeReply(r, answers) return makeReply(r, answers)
} }
+2 -2
View File
@@ -48,7 +48,7 @@ func minimalServer(w dns.ResponseWriter, req *dns.Msg) {
m.SetReply(req) m.SetReply(req)
hdr := dns.RR_Header{Name: m.Question[0].Name, Rrtype: dns.TypeA, hdr := dns.RR_Header{Name: m.Question[0].Name, Rrtype: dns.TypeA,
Class: dns.ClassINET, Ttl: 3600} Class: dns.ClassINET, Ttl: 3600}
a := &dns.A{hdr, testAddr} a := &dns.A{Hdr: hdr, A: testAddr}
m.Answer = append(m.Answer, a) m.Answer = append(m.Answer, a)
sendAnswer(m) sendAnswer(m)
} else if req.Question[0].Qtype == dns.TypePTR && req.Question[0].Name == testInAddr { } 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) m.SetReply(req)
hdr := dns.RR_Header{Name: m.Question[0].Name, Rrtype: dns.TypePTR, hdr := dns.RR_Header{Name: m.Question[0].Name, Rrtype: dns.TypePTR,
Class: dns.ClassINET, Ttl: 3600} Class: dns.ClassINET, Ttl: 3600}
a := &dns.PTR{hdr, successTestName} a := &dns.PTR{Hdr: hdr, Ptr: successTestName}
m.Answer = append(m.Answer, a) m.Answer = append(m.Answer, a)
sendAnswer(m) sendAnswer(m)
} }
+1 -1
View File
@@ -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", Debug.Printf("[mdns msgid %d] Found local answer to mDNS query %s",
r.MsgHdr.Id, q.Name) r.MsgHdr.Id, q.Name)
if err := s.sendResponse(m); err != nil { 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) r.MsgHdr.Id, s.sendconn)
} }
} else { } else {