[(no branch, rebasing 1880-implement-the-tkey-rr)] [(no branch, rebasing 1880-impleme...

diff --git a/src/lib/dns/rdataclass.cc b/src/lib/dns/rdataclass.cc
index b5c6107b851217206b65731e43960e24545e6048..a8f3ae20268cb887ab84a972b03c3749485e1712 100644 (file)
--- a/src/lib/dns/rdataclass.cc
+++ b/src/lib/dns/rdataclass.cc
@@ -582,6 +582,8 @@ TSIG::getOtherData() const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <string>
 
 #include <exceptions/exceptions.h>
@@ -648,6 +650,8 @@ A::compare(const Rdata&) const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <string>
 #include <sstream>
 
@@ -1282,6 +1286,8 @@ CNAME::getCname() const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <string>
 
 #include <util/buffer.h>
@@ -1855,6 +1861,8 @@ DNSKEY::getAlgorithm() const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <string>
 
 #include <util/buffer.h>
@@ -2102,6 +2110,8 @@ HINFO::toWireHelper(T& outputer) const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <string>
 #include <sstream>
 
@@ -3409,6 +3419,8 @@ NSEC3PARAM::getSalt() const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <iostream>
 #include <string>
 #include <sstream>
@@ -3977,6 +3989,8 @@ PTR::getPTRName() const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <string>
 #include <sstream>
 
@@ -4691,6 +4705,8 @@ SOA::compare(const Rdata& other) const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <stdint.h>
 #include <string.h>
 
@@ -5480,6 +5496,8 @@ TLSA::getDataLength() const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <stdint.h>
 #include <string.h>
 
@@ -5577,6 +5595,8 @@ TXT::compare(const Rdata& other) const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <string>
 
 #include <exceptions/exceptions.h>
@@ -5643,6 +5663,8 @@ A::compare(const Rdata&) const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <stdint.h>
 #include <string.h>
 
@@ -5819,6 +5841,8 @@ A::compare(const Rdata& other) const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <exceptions/exceptions.h>
 #include <util/buffer.h>
 #include <dns/exceptions.h>
@@ -5974,6 +5998,8 @@ AAAA::compare(const Rdata& other) const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <stdint.h>
 #include <string.h>
 
@@ -6137,6 +6163,8 @@ DHCID::getDigest() const {
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <config.h>
+
 #include <iostream>
 #include <sstream>
 

diff --git a/src/lib/dns/rdataclass.h b/src/lib/dns/rdataclass.h
index e8d8d7a2b6f3145bc1038e9b4592dba735f5b8b9..a4d2f1b156a1642b97733b74e8662f9a305ebca2 100644 (file)
--- a/src/lib/dns/rdataclass.h
+++ b/src/lib/dns/rdataclass.h
@@ -376,7 +376,7 @@ class CAA : public Rdata {
 public:
     // BEGIN_COMMON_MEMBERS
 
-    explicit CAA(const std::string& caa_str);
+    explicit CAA(const std::string& type_str);
     CAA(isc::util::InputBuffer& buffer, size_t rdata_len);
     CAA(const CAA& other);
     CAA(
@@ -2104,7 +2104,7 @@ class TLSA : public Rdata {
 public:
     // BEGIN_COMMON_MEMBERS
 
-    explicit TLSA(const std::string& tlsa_str);
+    explicit TLSA(const std::string& type_str);
     TLSA(isc::util::InputBuffer& buffer, size_t rdata_len);
     TLSA(const TLSA& other);
     TLSA(

diff --git a/src/lib/dns/rrclass.h b/src/lib/dns/rrclass.h
index 1796b4388bfd1a1d72ceb2ebcee607d21016bc00..efcfd6e5713f795f372b0c48440075b2f1386598 100644 (file)
--- a/src/lib/dns/rrclass.h
+++ b/src/lib/dns/rrclass.h
@@ -5,7 +5,7 @@
 ///////////////
 ///////////////
 
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -285,11 +285,11 @@ public:
     { return (classcode_ < other.classcode_); }
 
     // BEGIN_WELL_KNOWN_CLASS_DECLARATIONS
-    static const RRClass& HS();
-    static const RRClass& NONE();
     static const RRClass& ANY();
     static const RRClass& CH();
+    static const RRClass& HS();
     static const RRClass& IN();
+    static const RRClass& NONE();
     // END_WELL_KNOWN_CLASS_DECLARATIONS
 
 private:
@@ -298,32 +298,32 @@ private:
 
 // BEGIN_WELL_KNOWN_CLASS_DEFINITIONS
 inline const RRClass&
-RRClass::HS() {
-    static RRClass rrclass(4);
+RRClass::ANY() {
+    static RRClass rrclass(255);
     return (rrclass);
 }
 
 inline const RRClass&
-RRClass::NONE() {
-    static RRClass rrclass(254);
+RRClass::CH() {
+    static RRClass rrclass(3);
     return (rrclass);
 }
 
 inline const RRClass&
-RRClass::ANY() {
-    static RRClass rrclass(255);
+RRClass::HS() {
+    static RRClass rrclass(4);
     return (rrclass);
 }
 
 inline const RRClass&
-RRClass::CH() {
-    static RRClass rrclass(3);
+RRClass::IN() {
+    static RRClass rrclass(1);
     return (rrclass);
 }
 
 inline const RRClass&
-RRClass::IN() {
-    static RRClass rrclass(1);
+RRClass::NONE() {
+    static RRClass rrclass(254);
     return (rrclass);
 }
 

diff --git a/src/lib/dns/rrparamregistry.cc b/src/lib/dns/rrparamregistry.cc
index 48505934281413a2de9f2363870616766d229e48..c74f159ea057ef4b164e4581eec3709240a722be 100644 (file)
--- a/src/lib/dns/rrparamregistry.cc
+++ b/src/lib/dns/rrparamregistry.cc
@@ -269,42 +269,42 @@ RRParamRegistry::RRParamRegistry() {
         add("CAA", 257, RdataFactoryPtr(new RdataFactory<generic::CAA>()));
         add("DLV", 32769, RdataFactoryPtr(new RdataFactory<generic::DLV>()));
         // Meta and non-implemented RR types
-        addType("IPSECKEY", 45);
-        addType("L32", 105);
-        addType("NID", 104);
-        addType("LP", 107);
-        addType("L64", 106);
-        addType("KX", 36);
-        addType("UNSPEC", 103);
-        addType("MAILA", 254);
-        addType("MAILB", 253);
-        addType("HIP", 55);
-        addType("LOC", 29);
-        addType("URI", 256);
-        addType("APL", 42);
-        addType("GPOS", 27);
-        addType("TKEY", 249);
-        addType("MG", 8);
-        addType("MR", 9);
         addType("IXFR", 251);
-        addType("MB", 7);
-        addType("MF", 4);
         addType("AXFR", 252);
         addType("ANY", 255);
         addType("MD", 3);
-        addType("CERT", 37);
-        addType("KEY", 25);
-        addType("SIG", 24);
-        addType("A6", 38);
-        addType("PX", 26);
-        addType("RT", 21);
-        addType("X25", 19);
-        addType("NSAP-PTR", 23);
-        addType("NSAP", 22);
+        addType("MF", 4);
+        addType("MB", 7);
+        addType("MG", 8);
+        addType("MR", 9);
         addType("NXT", 30);
+        addType("A6", 38);
+        addType("MAILA", 254);
         addType("NULL", 10);
         addType("WKS", 11);
+        addType("X25", 19);
+        addType("RT", 21);
+        addType("NSAP", 22);
+        addType("NSAP-PTR", 23);
+        addType("SIG", 24);
         addType("ISDN", 20);
+        addType("KEY", 25);
+        addType("PX", 26);
+        addType("GPOS", 27);
+        addType("LOC", 29);
+        addType("KX", 36);
+        addType("CERT", 37);
+        addType("APL", 42);
+        addType("IPSECKEY", 45);
+        addType("HIP", 55);
+        addType("UNSPEC", 103);
+        addType("NID", 104);
+        addType("L32", 105);
+        addType("L64", 106);
+        addType("LP", 107);
+        addType("TKEY", 249);
+        addType("MAILB", 253);
+        addType("URI", 256);
         // Meta classes
         addClass("NONE", 254);
         // END_WELL_KNOWN_PARAMS

diff --git a/src/lib/dns/rrtype.h b/src/lib/dns/rrtype.h
index eb46170ed24d5b360b3baac89bdda2b78668a85d..16675397891b3e5ef1c743bb7b471a5d118d9194 100644 (file)
--- a/src/lib/dns/rrtype.h
+++ b/src/lib/dns/rrtype.h
@@ -259,71 +259,71 @@ public:
     //@}
 
     // BEGIN_WELL_KNOWN_TYPE_DECLARATIONS
-    static const RRType& L32();
-    static const RRType& NID();
-    static const RRType& LP();
-    static const RRType& L64();
-    static const RRType& UNSPEC();
-    static const RRType& IXFR();
     static const RRType& TSIG();
-    static const RRType& MAILB();
-    static const RRType& AXFR();
-    static const RRType& ANY();
-    static const RRType& MAILA();
+    static const RRType& A();
+    static const RRType& AFSDB();
     static const RRType& CAA();
-    static const RRType& URI();
-    static const RRType& KEY();
-    static const RRType& SIG();
-    static const RRType& GPOS();
-    static const RRType& PX();
-    static const RRType& RT();
-    static const RRType& ISDN();
-    static const RRType& NSAP_PTR();
-    static const RRType& NSAP();
-    static const RRType& LOC();
-    static const RRType& AAAA();
-    static const RRType& SPF();
-    static const RRType& MG();
-    static const RRType& SOA();
-    static const RRType& MF();
+    static const RRType& CNAME();
+    static const RRType& DLV();
+    static const RRType& DNAME();
+    static const RRType& DNSKEY();
+    static const RRType& DS();
+    static const RRType& HINFO();
+    static const RRType& MINFO();
+    static const RRType& MX();
+    static const RRType& NAPTR();
     static const RRType& NS();
     static const RRType& NSEC3();
     static const RRType& NSEC3PARAM();
-    static const RRType& TLSA();
-    static const RRType& AFSDB();
-    static const RRType& HIP();
-    static const RRType& MINFO();
-    static const RRType& MX();
-    static const RRType& TXT();
-    static const RRType& RP();
-    static const RRType& Null();
-    static const RRType& WKS();
-    static const RRType& PTR();
-    static const RRType& HINFO();
-    static const RRType& DLV();
-    static const RRType& DS();
-    static const RRType& APL();
-    static const RRType& OPT();
     static const RRType& NSEC();
+    static const RRType& OPT();
+    static const RRType& PTR();
+    static const RRType& RP();
     static const RRType& RRSIG();
-    static const RRType& IPSECKEY();
+    static const RRType& SOA();
+    static const RRType& SPF();
     static const RRType& SSHFP();
+    static const RRType& TLSA();
+    static const RRType& TXT();
+    static const RRType& AAAA();
     static const RRType& DHCID();
-    static const RRType& DNSKEY();
-    static const RRType& X25();
-    static const RRType& TKEY();
-    static const RRType& MR();
-    static const RRType& MB();
-    static const RRType& CNAME();
-    static const RRType& MD();
-    static const RRType& A();
-    static const RRType& A6();
-    static const RRType& DNAME();
     static const RRType& SRV();
+    static const RRType& IXFR();
+    static const RRType& AXFR();
+    static const RRType& ANY();
+    static const RRType& MD();
+    static const RRType& MF();
+    static const RRType& MB();
+    static const RRType& MG();
+    static const RRType& MR();
     static const RRType& NXT();
+    static const RRType& A6();
+    static const RRType& MAILA();
+    static const RRType& Null();
+    static const RRType& WKS();
+    static const RRType& X25();
+    static const RRType& RT();
+    static const RRType& NSAP();
+    static const RRType& NSAP_PTR();
+    static const RRType& SIG();
+    static const RRType& ISDN();
+    static const RRType& KEY();
+    static const RRType& PX();
+    static const RRType& GPOS();
+    static const RRType& LOC();
     static const RRType& KX();
     static const RRType& CERT();
-    static const RRType& NAPTR();
+    static const RRType& APL();
+    static const RRType& IPSECKEY();
+    static const RRType& HIP();
+    static const RRType& UNSPEC();
+    static const RRType& NID();
+    static const RRType& L32();
+    static const RRType& L64();
+    static const RRType& LP();
+    static const RRType& TKEY();
+    static const RRType& MAILB();
+    static const RRType& URI();
     // END_WELL_KNOWN_TYPE_DECLARATIONS
 
 private:
@@ -332,392 +332,392 @@ private:
 
 // BEGIN_WELL_KNOWN_TYPE_DEFINITIONS
 inline const RRType&
-RRType::L32() {
-    static RRType rrtype(105);
+RRType::TSIG() {
+    static RRType rrtype(250);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::NID() {
-    static RRType rrtype(104);
+RRType::A() {
+    static RRType rrtype(1);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::LP() {
-    static RRType rrtype(107);
+RRType::AFSDB() {
+    static RRType rrtype(18);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::L64() {
-    static RRType rrtype(106);
+RRType::CAA() {
+    static RRType rrtype(257);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::UNSPEC() {
-    static RRType rrtype(103);
+RRType::CNAME() {
+    static RRType rrtype(5);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::IXFR() {
-    static RRType rrtype(251);
+RRType::DLV() {
+    static RRType rrtype(32769);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::TSIG() {
-    static RRType rrtype(250);
+RRType::DNAME() {
+    static RRType rrtype(39);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::MAILB() {
-    static RRType rrtype(253);
+RRType::DNSKEY() {
+    static RRType rrtype(48);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::AXFR() {
-    static RRType rrtype(252);
+RRType::DS() {
+    static RRType rrtype(43);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::ANY() {
-    static RRType rrtype(255);
+RRType::HINFO() {
+    static RRType rrtype(13);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::MAILA() {
-    static RRType rrtype(254);
+RRType::MINFO() {
+    static RRType rrtype(14);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::CAA() {
-    static RRType rrtype(257);
+RRType::MX() {
+    static RRType rrtype(15);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::URI() {
-    static RRType rrtype(256);
+RRType::NAPTR() {
+    static RRType rrtype(35);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::KEY() {
-    static RRType rrtype(25);
+RRType::NS() {
+    static RRType rrtype(2);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::SIG() {
-    static RRType rrtype(24);
+RRType::NSEC3() {
+    static RRType rrtype(50);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::GPOS() {
-    static RRType rrtype(27);
+RRType::NSEC3PARAM() {
+    static RRType rrtype(51);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::PX() {
-    static RRType rrtype(26);
+RRType::NSEC() {
+    static RRType rrtype(47);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::RT() {
-    static RRType rrtype(21);
+RRType::OPT() {
+    static RRType rrtype(41);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::ISDN() {
-    static RRType rrtype(20);
+RRType::PTR() {
+    static RRType rrtype(12);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::NSAP_PTR() {
-    static RRType rrtype(23);
+RRType::RP() {
+    static RRType rrtype(17);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::NSAP() {
-    static RRType rrtype(22);
+RRType::RRSIG() {
+    static RRType rrtype(46);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::LOC() {
-    static RRType rrtype(29);
+RRType::SOA() {
+    static RRType rrtype(6);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::AAAA() {
-    static RRType rrtype(28);
+RRType::SPF() {
+    static RRType rrtype(99);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::SPF() {
-    static RRType rrtype(99);
+RRType::SSHFP() {
+    static RRType rrtype(44);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::MG() {
-    static RRType rrtype(8);
+RRType::TLSA() {
+    static RRType rrtype(52);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::SOA() {
-    static RRType rrtype(6);
+RRType::TXT() {
+    static RRType rrtype(16);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::MF() {
-    static RRType rrtype(4);
+RRType::AAAA() {
+    static RRType rrtype(28);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::NS() {
-    static RRType rrtype(2);
+RRType::DHCID() {
+    static RRType rrtype(49);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::NSEC3() {
-    static RRType rrtype(50);
+RRType::SRV() {
+    static RRType rrtype(33);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::NSEC3PARAM() {
-    static RRType rrtype(51);
+RRType::IXFR() {
+    static RRType rrtype(251);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::TLSA() {
-    static RRType rrtype(52);
+RRType::AXFR() {
+    static RRType rrtype(252);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::AFSDB() {
-    static RRType rrtype(18);
+RRType::ANY() {
+    static RRType rrtype(255);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::HIP() {
-    static RRType rrtype(55);
+RRType::MD() {
+    static RRType rrtype(3);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::MINFO() {
-    static RRType rrtype(14);
+RRType::MF() {
+    static RRType rrtype(4);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::MX() {
-    static RRType rrtype(15);
+RRType::MB() {
+    static RRType rrtype(7);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::TXT() {
-    static RRType rrtype(16);
+RRType::MG() {
+    static RRType rrtype(8);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::RP() {
-    static RRType rrtype(17);
+RRType::MR() {
+    static RRType rrtype(9);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::Null() {
-    static RRType rrtype(10);
+RRType::NXT() {
+    static RRType rrtype(30);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::WKS() {
-    static RRType rrtype(11);
+RRType::A6() {
+    static RRType rrtype(38);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::PTR() {
-    static RRType rrtype(12);
+RRType::MAILA() {
+    static RRType rrtype(254);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::HINFO() {
-    static RRType rrtype(13);
+RRType::Null() {
+    static RRType rrtype(10);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::DLV() {
-    static RRType rrtype(32769);
+RRType::WKS() {
+    static RRType rrtype(11);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::DS() {
-    static RRType rrtype(43);
+RRType::X25() {
+    static RRType rrtype(19);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::APL() {
-    static RRType rrtype(42);
+RRType::RT() {
+    static RRType rrtype(21);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::OPT() {
-    static RRType rrtype(41);
+RRType::NSAP() {
+    static RRType rrtype(22);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::NSEC() {
-    static RRType rrtype(47);
+RRType::NSAP_PTR() {
+    static RRType rrtype(23);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::RRSIG() {
-    static RRType rrtype(46);
+RRType::SIG() {
+    static RRType rrtype(24);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::IPSECKEY() {
-    static RRType rrtype(45);
+RRType::ISDN() {
+    static RRType rrtype(20);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::SSHFP() {
-    static RRType rrtype(44);
+RRType::KEY() {
+    static RRType rrtype(25);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::DHCID() {
-    static RRType rrtype(49);
+RRType::PX() {
+    static RRType rrtype(26);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::DNSKEY() {
-    static RRType rrtype(48);
+RRType::GPOS() {
+    static RRType rrtype(27);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::X25() {
-    static RRType rrtype(19);
+RRType::LOC() {
+    static RRType rrtype(29);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::TKEY() {
-    static RRType rrtype(249);
+RRType::KX() {
+    static RRType rrtype(36);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::MR() {
-    static RRType rrtype(9);
+RRType::CERT() {
+    static RRType rrtype(37);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::MB() {
-    static RRType rrtype(7);
+RRType::APL() {
+    static RRType rrtype(42);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::CNAME() {
-    static RRType rrtype(5);
+RRType::IPSECKEY() {
+    static RRType rrtype(45);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::MD() {
-    static RRType rrtype(3);
+RRType::HIP() {
+    static RRType rrtype(55);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::A() {
-    static RRType rrtype(1);
+RRType::UNSPEC() {
+    static RRType rrtype(103);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::A6() {
-    static RRType rrtype(38);
+RRType::NID() {
+    static RRType rrtype(104);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::DNAME() {
-    static RRType rrtype(39);
+RRType::L32() {
+    static RRType rrtype(105);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::SRV() {
-    static RRType rrtype(33);
+RRType::L64() {
+    static RRType rrtype(106);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::NXT() {
-    static RRType rrtype(30);
+RRType::LP() {
+    static RRType rrtype(107);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::KX() {
-    static RRType rrtype(36);
+RRType::TKEY() {
+    static RRType rrtype(249);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::CERT() {
-    static RRType rrtype(37);
+RRType::MAILB() {
+    static RRType rrtype(253);
     return (rrtype);
 }
 
 inline const RRType&
-RRType::NAPTR() {
-    static RRType rrtype(35);
+RRType::URI() {
+    static RRType rrtype(256);
     return (rrtype);
 }