NSEC3 op draft-11 typecodes.

Added DHCID type.

diff --git a/ldns/rr.h b/ldns/rr.h
index a3e03ecbacf188aeb00a14ce79eabfa3d79c6dc5..1b1412ee9299ecf02b4de6841f618180990ab0c5 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -32,8 +32,8 @@
 /** The bytes TTL, CLASS and length use up in an rr */
 #define LDNS_RR_OVERHEAD       10
 
-/* The first 48 fields are 'common' and can be referenced instantly */
-#define LDNS_RDATA_FIELD_DESCRIPTORS_COMMON 50
+/* The first fields are 'common' and can be referenced instantly */
+#define LDNS_RDATA_FIELD_DESCRIPTORS_COMMON 51
 
 
 
@@ -169,12 +169,12 @@ enum ldns_enum_rr_type
        LDNS_RR_TYPE_RRSIG = 46,
        LDNS_RR_TYPE_NSEC = 47,      
        LDNS_RR_TYPE_DNSKEY = 48,
+       LDNS_RR_TYPE_DHCID = 49,
+
+        /* TODO: Temporary assume type code 50, 51 (from draft-11) */
+       LDNS_RR_TYPE_NSEC3 = 50,
+       LDNS_RR_TYPE_NSEC3PARAMS = 51,
 
-        /* TODO: No type code yet, assume 49 */
-/*
-       LDNS_RR_TYPE_NSEC3 = 49,
-       LDNS_RR_TYPE_NSEC3PARAMS = 50,
-*/
        LDNS_RR_TYPE_UINFO = 100,
        LDNS_RR_TYPE_UID = 101,
        LDNS_RR_TYPE_GID = 102,
@@ -190,8 +190,9 @@ enum ldns_enum_rr_type
        /**  any type (wildcard) */
        LDNS_RR_TYPE_ANY = 255,
 
+       /* type codes from nsec3 experimental phase
        LDNS_RR_TYPE_NSEC3 = 65324,
-       LDNS_RR_TYPE_NSEC3PARAMS = 65325,
+       LDNS_RR_TYPE_NSEC3PARAMS = 65325, */
        LDNS_RR_TYPE_FIRST = 0,
        LDNS_RR_TYPE_LAST  = 65535,
        LDNS_RR_TYPE_COUNT = LDNS_RR_TYPE_LAST - LDNS_RR_TYPE_FIRST + 1

diff --git a/rr.c b/rr.c
index d0336650f273682db3c53e400a348b1e4de6c9bc..630c2cc6c81672058a432321269c147888c6c700 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -1675,6 +1675,9 @@ static const ldns_rdf_type type_rrsig_wireformat[] = {
 static const ldns_rdf_type type_nsec_wireformat[] = {
        LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_NSEC
 };
+static const ldns_rdf_type type_dhcid_wireformat[] = {
+       LDNS_RDF_TYPE_B64
+};
 /* nsec3 is some vars, followed by same type of data of nsec */
 static const ldns_rdf_type type_nsec3_wireformat[] = {
 /*     LDNS_RDF_TYPE_NSEC3_VARS, LDNS_RDF_TYPE_NSEC3_NEXT_OWNER, LDNS_RDF_TYPE_NSEC*/
@@ -1810,9 +1813,9 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
        {LDNS_RR_TYPE_NSEC, "NSEC", 2, 2, type_nsec_wireformat, LDNS_RDF_TYPE_NSEC, LDNS_RR_NO_COMPRESS, 1 },
        /* 48 */
        {LDNS_RR_TYPE_DNSKEY, "DNSKEY", 4, 4, type_dnskey_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_ANY, "TYPE49", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_ANY, "TYPE50", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_ANY, "TYPE51", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_DHCID, "DHCID", 1, 1, type_dhcid_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_NSEC3, "NSEC3", 6, 6, type_nsec3_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_NSEC3PARAMS, "NSEC3PARAM", 4, 4, type_nsec3params_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_ANY, "TYPE52", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_ANY, "TYPE53", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_ANY, "TYPE54", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
@@ -2011,9 +2014,7 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
 {LDNS_RR_TYPE_ANY, "TYPE247", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_ANY, "TYPE248", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_ANY, "TYPE249", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_TSIG, "TSIG", 8, 9, type_tsig_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_NSEC3, "NSEC3", 6, 6, type_nsec3_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_NSEC3PARAMS, "NSEC3PARAM", 4, 4, type_nsec3params_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 }
+{LDNS_RR_TYPE_TSIG, "TSIG", 8, 9, type_tsig_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 }
 };
 /** \endcond */