Low hanging fruit of missing RR types (i.e. NINFO, RKEY, CDS & TA).

TODO: Unit tests. (The zone reader at the very least)

diff --git a/ldns/rr.h b/ldns/rr.h
index 7324c060cf88fcc90f6847c07903c5c0d2193a3a..db9fd07cf71d80bfd363b3a66b6d04ca4b3a5008 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -182,8 +182,14 @@ enum ldns_enum_rr_type
        /** draft-ietf-dane-protocol */
        LDNS_RR_TYPE_TLSA = 52,
 
+       /** draft-reid-dnsext-zs */
+       LDNS_RR_TYPE_NINFO = 56,
+       /** draft-reid-dnsext-rkey */
+       LDNS_RR_TYPE_RKEY = 57,
         /** draft-ietf-dnsop-trust-history */
         LDNS_RR_TYPE_TALINK = 58,
+       /** draft-barwood-dnsop-ds-publis */
+       LDNS_RR_TYPE_CDS = 59,
 
        LDNS_RR_TYPE_SPF = 99,
 
@@ -207,6 +213,8 @@ enum ldns_enum_rr_type
        /**  any type (wildcard) */
        LDNS_RR_TYPE_ANY = 255,
 
+       /** DNSSEC Trust Authorities */
+       LDNS_RR_TYPE_TA = 32768,
        /* RFC 4431, 5074, DNSSEC Lookaside Validation */
        LDNS_RR_TYPE_DLV = 32769,
 

diff --git a/rr.c b/rr.c
index 33d1d53d8a86315386a7148e0324a84413e99816..3069bcbee01509a69c004ec7e4195da77746c06b 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -2074,10 +2074,14 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
 {LDNS_RR_TYPE_NULL, "TYPE53", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE54", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE55", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_NULL, "TYPE56", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_NULL, "TYPE57", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+       /* 56 */
+       {LDNS_RR_TYPE_NINFO, "NINFO", 1, 0, NULL, LDNS_RDF_TYPE_STR, LDNS_RR_NO_COMPRESS, 0 },
+       /* 57 */
+       {LDNS_RR_TYPE_RKEY, "RKEY", 4, 4, type_key_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 58 */
-{LDNS_RR_TYPE_TALINK, "TALINK", 2, 2, type_talink_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 2 },
+       {LDNS_RR_TYPE_TALINK, "TALINK", 2, 2, type_talink_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 2 },
+       /* 59 */
+       {LDNS_RR_TYPE_CDS, "CDS", 4, 4, type_ds_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE59", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE60", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE61", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
@@ -2279,6 +2283,7 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
  */
 {LDNS_RR_TYPE_TSIG, "TSIG", 7, 7, type_tsig_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 /* split in array, no longer contiguous */
+{LDNS_RR_TYPE_TA, "TA", 4, 4, type_ds_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_DLV, "DLV", 4, 4, type_ds_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 }
 };
 /** \endcond */