Switch from SVCB to IDELEG(65280)

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 9337b23574eea6a9b97a0966d4014d5fb5f30755..b68e329386b30da93bff0c2cc5e0ec003ed9fe85 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -2618,11 +2618,11 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 
 
         iq->dp->namelen = delnamelen;
-        iq->qchase.qtype = 64;
+        iq->qchase.qtype = LDNS_RR_TYPE_IDELEG;
                iq->qchase.qname = delname;
         iq->qchase.qname_len = delnamelen;
 
-        iq->qinfo_out.qtype = 64;
+        iq->qinfo_out.qtype = LDNS_RR_TYPE_IDELEG;
         iq->qinfo_out.qname = delname;
         iq->qinfo_out.qname_len = delnamelen;
     } else if (root_len > 0 && iq->deleg_state == 2) { //in this state create deleg prime query
@@ -2640,11 +2640,11 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
         memcpy(delname, deleg_wireformat, deleg_len);
         memcpy(delname+deleg_len, iq->qchase.qname, iq->qchase.qname_len); 
 
-        iq->qchase.qtype = 64;
+        iq->qchase.qtype = LDNS_RR_TYPE_IDELEG;
                iq->qchase.qname = delname;
         iq->qchase.qname_len = delnamelen;
 
-        iq->qinfo_out.qtype = 64;
+        iq->qinfo_out.qtype = LDNS_RR_TYPE_IDELEG;
         iq->qinfo_out.qname = delname;
         iq->qinfo_out.qname_len = delnamelen;
     }
@@ -3302,7 +3302,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
        //         make sure you identify those answers correclty and treat
        //         them the same way as referrals below.
        /* handle each of the type cases */
-    uint16_t SVCB_QTYPE = 64;
+    // uint16_t SVCB_QTYPE = LDNS_RR_TYPE_IDELEG;
 
     //check wether it was a deleg query
     uint8_t deleg_wireformat[] = {6, 95, 100, 101, 108, 101, 103}; //{06}_deleg

diff --git a/sldns/rrdef.h b/sldns/rrdef.h
index f277fd67ab5a836cc4b0afac3589f99ba69c2ef0..35b7a57a7bba8988eade4e5231c080d2d4536f82 100644 (file)
--- a/sldns/rrdef.h
+++ b/sldns/rrdef.h
@@ -234,6 +234,9 @@ enum sldns_enum_rr_type
        /* RFC 4431, 5074, DNSSEC Lookaside Validation */
        LDNS_RR_TYPE_DLV = 32769,
 
+       /* draft-homburg-deleg-inctremental-deleg */
+       LDNS_RR_TYPE_IDELEG = 65280,
+
        /* type codes from nsec3 experimental phase
        LDNS_RR_TYPE_NSEC3 = 65324,
        LDNS_RR_TYPE_NSEC3PARAMS = 65325, */