BIND 10 trac1866, updated. 6b09c6be32b221b73a05f98de7814c650597883a [1866] added note about not-implemented RR types dict in rdata/template.h.
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Feb 4 22:25:20 UTC 2013
The branch, trac1866 has been updated
via 6b09c6be32b221b73a05f98de7814c650597883a (commit)
via 3188ee1246e7e1b52b334cfa6edb04d2123ea759 (commit)
via 076dad2aada1624b0b632e4eee3e6a1907c51a16 (commit)
via cb95ae3f178ce497a8dce0aad4173a8586dc9ca2 (commit)
via f07dbb59715b26afeef7ff682bba887187ad169b (commit)
via b1f09a967614c9668bedc3d877bb12f1622222f1 (commit)
via db90d30b97219e365c3643fd6c79878eaf1ac518 (commit)
via 9a7c7bf6690bf3a6d85b5f3dc802d819825b3955 (commit)
from 463700b34d94d933cc4244480e46f975c798d777 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6b09c6be32b221b73a05f98de7814c650597883a
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 4 14:23:47 2013 -0800
[1866] added note about not-implemented RR types dict in rdata/template.h.
commit 3188ee1246e7e1b52b334cfa6edb04d2123ea759
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 4 14:11:34 2013 -0800
[1866] revise generate_typeclasscode without using temporary text variables.
wouldn't matter for the usage of this script, but this should be slightly
more efficient.
commit 076dad2aada1624b0b632e4eee3e6a1907c51a16
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 4 13:23:49 2013 -0800
[1866] removed more now-removed files from Makefile.am.
commit cb95ae3f178ce497a8dce0aad4173a8586dc9ca2
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 4 11:50:05 2013 -0800
[1866] remove dummy text files from makefile
commit f07dbb59715b26afeef7ff682bba887187ad169b
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 4 11:49:36 2013 -0800
[1866] updated the gen script so it generates types/classes correctly.
commit b1f09a967614c9668bedc3d877bb12f1622222f1
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 4 11:15:05 2013 -0800
[1866] list all meta/not-yet-supported RR types and classes in the gen script
that's probably simpler than using dummy files and directories.
commit db90d30b97219e365c3643fd6c79878eaf1ac518
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 4 11:02:14 2013 -0800
[1866] removed unnecessary file
commit 9a7c7bf6690bf3a6d85b5f3dc802d819825b3955
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Feb 4 10:49:09 2013 -0800
[1866] corrected some regexp's: make sure it matches '.' before file suffixes.
-----------------------------------------------------------------------
Summary of changes:
src/lib/dns/Makefile.am | 41 -----------
src/lib/dns/gen-rdatacode.py.in | 111 ++++++++++++++++-------------
src/lib/dns/rdata/generic/any_255.txt | 1 -
src/lib/dns/rdata/generic/axfr_252.txt | 1 -
src/lib/dns/rdata/generic/caa_257.txt | 4 --
src/lib/dns/rdata/generic/cert_37.txt | 4 --
src/lib/dns/rdata/generic/gpos_27.txt | 4 --
src/lib/dns/rdata/generic/hip_55.txt | 4 --
src/lib/dns/rdata/generic/ipseckey_45.txt | 4 --
src/lib/dns/rdata/generic/isdn_20.txt | 4 --
src/lib/dns/rdata/generic/ixfr_251.txt | 1 -
src/lib/dns/rdata/generic/key_25.txt | 4 --
src/lib/dns/rdata/generic/l32_105.txt | 4 --
src/lib/dns/rdata/generic/l64_106.txt | 4 --
src/lib/dns/rdata/generic/loc_29.txt | 4 --
src/lib/dns/rdata/generic/lp_107.txt | 4 --
src/lib/dns/rdata/generic/maila_254.txt | 4 --
src/lib/dns/rdata/generic/mailb_253.txt | 4 --
src/lib/dns/rdata/generic/mb_7.txt | 4 --
src/lib/dns/rdata/generic/md_3.txt | 4 --
src/lib/dns/rdata/generic/mf_4.txt | 4 --
src/lib/dns/rdata/generic/mg_8.txt | 4 --
src/lib/dns/rdata/generic/mr_9.txt | 4 --
src/lib/dns/rdata/generic/nid_104.txt | 4 --
src/lib/dns/rdata/generic/null_10.txt | 4 --
src/lib/dns/rdata/generic/nxt_30.txt | 4 --
src/lib/dns/rdata/generic/proforma.txt | 4 --
src/lib/dns/rdata/generic/rt_21.txt | 4 --
src/lib/dns/rdata/generic/sig_24.txt | 4 --
src/lib/dns/rdata/generic/tkey_249.txt | 4 --
src/lib/dns/rdata/generic/tlsa_52.txt | 4 --
src/lib/dns/rdata/generic/unspec_103.txt | 4 --
src/lib/dns/rdata/generic/uri_256.txt | 4 --
src/lib/dns/rdata/generic/x25_19.txt | 4 --
src/lib/dns/rdata/in_1/a6_38.txt | 4 --
src/lib/dns/rdata/in_1/apl_42.txt | 4 --
src/lib/dns/rdata/in_1/kx_36.txt | 4 --
src/lib/dns/rdata/in_1/nsap-ptr_23.txt | 4 --
src/lib/dns/rdata/in_1/nsap_22.txt | 4 --
src/lib/dns/rdata/in_1/px_26.txt | 4 --
src/lib/dns/rdata/in_1/wks_11.txt | 4 --
src/lib/dns/rdata/none_254/.gitignore | 1 -
src/lib/dns/rdata/template.h | 4 ++
src/lib/dns/rdata/template.txt | 8 ---
44 files changed, 67 insertions(+), 245 deletions(-)
delete mode 100644 src/lib/dns/rdata/generic/any_255.txt
delete mode 100644 src/lib/dns/rdata/generic/axfr_252.txt
delete mode 100644 src/lib/dns/rdata/generic/caa_257.txt
delete mode 100644 src/lib/dns/rdata/generic/cert_37.txt
delete mode 100644 src/lib/dns/rdata/generic/gpos_27.txt
delete mode 100644 src/lib/dns/rdata/generic/hip_55.txt
delete mode 100644 src/lib/dns/rdata/generic/ipseckey_45.txt
delete mode 100644 src/lib/dns/rdata/generic/isdn_20.txt
delete mode 100644 src/lib/dns/rdata/generic/ixfr_251.txt
delete mode 100644 src/lib/dns/rdata/generic/key_25.txt
delete mode 100644 src/lib/dns/rdata/generic/l32_105.txt
delete mode 100644 src/lib/dns/rdata/generic/l64_106.txt
delete mode 100644 src/lib/dns/rdata/generic/loc_29.txt
delete mode 100644 src/lib/dns/rdata/generic/lp_107.txt
delete mode 100644 src/lib/dns/rdata/generic/maila_254.txt
delete mode 100644 src/lib/dns/rdata/generic/mailb_253.txt
delete mode 100644 src/lib/dns/rdata/generic/mb_7.txt
delete mode 100644 src/lib/dns/rdata/generic/md_3.txt
delete mode 100644 src/lib/dns/rdata/generic/mf_4.txt
delete mode 100644 src/lib/dns/rdata/generic/mg_8.txt
delete mode 100644 src/lib/dns/rdata/generic/mr_9.txt
delete mode 100644 src/lib/dns/rdata/generic/nid_104.txt
delete mode 100644 src/lib/dns/rdata/generic/null_10.txt
delete mode 100644 src/lib/dns/rdata/generic/nxt_30.txt
delete mode 100644 src/lib/dns/rdata/generic/proforma.txt
delete mode 100644 src/lib/dns/rdata/generic/rt_21.txt
delete mode 100644 src/lib/dns/rdata/generic/sig_24.txt
delete mode 100644 src/lib/dns/rdata/generic/tkey_249.txt
delete mode 100644 src/lib/dns/rdata/generic/tlsa_52.txt
delete mode 100644 src/lib/dns/rdata/generic/unspec_103.txt
delete mode 100644 src/lib/dns/rdata/generic/uri_256.txt
delete mode 100644 src/lib/dns/rdata/generic/x25_19.txt
delete mode 100644 src/lib/dns/rdata/in_1/a6_38.txt
delete mode 100644 src/lib/dns/rdata/in_1/apl_42.txt
delete mode 100644 src/lib/dns/rdata/in_1/kx_36.txt
delete mode 100644 src/lib/dns/rdata/in_1/nsap-ptr_23.txt
delete mode 100644 src/lib/dns/rdata/in_1/nsap_22.txt
delete mode 100644 src/lib/dns/rdata/in_1/px_26.txt
delete mode 100644 src/lib/dns/rdata/in_1/wks_11.txt
delete mode 100644 src/lib/dns/rdata/none_254/.gitignore
delete mode 100644 src/lib/dns/rdata/template.txt
-----------------------------------------------------------------------
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index f028ce0..bbf33ed 100644
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -76,38 +76,6 @@ EXTRA_DIST += rdata/generic/minfo_14.cc
EXTRA_DIST += rdata/generic/minfo_14.h
EXTRA_DIST += rdata/generic/afsdb_18.cc
EXTRA_DIST += rdata/generic/afsdb_18.h
-EXTRA_DIST += rdata/generic/any_255.txt
-EXTRA_DIST += rdata/generic/axfr_252.txt
-EXTRA_DIST += rdata/generic/ixfr_251.txt
-EXTRA_DIST += rdata/generic/cert_37.txt
-EXTRA_DIST += rdata/generic/gpos_27.txt
-EXTRA_DIST += rdata/generic/hip_55.txt
-EXTRA_DIST += rdata/generic/ipseckey_45.txt
-EXTRA_DIST += rdata/generic/isdn_20.txt
-EXTRA_DIST += rdata/generic/key_25.txt
-EXTRA_DIST += rdata/generic/l32_105.txt
-EXTRA_DIST += rdata/generic/l64_106.txt
-EXTRA_DIST += rdata/generic/loc_29.txt
-EXTRA_DIST += rdata/generic/lp_107.txt
-EXTRA_DIST += rdata/generic/mb_7.txt
-EXTRA_DIST += rdata/generic/md_3.txt
-EXTRA_DIST += rdata/generic/mf_4.txt
-EXTRA_DIST += rdata/generic/mg_8.txt
-EXTRA_DIST += rdata/generic/mr_9.txt
-EXTRA_DIST += rdata/generic/nid_104.txt
-EXTRA_DIST += rdata/generic/null_10.txt
-EXTRA_DIST += rdata/generic/nxt_30.txt
-EXTRA_DIST += rdata/generic/proforma.txt
-EXTRA_DIST += rdata/generic/rt_21.txt
-EXTRA_DIST += rdata/generic/sig_24.txt
-EXTRA_DIST += rdata/generic/tkey_249.txt
-EXTRA_DIST += rdata/generic/tlsa_52.txt
-EXTRA_DIST += rdata/generic/unspec_103.txt
-EXTRA_DIST += rdata/generic/uri_256.txt
-EXTRA_DIST += rdata/generic/x25_19.txt
-EXTRA_DIST += rdata/generic/maila_254.txt
-EXTRA_DIST += rdata/generic/mailb_253.txt
-EXTRA_DIST += rdata/generic/caa_257.txt
EXTRA_DIST += rdata/hs_4/a_1.cc
EXTRA_DIST += rdata/hs_4/a_1.h
EXTRA_DIST += rdata/in_1/a_1.cc
@@ -118,17 +86,8 @@ EXTRA_DIST += rdata/in_1/dhcid_49.cc
EXTRA_DIST += rdata/in_1/dhcid_49.h
EXTRA_DIST += rdata/in_1/srv_33.cc
EXTRA_DIST += rdata/in_1/srv_33.h
-EXTRA_DIST += rdata/in_1/a6_38.txt
-EXTRA_DIST += rdata/in_1/apl_42.txt
-EXTRA_DIST += rdata/in_1/kx_36.txt
-EXTRA_DIST += rdata/in_1/nsap-ptr_23.txt
-EXTRA_DIST += rdata/in_1/nsap_22.txt
-EXTRA_DIST += rdata/in_1/px_26.txt
-EXTRA_DIST += rdata/in_1/wks_11.txt
-EXTRA_DIST += rdata/none_254
#EXTRA_DIST += rdata/template.cc
#EXTRA_DIST += rdata/template.h
-#EXTRA_DIST += rdata/template.txt
noinst_SCRIPTS = gen-rdatacode.py
diff --git a/src/lib/dns/gen-rdatacode.py.in b/src/lib/dns/gen-rdatacode.py.in
index b22cd69..79ad9a5 100755
--- a/src/lib/dns/gen-rdatacode.py.in
+++ b/src/lib/dns/gen-rdatacode.py.in
@@ -43,10 +43,27 @@ new_rdata_factory_users = [('aaaa', 'in'),
re_typecode = re.compile('([\da-z\-]+)_(\d+)')
classcode2txt = {}
typecode2txt = {}
-# "AXFR"=>252 etc: for meta types and types well-known but not implemented
-meta_types = {}
-# "NONE"=>254 etc: for classes that don't have any known types
-meta_classes = {}
+# For meta types and types well-known but not implemented. This is a dict from
+# type code values (as string) to textual mnemonic.
+meta_types = {
+ # Real meta types. We won't have Rdata implement for them, but we need
+ # RRType constants.
+ '251': 'ixfr', '252': 'axfr', '255': 'any',
+ # Obsolete types. We probalby won't implement Rdata for them, but it's
+ # better to have RRType constants.
+ '3': 'md', '4': 'mf', '7': 'mb', '8': 'mg', '9': 'mr', '30': 'nxt',
+ '38': 'a6', '254': 'maila',
+ # Types officially assigned but not yet supported in our implementation.
+ '10': 'null', '11': 'wks', '19': 'x25', '21': 'rt', '22': 'nsap',
+ '23': 'nsap-ptr', '24': 'sig', '20': 'isdn', '25': 'key', '26': 'px',
+ '27': 'gpos', '29': 'loc', '36': 'kx', '37': 'cert', '42': 'apl',
+ '45': 'ipseckey', '52': 'tlsa', '55': 'hip', '103': 'unspec',
+ '104': 'nid', '105': 'l32', '106': 'l64', '107': 'lp', '249': 'tkey',
+ '253': 'mailb', '256': 'uri', '257': 'caa'
+ }
+# Classes that don't have any known types. This is a dict from type code
+# values (as string) to textual mnemonic.
+meta_classes = {'254': 'none'}
typeandclass = []
generic_code = 65536 # something larger than any code value
rdata_declarations = ''
@@ -181,11 +198,6 @@ def import_definitions(classcode2txt, typecode2txt, typeandclass):
# also apply to files.
filelist = os.listdir(classdir)
filelist.sort()
- if len(filelist) == 0:
- # if there's no known types treat it as meta. Note that
- # listdir() (seemingly) ignores .gitignore.
- meta_classes[class_txt] = class_code
- continue
for file in filelist:
file = classdir + os.sep + file
m = re_typecode.match(os.path.split(file)[1])
@@ -194,15 +206,11 @@ def import_definitions(classcode2txt, typecode2txt, typeandclass):
type_code = m.group(2)
if not type_code in typecode2txt:
typecode2txt[type_code] = type_txt
- if re.search('\.txt$', file): # we use .txt for meta types
- if rdatadef_mtime < getmtime(file):
- rdatadef_mtime = getmtime(file)
- meta_types[type_txt] = type_code
- elif re.search('\cc$', file):
+ if re.search('\.cc$', file):
if rdatadef_mtime < getmtime(file):
rdatadef_mtime = getmtime(file)
class_definitions += import_classdef(class_txt, file)
- elif re.search('\h$', file):
+ elif re.search('\.h$', file):
if rdatahdr_mtime < getmtime(file):
rdatahdr_mtime = getmtime(file)
rdata_declarations += import_classheader(class_txt,
@@ -281,51 +289,53 @@ def generate_typeclasscode(fileprefix, basemtime, code2txt, type_or_class):
print('skip generating ' + outputfile)
return
- declarationtxt = ''
- deftxt = ''
- pydef_txt = ''
- for code in code2txt.keys():
- codetxt = code2txt[code].upper()
+ # Create a list of (code, code-text) pairs, where code-text is generally
+ # upper-cased, with applying speicial filters when necessary.
+ def convert(code_txt):
# Workaround by heuristics: there's a "NULL" RR type, but it would
# cause conflict with the C/C++ macro. We use Null as a special case.
- if codetxt == 'NULL':
- codetxt = 'Null'
- # Likewise, convert "NSAP-PTR" to "NSAP_PTR".
- if codetxt == 'NSAP-PTR':
- codetxt = "NSAP_PTR"
- declarationtxt += ' ' * 4 + 'static const RR' + cap_key + '& ' + \
- codetxt + '();\n'
- deftxt += '''inline const RR''' + cap_key + '''&
-RR''' + cap_key + '''::''' + codetxt + '''() {
- static RR''' + cap_key + ''' ''' + lower_key + '''(''' + code + ''');
- return (''' + lower_key + ''');
-}\n
-'''
- pydef_txt += '''\
- installClassVariable(''' + lower_key + '''_type, "''' + codetxt + '''",
- createRR''' + cap_key + '''Object(RR''' + \
- cap_key + '''::''' + codetxt + '''()));
-'''
+ if code_txt == 'null':
+ return 'Null'
+ # Likewise, convert "nsap-ptr" to "NSAP_PTR" as a dash cannot be part
+ # of a C/C++ variable.
+ if code_txt == 'nsap-ptr':
+ return 'NSAP_PTR'
+ return code_txt.upper()
+ codes = [ (code, convert(txt)) for code, txt in code2txt.items() ]
# Dump source code for libdns++
with open(placeholder, 'r') as header_temp:
with open(outputfile, 'w') as header_out:
header_out.write(heading_txt)
- for line in header_temp.readlines():
+ for line in header_temp:
header_out.write(line)
if re.match('\s+// BEGIN_WELL_KNOWN_' + upper_key +
'_DECLARATIONS$', line):
- header_out.write(declarationtxt)
+ for code in codes:
+ header_out.write(' ' * 4 + 'static const RR' +
+ cap_key + '& ' + code[1] + '();\n')
if re.match('// BEGIN_WELL_KNOWN_' + upper_key +
'_DEFINITIONS$', line):
- header_out.write('\n' + deftxt)
+ for code in codes:
+ header_out.write('''inline const RR''' + cap_key +
+ '''&
+RR''' + cap_key + '''::''' + code[1] + '''() {
+ static RR''' + cap_key + ''' ''' + lower_key + '''(''' + code[0] + ''');
+ return (''' + lower_key + ''');
+}\n
+''')
# Dump source code snippet for isc.dns Python module
with open(py_outputfile, 'w') as py_out:
py_out.write(" // auto-generated by ../gen-rdatacode.py."
" Don't edit this file.\n")
py_out.write("\n")
- py_out.write(pydef_txt)
+ for code in codes:
+ py_out.write('''\
+ installClassVariable(''' + lower_key + '''_type, "''' + code[1] + '''",
+ createRR''' + cap_key + '''Object(RR''' + \
+ cap_key + '''::''' + code[1] + '''()));
+''')
def generate_rrparam(fileprefix, basemtime):
placeholder = '@srcdir@/' + fileprefix + '-placeholder.cc'
@@ -373,14 +383,14 @@ def generate_rrparam(fileprefix, basemtime):
typeandclassparams += class_txt + '::' + type_utxt + '>()));\n'
typeandclassparams += indent + '// Meta and non-implemented RR types\n'
- for type_txt, type_code in meta_types.items():
+ for type_code, type_txt in meta_types.items():
typeandclassparams += indent + \
- 'addType("' + type_txt.upper() + '", ' + str(type_code) + ');\n'
+ 'addType("' + type_txt.upper() + '", ' + type_code + ');\n'
typeandclassparams += indent + '// Meta classes\n'
- for cls_txt, cls_code in meta_classes.items():
+ for cls_code, cls_txt in meta_classes.items():
typeandclassparams += indent + \
- 'addClass("' + cls_txt.upper() + '", ' + str(cls_code) + ');\n'
+ 'addClass("' + cls_txt.upper() + '", ' + cls_code + ');\n'
rrparam_temp = open(placeholder, 'r')
rrparam_out = open(outputfile, 'w')
@@ -398,9 +408,14 @@ if __name__ == "__main__":
generate_rdatadef('@builddir@/rdataclass.cc', rdatadef_mtime)
generate_rdatahdr('@builddir@/rdataclass.h', heading_txt,
rdata_declarations, rdatahdr_mtime)
- generate_typeclasscode('rrtype', rdatahdr_mtime, typecode2txt, 'Type')
+
+ # merge auto-generated types/classes with meta maps and generate the
+ # corresponding code.
+ generate_typeclasscode('rrtype', rdatahdr_mtime,
+ dict(typecode2txt, **meta_types), 'Type')
generate_typeclasscode('rrclass', classdir_mtime,
- classcode2txt, 'Class')
+ dict(classcode2txt, **meta_classes), 'Class')
+
generate_rrparam('rrparamregistry', rdatahdr_mtime)
except:
sys.stderr.write('Code generation failed due to exception: %s\n' %
diff --git a/src/lib/dns/rdata/generic/any_255.txt b/src/lib/dns/rdata/generic/any_255.txt
deleted file mode 100644
index 8b95ece..0000000
--- a/src/lib/dns/rdata/generic/any_255.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a meta type and doesn't have any Rdata definition.
diff --git a/src/lib/dns/rdata/generic/axfr_252.txt b/src/lib/dns/rdata/generic/axfr_252.txt
deleted file mode 100644
index 8b95ece..0000000
--- a/src/lib/dns/rdata/generic/axfr_252.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a meta type and doesn't have any Rdata definition.
diff --git a/src/lib/dns/rdata/generic/caa_257.txt b/src/lib/dns/rdata/generic/caa_257.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/caa_257.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/cert_37.txt b/src/lib/dns/rdata/generic/cert_37.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/cert_37.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/gpos_27.txt b/src/lib/dns/rdata/generic/gpos_27.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/gpos_27.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/hip_55.txt b/src/lib/dns/rdata/generic/hip_55.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/hip_55.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/ipseckey_45.txt b/src/lib/dns/rdata/generic/ipseckey_45.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/ipseckey_45.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/isdn_20.txt b/src/lib/dns/rdata/generic/isdn_20.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/isdn_20.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/ixfr_251.txt b/src/lib/dns/rdata/generic/ixfr_251.txt
deleted file mode 100644
index 8b95ece..0000000
--- a/src/lib/dns/rdata/generic/ixfr_251.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a meta type and doesn't have any Rdata definition.
diff --git a/src/lib/dns/rdata/generic/key_25.txt b/src/lib/dns/rdata/generic/key_25.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/key_25.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/l32_105.txt b/src/lib/dns/rdata/generic/l32_105.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/l32_105.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/l64_106.txt b/src/lib/dns/rdata/generic/l64_106.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/l64_106.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/loc_29.txt b/src/lib/dns/rdata/generic/loc_29.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/loc_29.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/lp_107.txt b/src/lib/dns/rdata/generic/lp_107.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/lp_107.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/maila_254.txt b/src/lib/dns/rdata/generic/maila_254.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/maila_254.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/mailb_253.txt b/src/lib/dns/rdata/generic/mailb_253.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/mailb_253.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/mb_7.txt b/src/lib/dns/rdata/generic/mb_7.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/mb_7.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/md_3.txt b/src/lib/dns/rdata/generic/md_3.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/md_3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/mf_4.txt b/src/lib/dns/rdata/generic/mf_4.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/mf_4.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/mg_8.txt b/src/lib/dns/rdata/generic/mg_8.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/mg_8.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/mr_9.txt b/src/lib/dns/rdata/generic/mr_9.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/mr_9.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/nid_104.txt b/src/lib/dns/rdata/generic/nid_104.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/nid_104.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/null_10.txt b/src/lib/dns/rdata/generic/null_10.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/null_10.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/nxt_30.txt b/src/lib/dns/rdata/generic/nxt_30.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/nxt_30.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/proforma.txt b/src/lib/dns/rdata/generic/proforma.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/proforma.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/rt_21.txt b/src/lib/dns/rdata/generic/rt_21.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/rt_21.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/sig_24.txt b/src/lib/dns/rdata/generic/sig_24.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/sig_24.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/tkey_249.txt b/src/lib/dns/rdata/generic/tkey_249.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/tkey_249.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/tlsa_52.txt b/src/lib/dns/rdata/generic/tlsa_52.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/tlsa_52.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/unspec_103.txt b/src/lib/dns/rdata/generic/unspec_103.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/unspec_103.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/uri_256.txt b/src/lib/dns/rdata/generic/uri_256.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/uri_256.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/generic/x25_19.txt b/src/lib/dns/rdata/generic/x25_19.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/generic/x25_19.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/in_1/a6_38.txt b/src/lib/dns/rdata/in_1/a6_38.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/in_1/a6_38.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/in_1/apl_42.txt b/src/lib/dns/rdata/in_1/apl_42.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/in_1/apl_42.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/in_1/kx_36.txt b/src/lib/dns/rdata/in_1/kx_36.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/in_1/kx_36.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/in_1/nsap-ptr_23.txt b/src/lib/dns/rdata/in_1/nsap-ptr_23.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/in_1/nsap-ptr_23.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/in_1/nsap_22.txt b/src/lib/dns/rdata/in_1/nsap_22.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/in_1/nsap_22.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/in_1/px_26.txt b/src/lib/dns/rdata/in_1/px_26.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/in_1/px_26.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/in_1/wks_11.txt b/src/lib/dns/rdata/in_1/wks_11.txt
deleted file mode 100644
index da31944..0000000
--- a/src/lib/dns/rdata/in_1/wks_11.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This RR type is not yet implemented; this file is used to generate
-the corresponding RRType constant and a mapping with its textual
-representation, without the Rdata code. When the Rdata support is
-complete this file must be removed.
diff --git a/src/lib/dns/rdata/none_254/.gitignore b/src/lib/dns/rdata/none_254/.gitignore
deleted file mode 100644
index 8a0934d..0000000
--- a/src/lib/dns/rdata/none_254/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# This file is here only for making the directory effectively empty.
diff --git a/src/lib/dns/rdata/template.h b/src/lib/dns/rdata/template.h
index 9e84cc3..3bfeb85 100644
--- a/src/lib/dns/rdata/template.h
+++ b/src/lib/dns/rdata/template.h
@@ -39,6 +39,10 @@
// Note: do not remove the comment lines beginning with "BEGIN_" and "END_".
// These are markers used by a script for auto-generating build-able source
// files.
+//
+// On completion of implementing a new type of Rdata, remove the corresponding
+// entry from the meta_types dictionary of gen-rdatacode.py.in. Otherwise
+// it will cause build failure.
class MyType : public Rdata {
public:
diff --git a/src/lib/dns/rdata/template.txt b/src/lib/dns/rdata/template.txt
deleted file mode 100644
index 8d11bf7..0000000
--- a/src/lib/dns/rdata/template.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-For "meta" RR types (i.e., types that don't have Rdata definitions)
-and standard types that have not yet been supported in this
-implementation, place "typename_nn.txt" under the appropriate
-directory (where "typename" is the standard textual mnemonic of the
-type and "nn" is decimal code of the type, e.g. axfr_252.txt).
-Its content doesn't matter. Then the auto-generate script will
-just generate constant RRTypes and text conversion code for these
-types, skipping Rdata related definitions.
More information about the bind10-changes
mailing list