Merge pull request #154 from andrewtj/atj-update-misc

DNS Update Misc

msg.go

@@ -897,6 +897,9 @@ func unpackStructValue(val reflect.Value, msg []byte, off int) (off1 int, err er
 	var lenrd int
 	lenmsg := len(msg)
 	for i := 0; i < val.NumField(); i++ {
+		if lenrd != 0 && lenrd == off {
+			break
+		}
 		if off > lenmsg {
 			return lenmsg, &Error{"bad offset unpacking"}
 		}

update.go

@@ -104,12 +104,18 @@ func (u *Msg) Insert(rr []RR) {
 
 // RemoveRRset creates a dynamic update packet that deletes an RRset, see RFC 2136 section 2.5.2.
 func (u *Msg) RemoveRRset(rr []RR) {
-	u.Ns = make([]RR, len(rr))
-	for i, r := range rr {
-		u.Ns[i] = r
-		u.Ns[i].Header().Class = ClassANY
-		u.Ns[i].Header().Rdlength = 0
-		u.Ns[i].Header().Ttl = 0
+	m := make(map[RR_Header]struct{})
+	u.Ns = make([]RR, 0, len(rr))
+	for _, r := range rr {
+		h := *r.Header().copyHeader()
+		h.Class = ClassANY
+		h.Ttl = 0
+		h.Rdlength = 0
+		if _, ok := m[h]; ok {
+			continue
+		}
+		m[h] = struct{}{}
+		u.Ns = append(u.Ns, &ANY{h})
 	}
 }
 

update_test.go

@@ -1,6 +1,7 @@
 package dns
 
 import (
+	"bytes"
 	"testing"
 )
 
@@ -34,3 +35,71 @@ func TestDynamicUpdateUnpack(t *testing.T) {
 		t.Fail()
 	}
 }
+
+func TestDynamicUpdateZeroRdataUnpack(t *testing.T) {
+	m := new(Msg)
+	rr := &RR_Header{Name: ".", Rrtype: 0, Class: 1, Ttl: ^uint32(0), Rdlength: 0}
+	m.Answer = []RR{rr, rr, rr, rr, rr}
+	m.Ns = m.Answer
+	for n, s := range TypeToString {
+		rr.Rrtype = n
+		bytes, err := m.Pack()
+		if err != nil {
+			t.Logf("failed to pack %s: %v", s, err)
+			t.Fail()
+			continue
+		}
+		if err := new(Msg).Unpack(bytes); err != nil {
+			t.Logf("failed to unpack %s: %v", s, err)
+			t.Fail()
+		}
+	}
+}
+
+func TestRemoveRRset(t *testing.T) {
+	// Should add a zero data RR in Class ANY with a TTL of 0
+	// for each set mentioned in the RRs provided to it.
+	rr, err := NewRR(". 100 IN A 127.0.0.1")
+	if err != nil {
+		t.Fatalf("Error constructing RR: %v", err)
+	}
+	m := new(Msg)
+	m.Ns = []RR{&RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY, Ttl: 0, Rdlength: 0}}
+	expectstr := m.String()
+	expect, err := m.Pack()
+	if err != nil {
+		t.Fatalf("Error packing expected msg: %v", err)
+	}
+
+	m.Ns = nil
+	m.RemoveRRset([]RR{rr})
+	actual, err := m.Pack()
+	if err != nil {
+		t.Fatalf("Error packing actual msg: %v", err)
+	}
+	if !bytes.Equal(actual, expect) {
+		tmp := new(Msg)
+		if err := tmp.Unpack(actual); err != nil {
+			t.Fatalf("Error unpacking actual msg: %v", err)
+		}
+		t.Logf("Expected msg:\n%s", expectstr)
+		t.Logf("Actual msg:\n%v", tmp)
+		t.Fail()
+	}
+
+	m.Ns = nil
+	m.RemoveRRset([]RR{rr, rr})
+	actual, err = m.Pack()
+	if err != nil {
+		t.Fatalf("Error packing actual msg: %v", err)
+	}
+	if !bytes.Equal(actual, expect) {
+		tmp := new(Msg)
+		if err := tmp.Unpack(actual); err != nil {
+			t.Fatalf("Error unpacking actual msg: %v", err)
+		}
+		t.Logf("Expected msg:\n%v", expectstr)
+		t.Logf("Actual msg:\n%v", tmp)
+		t.Fail()
+	}
+}