This commit is contained in:
Miek Gieben 2012-01-12 23:17:34 +01:00
parent 9b48d4b899
commit 0509df509e
6 changed files with 48 additions and 48 deletions

View File

@ -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
}
}
}

8
dns.go
View File

@ -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) {

View File

@ -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)

View File

@ -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
}

View File

@ -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()
}
}

View File

@ -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