From 0509df509e79321652ca8b49a3ec5ffc62ea4120 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Thu, 12 Jan 2012 23:17:34 +0100 Subject: [PATCH] gofmt --- client_test.go | 38 +++++++++++++++++++------------------- dns.go | 8 ++++---- dns_test.go | 4 ++-- dnssec.go | 2 +- label_test.go | 42 +++++++++++++++++++++--------------------- update.go | 2 +- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/client_test.go b/client_test.go index a2c4e894..504b1516 100644 --- a/client_test.go +++ b/client_test.go @@ -27,7 +27,7 @@ func helloMiek(w RequestWriter, r *Msg) { func TestClientASync(t *testing.T) { HandleQueryFunc("miek.nl.", helloMiek) // All queries for miek.nl will be handled by HelloMiek - ListenAndQuery(nil, nil) // Detect if this isn't running + ListenAndQuery(nil, nil) // Detect if this isn't running m := new(Msg) m.SetQuestion("miek.nl.", TypeSOA) @@ -83,7 +83,7 @@ func TestClientTsigAXFR(t *testing.T) { if err := c.XfrReceive(m, "85.223.71.124:53"); err != nil { t.Log("Failed to setup axfr" + err.Error()) t.Fail() - return + return } for { ex := <-c.ReplyChan @@ -91,14 +91,14 @@ func TestClientTsigAXFR(t *testing.T) { if ex.Error == ErrXfrLast { break } - if ex.Error != nil { - t.Logf("Error %s\n", ex.Error.Error()) - t.Fail() - break - } - if ex.Reply.Rcode != RcodeSuccess { - break - } + if ex.Error != nil { + t.Logf("Error %s\n", ex.Error.Error()) + t.Fail() + break + } + if ex.Reply.Rcode != RcodeSuccess { + break + } } } @@ -112,7 +112,7 @@ func TestClientAXFRMultipleMessages(t *testing.T) { if err := c.XfrReceive(m, "85.223.71.124:53"); err != nil { t.Log("Failed to setup axfr" + err.Error()) t.Fail() - return + return } for { ex := <-c.ReplyChan @@ -120,13 +120,13 @@ func TestClientAXFRMultipleMessages(t *testing.T) { if ex.Error == ErrXfrLast { break } - if ex.Error != nil { - t.Logf("Error %s\n", ex.Error.Error()) - t.Fail() - break - } - if ex.Reply.Rcode != RcodeSuccess { - break - } + if ex.Error != nil { + t.Logf("Error %s\n", ex.Error.Error()) + t.Fail() + break + } + if ex.Reply.Rcode != RcodeSuccess { + break + } } } diff --git a/dns.go b/dns.go index ee5a6a2d..6d0bddc3 100644 --- a/dns.go +++ b/dns.go @@ -69,7 +69,7 @@ import ( const ( Year68 = 2 << (32 - 1) // For RFC1982 (Serial Arithmetic) calculations in 32 bits. DefaultMsgSize = 4096 // A standard default for larger than 512 packets. - UDPMsgSize = 1024 // A nice default for servers receiving UDP packets. + UDPMsgSize = 1024 // A nice default for servers receiving UDP packets. MaxMsgSize = 65536 // Largest possible DNS packet. DefaultTtl = 3600 // Default TTL. ) @@ -215,9 +215,9 @@ func (h *RR_Header) String() string { } func (h *RR_Header) Len() int { - l := len(h.Name) + 1 - l += 10 // rrtype(2) + class(2) + ttl(4) + rdlength(2) - return l + l := len(h.Name) + 1 + l += 10 // rrtype(2) + class(2) + ttl(4) + rdlength(2) + return l } func zoneMatch(pattern, zone string) (ok bool) { diff --git a/dns_test.go b/dns_test.go index 1982a718..3bcc6f70 100644 --- a/dns_test.go +++ b/dns_test.go @@ -48,8 +48,8 @@ func TestPackUnpack2(t *testing.T) { m := new(Msg) m.Extra = make([]RR, 1) m.Answer = make([]RR, 1) - dom := "miek.nl." - rr := new(RR_A) + dom := "miek.nl." + rr := new(RR_A) rr.Hdr = RR_Header{Name: dom, Rrtype: TypeA, Class: ClassINET, Ttl: 0} rr.A = net.IPv4(127, 0, 0, 1) diff --git a/dnssec.go b/dnssec.go index 45ce8ade..0e02ab4c 100644 --- a/dnssec.go +++ b/dnssec.go @@ -188,7 +188,7 @@ func (s *RR_RRSIG) Sign(k PrivateKey, rrset RRset) error { s.OrigTtl = rrset[0].Header().Ttl s.TypeCovered = rrset[0].Header().Rrtype s.TypeCovered = rrset[0].Header().Rrtype - s.Labels, _ = IsDomainName(rrset[0].Header().Name) + s.Labels, _ = IsDomainName(rrset[0].Header().Name) if strings.HasPrefix(rrset[0].Header().Name, "*") { s.Labels-- // wildcard, remove from label count } diff --git a/label_test.go b/label_test.go index 4749b556..7d10ac80 100644 --- a/label_test.go +++ b/label_test.go @@ -5,26 +5,26 @@ import ( ) func TestCompareLabels(t *testing.T) { - s1 := "www.miek.nl." - s2 := "miek.nl." - s3 := "www.bla.nl." - s4 := "nl.www.bla." - s5 := "nl" + s1 := "www.miek.nl." + s2 := "miek.nl." + s3 := "www.bla.nl." + s4 := "nl.www.bla." + s5 := "nl" - if CompareLabels(s1, s2) != 2 { - t.Logf("%s with %s should be %d", s1, s2, 2) - t.Fail() - } - if CompareLabels(s1, s3) != 1 { - t.Logf("%s with %s should be %d", s1, s3, 1) - t.Fail() - } - if CompareLabels(s3, s4) != 0 { - t.Logf("%s with %s should be %d", s3, s4, 0) - t.Fail() - } - if CompareLabels(s1, s5) != 1 { - t.Logf("%s with %s should be %d", s1, s5, 1) - t.Fail() - } + if CompareLabels(s1, s2) != 2 { + t.Logf("%s with %s should be %d", s1, s2, 2) + t.Fail() + } + if CompareLabels(s1, s3) != 1 { + t.Logf("%s with %s should be %d", s1, s3, 1) + t.Fail() + } + if CompareLabels(s3, s4) != 0 { + t.Logf("%s with %s should be %d", s3, s4, 0) + t.Fail() + } + if CompareLabels(s1, s5) != 1 { + t.Logf("%s with %s should be %d", s1, s5, 1) + t.Fail() + } } diff --git a/update.go b/update.go index 5f702bff..84fd12bb 100644 --- a/update.go +++ b/update.go @@ -39,7 +39,7 @@ func NewUpdate(zone string, class uint16) *Msg { u := new(Msg) u.MsgHdr.Response = false u.MsgHdr.Opcode = OpcodeUpdate - u.Compress = false // Seems BIND9 at least cannot handle compressed update pkgs + u.Compress = false // Seems BIND9 at least cannot handle compressed update pkgs u.Question = make([]Question, 1) u.Question[0] = Question{zone, TypeSOA, class} return u