Implement TKEY record type

diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 7bddd5579b1e401f31d2f91afcf027618a66ff25..e2a164f27f9776ec9fd45fe14cef5eaf2ce094dd 100644 (file)
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -424,6 +424,18 @@ string EUI64RecordContent::getZoneRepresentation() const
 
 /* EUI64 end */
 
+boilerplate_conv(TKEY, QType::TKEY,
+                 conv.xfrLabel(d_algo);
+                 conv.xfr32BitInt(d_inception);
+                 conv.xfr32BitInt(d_expiration);
+                 conv.xfr16BitInt(d_mode);
+                 conv.xfr16BitInt(d_error);
+                 conv.xfr16BitInt(d_keysize);
+                 if (d_keysize>0) conv.xfrBlobNoSpaces(d_key, d_keysize);
+                 conv.xfr16BitInt(d_othersize);
+                 if (d_othersize>0) conv.xfrBlobNoSpaces(d_other, d_othersize);
+                 )
+TKEYRecordContent::TKEYRecordContent() : DNSRecordContent(QType::TKEY) {}
 
 uint16_t DNSKEYRecordContent::getTag()
 {
@@ -515,6 +527,7 @@ void reportOtherTypes()
    TLSARecordContent::report();
    DLVRecordContent::report();
    DNSRecordContent::regist(QClass::ANY, QType::TSIG, &TSIGRecordContent::make, &TSIGRecordContent::make, "TSIG");
+   DNSRecordContent::regist(QClass::ANY, QType::TKEY, &TKEYRecordContent::make, &TKEYRecordContent::make, "TKEY");
    //TSIGRecordContent::report();
    OPTRecordContent::report();
    EUI48RecordContent::report();

diff --git a/pdns/dnsrecords.hh b/pdns/dnsrecords.hh
index 893f71a9f08596001ca826bc8a55f5fd3726e471..2fc59ae91426638f5f8c6e25e032af60c7efe8c2 100644 (file)
--- a/pdns/dnsrecords.hh
+++ b/pdns/dnsrecords.hh
@@ -542,6 +542,25 @@ private:
  uint8_t d_eui64[8];
 };
 
+class TKEYRecordContent : public DNSRecordContent
+{
+public:
+  TKEYRecordContent();
+  includeboilerplate(TKEY)
+
+  // storage for the bytes
+  string d_algo;
+  uint32_t d_inception;
+  uint32_t d_expiration;
+  uint16_t d_mode;
+  uint16_t d_error;
+  uint16_t d_keysize;
+  string d_key;
+  uint16_t d_othersize;
+  string d_other;
+private:
+};
+
 #define boilerplate(RNAME, RTYPE)                                                                         \
 RNAME##RecordContent::DNSRecordContent* RNAME##RecordContent::make(const DNSRecord& dr, PacketReader& pr) \
 {                                                                                                  \

diff --git a/pdns/qtype.hh b/pdns/qtype.hh
index ba83eb298e900fdf678714a6aa3d8526bdc3b723..7d78374e0bab956e2e8ba28fc99c7c8834a2a50f 100644 (file)
--- a/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@ -82,7 +82,7 @@ public:
 #undef DS
   enum typeenum {A=1, NS=2, CNAME=5, SOA=6, MR=9, PTR=12, HINFO=13, MX=15, TXT=16, RP=17, AFSDB=18, SIG=24, KEY=25, AAAA=28, LOC=29, SRV=33, NAPTR=35, KX=36,
                 CERT=37, A6=38, DNAME=39, OPT=41, DS=43, SSHFP=44, IPSECKEY=45, RRSIG=46, NSEC=47, DNSKEY=48, DHCID=49, NSEC3=50, NSEC3PARAM=51,
-     TLSA=52, SPF=99, EUI48=108, EUI64=109, TSIG=250, IXFR=251, AXFR=252, MAILB=253, MAILA=254, ANY=255, URL=256, MBOXFW=257, CURL=258, ADDR=259, DLV=32769} types;
+     TLSA=52, SPF=99, EUI48=108, EUI64=109, TKEY=249, TSIG=250, IXFR=251, AXFR=252, MAILB=253, MAILA=254, ANY=255, URL=256, MBOXFW=257, CURL=258, ADDR=259, DLV=32769} types;
   typedef pair<string,uint16_t> namenum;
   static vector<namenum> names;
 
@@ -156,6 +156,7 @@ private:
       qtype_insert("SPF", 99);
       qtype_insert("EUI48", 108);
       qtype_insert("EUI64", 109);
+      qtype_insert("TKEY", 249);
 //      qtype_insert("TSIG", 250);
       qtype_insert("IXFR", 251);
       qtype_insert("AXFR", 252);