Finish implementing IPSECKEY

Remaining tests and unpack for IPSECKEY.

dns_test.go

@@ -511,7 +511,6 @@ func TestCopy(t *testing.T) {
 }
 
 func TestPackIPSECKEY(t *testing.T) {
-	// TODO(miek): finish
 	tests := []string{
 		"38.2.0.192.in-addr.arpa. 7200 IN     IPSECKEY ( 10 1 2 192.0.2.38 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )",
 		"38.2.0.192.in-addr.arpa. 7200 IN     IPSECKEY ( 10 0 2 .  AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )",
@@ -520,6 +519,20 @@ func TestPackIPSECKEY(t *testing.T) {
 		"0.d.4.0.3.0.e.f.f.f.3.f.0.1.2.0 7200 IN     IPSECKEY ( 10 2 2 2001:0DB8:0:8002::2000:1 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )",
 	}
 	buf := make([]byte, 1024)
-	rr, _ := NewRR(tests[0])
-	PackRR(rr, buf, 0, nil, false)
+	for _, t1 := range tests {
+		rr, _ := NewRR(t1)
+		off, e := PackRR(rr, buf, 0, nil, false)
+		if e != nil {
+			t.Logf("failed to pack IPSECKEY %s: %s\n", e, t1)
+			t.Fail()
+			continue
+		}
+
+		rr, _, e = UnpackRR(buf[:off], 0)
+		if e != nil {
+			t.Logf("failed to unpack IPSECKEY %s: %s\n", e, t1)
+			t.Fail()
+		}
+		t.Logf("%s\n", rr)
+	}
 }

msg.go

@@ -1044,6 +1044,12 @@ func unpackStructValue(val reflect.Value, msg []byte, off int) (off1 int, err er
 				}
 				fv.Set(reflect.ValueOf(edns))
 			case `dns:"a"`:
+				if val.Type().String() == "dns.IPSECKEY" {
+					// Field(2) is GatewayType, must be 1
+					if val.Field(2).Uint() != 1 {
+						continue
+					}
+				}
 				if off == lenrd {
 					break // dyn. update
 				}
@@ -1053,6 +1059,12 @@ func unpackStructValue(val reflect.Value, msg []byte, off int) (off1 int, err er
 				fv.Set(reflect.ValueOf(net.IPv4(msg[off], msg[off+1], msg[off+2], msg[off+3])))
 				off += net.IPv4len
 			case `dns:"aaaa"`:
+				if val.Type().String() == "dns.IPSECKEY" {
+					// Field(2) is GatewayType, must be 2
+					if val.Field(2).Uint() != 2 {
+						continue
+					}
+				}
 				if off == lenrd {
 					break
 				}
@@ -1249,6 +1261,13 @@ func unpackStructValue(val reflect.Value, msg []byte, off int) (off1 int, err er
 			case `dns:"cdomain-name"`:
 				fallthrough
 			case `dns:"domain-name"`:
+				if val.Type().String() == "dns.IPSECKEY" {
+					// Field(2) is GatewayType, 1 and 2 or used for addresses
+					x := val.Field(2).Uint()
+					if x == 1 || x == 2 {
+						continue
+					}
+				}
 				if off == lenmsg {
 					// zero rdata foo, OK for dyn. updates
 					break

types.go

@@ -1678,6 +1678,7 @@ var typeToRR = map[uint16]func() RR{
 	TypeEID:        func() RR { return new(EID) },
 	TypeHINFO:      func() RR { return new(HINFO) },
 	TypeHIP:        func() RR { return new(HIP) },
+	TypeIPSECKEY:   func() RR { return new(IPSECKEY) },
 	TypeKX:         func() RR { return new(KX) },
 	TypeL32:        func() RR { return new(L32) },
 	TypeL64:        func() RR { return new(L64) },