dns

commit b141f1193309066d69c8a1759da0d6cf4d6d60b7
parent 9ecb07389b456761ee8a4e23e62be9f58b030937
Author: Oliver Lowe <o@olowe.co>
Date:   Sat, 18 Dec 2021 14:49:52 +1100

gofmt

Diffstat:
M
cmd/recursor/cache.go
 | 
2
+-
M
cmd/recursor/recursor_test.go
 | 
2
+-
M
cmd/recursor/resolve.go
 | 
2
+-
M
dns.go
 | 
6
+++---
M
dns_test.go
 | 
24
++++++++++++------------
M
server.go
 | 
4
++--
M
server_test.go
 | 
6
+++---

7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/cmd/recursor/cache.go b/cmd/recursor/cache.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"sync"
 	"golang.org/x/net/dns/dnsmessage"
+	"sync"
 )
 
 var cache = struct {
diff --git a/cmd/recursor/recursor_test.go b/cmd/recursor/recursor_test.go
@@ -33,7 +33,7 @@ func compareMsg(want, got dnsmessage.Message) error {
 	if len(want.Answers) != len(got.Answers) {
 		return fmt.Errorf("mismatched answer count")
 	}
-	if (len(want.Answers) == 0 || len(got.Answers) == 0) {
+	if len(want.Answers) == 0 || len(got.Answers) == 0 {
 		return fmt.Errorf("unsupported comparison of empty answer messages")
 	}
 	wantaddr, ok := want.Answers[0].Body.(*dnsmessage.AAAAResource)
diff --git a/cmd/recursor/resolve.go b/cmd/recursor/resolve.go
@@ -30,7 +30,7 @@ func isIPv6(ip net.IP) bool {
 func filterRRs(rrs []dnsmessage.Resource, n dnsmessage.Name, t dnsmessage.Type) []dnsmessage.Resource {
 	var matches []dnsmessage.Resource
 	for _, r := range rrs {
-		if (r.Header.Name == n && r.Header.Type == t) {
+		if r.Header.Name == n && r.Header.Type == t {
 			matches = append(matches, r)
 		}
 	}
diff --git a/dns.go b/dns.go
@@ -94,7 +94,7 @@ func newID() uint16 {
 // The exchange is unencrypted using UDP.
 func Ask(q dnsmessage.Question, addr string) (dnsmessage.Message, error) {
 	qmsg := dnsmessage.Message{
-		Header: dnsmessage.Header{ID: newID()},
+		Header:    dnsmessage.Header{ID: newID()},
 		Questions: []dnsmessage.Question{q},
 	}
 	return Exchange(qmsg, addr)
@@ -104,7 +104,7 @@ func Ask(q dnsmessage.Question, addr string) (dnsmessage.Message, error) {
 // The exchange is unencrypted using TCP.
 func AskTCP(q dnsmessage.Question, addr string) (dnsmessage.Message, error) {
 	qmsg := dnsmessage.Message{
-		Header: dnsmessage.Header{ID: newID()},
+		Header:    dnsmessage.Header{ID: newID()},
 		Questions: []dnsmessage.Question{q},
 	}
 	return ExchangeTCP(qmsg, addr)
@@ -114,7 +114,7 @@ func AskTCP(q dnsmessage.Question, addr string) (dnsmessage.Message, error) {
 // The exchange is encrypted using DNS over TLS.
 func AskTLS(q dnsmessage.Question, addr string) (dnsmessage.Message, error) {
 	qmsg := dnsmessage.Message{
-		Header: dnsmessage.Header{ID: newID()},
+		Header:    dnsmessage.Header{ID: newID()},
 		Questions: []dnsmessage.Question{q},
 	}
 	return ExchangeTLS(qmsg, addr)
diff --git a/dns_test.go b/dns_test.go
@@ -11,24 +11,24 @@ import (
 var testq = dnsmessage.Question{Name: dnsmessage.MustNewName("www.example.com."), Type: dnsmessage.TypeA, Class: dnsmessage.ClassINET}
 
 func resolveBadly(w ResponseWriter, qmsg *dnsmessage.Message) {
-		rmsg := dnsmessage.Message{
-			Header: dnsmessage.Header{
-				ID:       qmsg.Header.ID + 69,
-				Response: false,
-				RCode:    dnsmessage.RCodeNameError,
-			},
-			Questions: qmsg.Questions,
-		}
-		w.WriteMsg(rmsg)
+	rmsg := dnsmessage.Message{
+		Header: dnsmessage.Header{
+			ID:       qmsg.Header.ID + 69,
+			Response: false,
+			RCode:    dnsmessage.RCodeNameError,
+		},
+		Questions: qmsg.Questions,
+	}
+	w.WriteMsg(rmsg)
 }
 
 func resolveWrongQuestion(w ResponseWriter, qmsg *dnsmessage.Message) {
 	wrongq := dnsmessage.Question{Name: dnsmessage.MustNewName("blabla.example.org."), Type: dnsmessage.TypeNS, Class: dnsmessage.ClassCHAOS}
 	rmsg := dnsmessage.Message{
 		Header: dnsmessage.Header{
-			ID:       qmsg.Header.ID,
-			Response: true,
-			RCode:    dnsmessage.RCodeSuccess,
+			ID:            qmsg.Header.ID,
+			Response:      true,
+			RCode:         dnsmessage.RCodeSuccess,
 			Authoritative: true,
 		},
 		Questions: []dnsmessage.Question{wrongq},
diff --git a/server.go b/server.go
@@ -6,8 +6,8 @@ import (
 )
 
 type Zone struct {
-	Name dnsmessage.Name
-	SOA dnsmessage.SOAResource
+	Name      dnsmessage.Name
+	SOA       dnsmessage.SOAResource
 	Resources []dnsmessage.Resource
 }
 
diff --git a/server_test.go b/server_test.go
@@ -4,8 +4,8 @@ import (
 	"crypto/rand"
 	"io"
 	"net"
-	"time"
 	"testing"
+	"time"
 )
 
 func TestServer(t *testing.T) {
@@ -67,11 +67,11 @@ func BenchmarkPacketVsStream(b *testing.B) {
 	addr := "127.0.0.1:51113"
 	var networks = []string{"udp", "tcp"}
 	for _, net := range networks {
-		go func(){
+		go func() {
 			b.Fatal(ListenAndServe(net, addr, nil))
 		}()
 		b.Run(net, func(b *testing.B) {
-			for i := 0; i<= b.N; i++ {
+			for i := 0; i <= b.N; i++ {
 				if net == "udp" {
 					if rmsg, err := Ask(testq, addr); err != nil {
 						b.Log(rmsg)