- RR Type CSYNC support RFC 7477, in debug printout and config input.

git-svn-id: file:///svn/unbound/trunk@3615 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index fa0d16837661db19868d2c0ddacab8cd58b9ef4a..81b7e85729a51177a080d22a290bde53723f4076 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 8 February 2016: Wouter
        - Fix patch typo in prevuous commit for 734 from Adi Prasaja.
+       - RR Type CSYNC support RFC 7477, in debug printout and config input.
 
 29 January 2016: Wouter
        - Neater cmdline_verbose increment patch from Edgar Pettijohn.

diff --git a/sldns/rrdef.c b/sldns/rrdef.c
index a8c6229b9d2e351cff3f1988842d17806c052aec..3c501ebb0d47a7bdc4ed277f63578cc69b01f1cc 100644 (file)
--- a/sldns/rrdef.c
+++ b/sldns/rrdef.c
@@ -144,6 +144,9 @@ static const sldns_rdf_type type_dhcid_wireformat[] = {
 static const sldns_rdf_type type_talink_wireformat[] = {
        LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_DNAME
 };
+static const sldns_rdf_type type_csync_wireformat[] = {
+       LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_NSEC
+};
 /* nsec3 is some vars, followed by same type of data of nsec */
 static const sldns_rdf_type type_nsec3_wireformat[] = {
 /*     LDNS_RDF_TYPE_NSEC3_VARS, LDNS_RDF_TYPE_NSEC3_NEXT_OWNER, LDNS_RDF_TYPE_NSEC*/
@@ -361,8 +364,10 @@ static sldns_rr_descriptor rdata_field_descriptors[] = {
        {LDNS_RR_TYPE_CDS, "CDS", 4, 4, type_ds_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 60 */
        {LDNS_RR_TYPE_CDNSKEY, "CDNSKEY", 4, 4, type_dnskey_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+       /* 61 */
 {LDNS_RR_TYPE_NULL, "TYPE61", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-{LDNS_RR_TYPE_NULL, "TYPE62", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+       /* 62 */
+       {LDNS_RR_TYPE_CSYNC, "CSYNC", 3, 3, type_csync_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE63", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE64", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE65", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },

diff --git a/sldns/rrdef.h b/sldns/rrdef.h
index ab65943a59ec56991d643e7af01752480c1f06fd..8b98e05bebfed773d181bf554d60bdceb048f3f8 100644 (file)
--- a/sldns/rrdef.h
+++ b/sldns/rrdef.h
@@ -182,6 +182,8 @@ enum sldns_enum_rr_type
        LDNS_RR_TYPE_NSEC3PARAM = 51, /* RFC 5155 */
        LDNS_RR_TYPE_NSEC3PARAMS = 51,
        LDNS_RR_TYPE_TLSA = 52, /* RFC 6698 */
+       LDNS_RR_TYPE_SMIMEA = 53, /* draft-ietf-dane-smime, TLSA-like but may
+                                    be extended */
 
        LDNS_RR_TYPE_HIP = 55, /* RFC 5205 */
 
@@ -193,6 +195,7 @@ enum sldns_enum_rr_type
         LDNS_RR_TYPE_TALINK = 58,
        LDNS_RR_TYPE_CDS = 59, /** RFC 7344 */
        LDNS_RR_TYPE_CDNSKEY = 60, /** RFC 7344 */
+       LDNS_RR_TYPE_CSYNC = 62, /* RFC 7477 */
 
        LDNS_RR_TYPE_SPF = 99, /* RFC 4408 */