From: Evan Hunt Date: Wed, 18 Apr 2018 22:54:17 +0000 (-0700) Subject: remove the rbtdb64 database implementation X-Git-Tag: v9.13.0~45^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=784087390ae845933e6a063095aefc112777f6a8;p=thirdparty%2Fbind9.git remove the rbtdb64 database implementation --- diff --git a/CHANGES b/CHANGES index 2b11a8a6b30..1d82f8e4849 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4931. [func] Removed the "rbtdb64" database implementation. + [GL #217] + 4930. [bug] Remove a bogus check in nslookup command line argument processing. [GL #206] diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml index 9a9c0df8874..19065514a99 100644 --- a/doc/arm/notes.xml +++ b/doc/arm/notes.xml @@ -115,6 +115,12 @@ IDNA2003 support via (bundled) idnkit-1.0 has been removed. + + + The "rbtdb64" database implementation (a parallel + implementation of "rbt") has been removed. [GL #217] + + diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 9a3234b7f91..ab9428fa4e5 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -71,7 +71,7 @@ DNSOBJS = acl.@O@ adb.@O@ badcache.@O@ byaddr.@O@ \ master.@O@ masterdump.@O@ message.@O@ \ name.@O@ ncache.@O@ nsec.@O@ nsec3.@O@ nta.@O@ \ order.@O@ peer.@O@ portlist.@O@ private.@O@ \ - rbt.@O@ rbtdb.@O@ rbtdb64.@O@ rcode.@O@ rdata.@O@ \ + rbt.@O@ rbtdb.@O@ rcode.@O@ rdata.@O@ \ rdatalist.@O@ rdataset.@O@ rdatasetiter.@O@ rdataslab.@O@ \ request.@O@ resolver.@O@ result.@O@ rootns.@O@ \ rpz.@O@ rrl.@O@ rriterator.@O@ sdb.@O@ \ @@ -115,7 +115,7 @@ DNSSRCS = acl.c adb.c badcache. byaddr.c \ log.c lookup.c master.c masterdump.c message.c \ name.c ncache.c nsec.c nsec3.c nta.c \ order.c peer.c portlist.c \ - rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c rdatalist.c \ + rbt.c rbtdb.c rcode.c rdata.c rdatalist.c \ rdataset.c rdatasetiter.c rdataslab.c request.c \ resolver.c result.c rootns.c rpz.c rrl.c rriterator.c \ sdb.c sdlz.c soa.c ssu.c ssu_external.c \ @@ -210,8 +210,6 @@ newrr:: rdata.@O@: include -rbtdb64.@O@: rbtdb64.c rbtdb.c - depend: include subdirs: include ${OBJS}: include diff --git a/lib/dns/db.c b/lib/dns/db.c index ce9c424f89c..a210120da9f 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -56,14 +56,12 @@ struct dns_dbimplementation { */ #include "rbtdb.h" -#include "rbtdb64.h" static ISC_LIST(dns_dbimplementation_t) implementations; static isc_rwlock_t implock; static isc_once_t once = ISC_ONCE_INIT; static dns_dbimplementation_t rbtimp; -static dns_dbimplementation_t rbt64imp; static void initialize(void) { @@ -75,15 +73,8 @@ initialize(void) { rbtimp.driverarg = NULL; ISC_LINK_INIT(&rbtimp, link); - rbt64imp.name = "rbt64"; - rbt64imp.create = dns_rbtdb64_create; - rbt64imp.mctx = NULL; - rbt64imp.driverarg = NULL; - ISC_LINK_INIT(&rbt64imp, link); - ISC_LIST_INIT(implementations); ISC_LIST_APPEND(implementations, &rbtimp, link); - ISC_LIST_APPEND(implementations, &rbt64imp, link); } static inline dns_dbimplementation_t * diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index 54e7b3da214..106dd1cf2a1 100644 --- a/lib/dns/include/dns/log.h +++ b/lib/dns/include/dns/log.h @@ -46,38 +46,37 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[]; #define DNS_LOGMODULE_DB (&dns_modules[0]) #define DNS_LOGMODULE_RBTDB (&dns_modules[1]) -#define DNS_LOGMODULE_RBTDB64 (&dns_modules[2]) -#define DNS_LOGMODULE_RBT (&dns_modules[3]) -#define DNS_LOGMODULE_RDATA (&dns_modules[4]) -#define DNS_LOGMODULE_MASTER (&dns_modules[5]) -#define DNS_LOGMODULE_MESSAGE (&dns_modules[6]) -#define DNS_LOGMODULE_CACHE (&dns_modules[7]) -#define DNS_LOGMODULE_CONFIG (&dns_modules[8]) -#define DNS_LOGMODULE_RESOLVER (&dns_modules[9]) -#define DNS_LOGMODULE_ZONE (&dns_modules[10]) -#define DNS_LOGMODULE_JOURNAL (&dns_modules[11]) -#define DNS_LOGMODULE_ADB (&dns_modules[12]) -#define DNS_LOGMODULE_XFER_IN (&dns_modules[13]) -#define DNS_LOGMODULE_XFER_OUT (&dns_modules[14]) -#define DNS_LOGMODULE_ACL (&dns_modules[15]) -#define DNS_LOGMODULE_VALIDATOR (&dns_modules[16]) -#define DNS_LOGMODULE_DISPATCH (&dns_modules[17]) -#define DNS_LOGMODULE_REQUEST (&dns_modules[18]) -#define DNS_LOGMODULE_MASTERDUMP (&dns_modules[19]) -#define DNS_LOGMODULE_TSIG (&dns_modules[20]) -#define DNS_LOGMODULE_TKEY (&dns_modules[21]) -#define DNS_LOGMODULE_SDB (&dns_modules[22]) -#define DNS_LOGMODULE_DIFF (&dns_modules[23]) -#define DNS_LOGMODULE_HINTS (&dns_modules[24]) -#define DNS_LOGMODULE_UNUSED1 (&dns_modules[25]) -#define DNS_LOGMODULE_DLZ (&dns_modules[26]) -#define DNS_LOGMODULE_DNSSEC (&dns_modules[27]) -#define DNS_LOGMODULE_CRYPTO (&dns_modules[28]) -#define DNS_LOGMODULE_PACKETS (&dns_modules[29]) -#define DNS_LOGMODULE_NTA (&dns_modules[30]) -#define DNS_LOGMODULE_DYNDB (&dns_modules[31]) -#define DNS_LOGMODULE_DNSTAP (&dns_modules[32]) -#define DNS_LOGMODULE_SSU (&dns_modules[33]) +#define DNS_LOGMODULE_RBT (&dns_modules[2]) +#define DNS_LOGMODULE_RDATA (&dns_modules[3]) +#define DNS_LOGMODULE_MASTER (&dns_modules[4]) +#define DNS_LOGMODULE_MESSAGE (&dns_modules[5]) +#define DNS_LOGMODULE_CACHE (&dns_modules[6]) +#define DNS_LOGMODULE_CONFIG (&dns_modules[7]) +#define DNS_LOGMODULE_RESOLVER (&dns_modules[8]) +#define DNS_LOGMODULE_ZONE (&dns_modules[9]) +#define DNS_LOGMODULE_JOURNAL (&dns_modules[10]) +#define DNS_LOGMODULE_ADB (&dns_modules[11]) +#define DNS_LOGMODULE_XFER_IN (&dns_modules[12]) +#define DNS_LOGMODULE_XFER_OUT (&dns_modules[13]) +#define DNS_LOGMODULE_ACL (&dns_modules[14]) +#define DNS_LOGMODULE_VALIDATOR (&dns_modules[15]) +#define DNS_LOGMODULE_DISPATCH (&dns_modules[16]) +#define DNS_LOGMODULE_REQUEST (&dns_modules[17]) +#define DNS_LOGMODULE_MASTERDUMP (&dns_modules[18]) +#define DNS_LOGMODULE_TSIG (&dns_modules[19]) +#define DNS_LOGMODULE_TKEY (&dns_modules[20]) +#define DNS_LOGMODULE_SDB (&dns_modules[21]) +#define DNS_LOGMODULE_DIFF (&dns_modules[22]) +#define DNS_LOGMODULE_HINTS (&dns_modules[23]) +#define DNS_LOGMODULE_UNUSED1 (&dns_modules[24]) +#define DNS_LOGMODULE_DLZ (&dns_modules[25]) +#define DNS_LOGMODULE_DNSSEC (&dns_modules[26]) +#define DNS_LOGMODULE_CRYPTO (&dns_modules[27]) +#define DNS_LOGMODULE_PACKETS (&dns_modules[28]) +#define DNS_LOGMODULE_NTA (&dns_modules[29]) +#define DNS_LOGMODULE_DYNDB (&dns_modules[30]) +#define DNS_LOGMODULE_DNSTAP (&dns_modules[31]) +#define DNS_LOGMODULE_SSU (&dns_modules[32]) ISC_LANG_BEGINDECLS diff --git a/lib/dns/log.c b/lib/dns/log.c index d777f515da6..910c4fb981f 100644 --- a/lib/dns/log.c +++ b/lib/dns/log.c @@ -52,7 +52,6 @@ LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = { LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = { { "dns/db", 0 }, { "dns/rbtdb", 0 }, - { "dns/rbtdb64", 0 }, { "dns/rbt", 0 }, { "dns/rdata", 0 }, { "dns/master", 0 }, diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 9d40e86f2cd..4c506a8cff1 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -78,17 +78,9 @@ #define MAP_FAILED ((void *)-1) #endif -#ifdef DNS_RBTDB_VERSION64 -#include "rbtdb64.h" -#else #include "rbtdb.h" -#endif -#ifdef DNS_RBTDB_VERSION64 -#define RBTDB_MAGIC ISC_MAGIC('R', 'B', 'D', '8') -#else #define RBTDB_MAGIC ISC_MAGIC('R', 'B', 'D', '4') -#endif #define CHECK(op) \ do { result = (op); \ @@ -125,187 +117,7 @@ struct rbtdb_file_header { #define VALID_RBTDB(rbtdb) ((rbtdb) != NULL && \ (rbtdb)->common.impmagic == RBTDB_MAGIC) -#ifdef DNS_RBTDB_VERSION64 -typedef isc_uint64_t rbtdb_serial_t; -/*% - * Make casting easier in symbolic debuggers by using different names - * for the 64 bit version. - */ -#define dns_rbtdb_t dns_rbtdb64_t -#define rdatasetheader_t rdatasetheader64_t -#define rbtdb_version_t rbtdb_version64_t - -#define once once64 -#define FILE_VERSION FILE_VERSION64 -#define init_count init_count64 - -#define cache_methods cache_methods64 -#define dbiterator_methods dbiterator_methods64 -#define rdataset_methods rdataset_methods64 -#define rdatasetiter_methods rdatasetiter_methods64 -#define slab_methods slab_methods64 -#define zone_methods zone_methods64 - -#define activeempty activeempty64 -#define activeemtpynode activeemtpynode64 -#define add32 add64 -#define add_changed add_changed64 -#define add_empty_wildcards add_empty_wildcards64 -#define add_wildcard_magic add_wildcard_magic64 -#define addclosest addclosest64 -#define addnoqname addnoqname64 -#define addrdataset addrdataset64 -#define adjust_quantum adjust_quantum64 -#define allocate_version allocate_tversion64 -#define allrdatasets allrdatasets64 -#define attach attach64 -#define attachnode attachnode64 -#define attachversion attachversion64 -#define beginload beginload64 -#define bind_rdataset bind_rdataset64 -#define cache_find cache_find64 -#define cache_findrdataset cache_findrdataset64 -#define cache_findzonecut cache_findzonecut64 -#define cache_zonecut_callback cache_zonecut_callback64 -#define check_stale_header check_stale_header64 -#define clean_cache_node clean_cache_node64 -#define clean_stale_headers clean_stale_headers64 -#define clean_zone_node clean_zone_node64 -#define cleanup_dead_nodes cleanup_dead_nodes64 -#define cleanup_dead_nodes_callback cleanup_dead_nodes_callback64 -#define cleanup_nondirty cleanup_nondirty64 -#define closeversion closeversion64 -#define cname_and_other_data cname_and_other_data64 -#define createiterator createiterator64 -#define currentversion currentversion64 -#define dbiterator_current dbiterator_current64 -#define dbiterator_destroy dbiterator_destroy64 -#define dbiterator_first dbiterator_first64 -#define dbiterator_last dbiterator_last64 -#define dbiterator_next dbiterator_next64 -#define dbiterator_origin dbiterator_origin64 -#define dbiterator_pause dbiterator_pause64 -#define dbiterator_prev dbiterator_prev64 -#define dbiterator_seek dbiterator_seek64 -#define decrement_reference decrement_reference64 -#define delegating_type delegating_type64 -#define delete_callback delete_callback64 -#define delete_node delete_node64 -#define deleterdataset deleterdataset64 -#define dereference_iter_node dereference_iter_node64 -#define deserialize32 deserialize64 -#define detach detach64 -#define detachnode detachnode64 -#define dump dump64 -#define endload endload64 -#define expire_header expire_header64 -#define expirenode expirenode64 -#define find_closest_nsec find_closest_nsec64 -#define find_coveringnsec find_coveringnsec64 -#define find_deepest_zonecut find_deepest_zonecut64 -#define find_wildcard find_wildcard64 -#define findnode findnode64 -#define findnodeintree findnodeintree64 -#define findnsec3node findnsec3node64 -#define flush_deletions flush_deletions64 -#define free_gluelist free_gluelist64 -#define free_gluetable free_gluetable64 -#define free_noqname free_noqname64 -#define free_rbtdb free_rbtdb64 -#define free_rbtdb_callback free_rbtdb_callback64 -#define free_rdataset free_rdataset64 -#define getnsec3parameters getnsec3parameters64 -#define getoriginnode getoriginnode64 -#define getrrsetstats getrrsetstats64 -#define getservestalettl getservestalettl64 -#define getsigningtime getsigningtime64 -#define getsize getsize64 -#define glue_nsdname_cb glue_nsdname_cb64 -#define hashsize hashsize64 -#define init_file_version init_file_version64 -#define init_rdataset init_rdataset64 -#define isdnssec isdnssec64 -#define ispersistent ispersistent64 -#define issecure issecure64 -#define iszonesecure iszonesecure64 -#define loading_addrdataset loading_addrdataset64 -#define loadnode loadnode64 -#define make_least_version make_least_version64 -#define mark_header_ancient mark_header_ancient64 -#define mark_stale_header mark_stale_header64 -#define match_header_version match_header_version64 -#define matchparams matchparams64 -#define maybe_free_rbtdb maybe_free_rbtdb64 -#define need_headerupdate need_headerupdate64 -#define new_rdataset new_rdataset64 -#define new_reference new_reference64 -#define newversion newversion64 -#define nodecount nodecount64 -#define nodefullname nodefullname64 -#define overmem overmem64 -#define overmem_purge overmem_purge64 -#define previous_closest_nsec previous_closest_nsec64 -#define printnode printnode64 -#define prune_tree prune_tree64 -#define rbt_datafixer rbt_datafixer64 -#define rbt_datawriter rbt_datawriter64 -#define rbtdb_write_header rbtdb_write_header64 -#define rbtdb_zero_header rbtdb_zero_header64 -#define rdataset_addglue rdataset_addglue64 -#define rdataset_clearprefetch rdataset_clearprefetch64 -#define rdataset_clone rdataset_clone64 -#define rdataset_count rdataset_count64 -#define rdataset_current rdataset_current64 -#define rdataset_disassociate rdataset_disassociate64 -#define rdataset_expire rdataset_expire64 -#define rdataset_first rdataset_first64 -#define rdataset_getclosest rdataset_getclosest64 -#define rdataset_getnoqname rdataset_getnoqname64 -#define rdataset_getownercase rdataset_getownercase64 -#define rdataset_next rdataset_next64 -#define rdataset_setownercase rdataset_setownercase64 -#define rdataset_settrust rdataset_settrust64 -#define rdatasetiter_current rdatasetiter_current64 -#define rdatasetiter_destroy rdatasetiter_destroy64 -#define rdatasetiter_first rdatasetiter_first64 -#define rdatasetiter_next rdatasetiter_next64 -#define reactivate_node reactivate_node64 -#define reference_iter_node reference_iter_node64 -#define rehash_gluetable rehash_gluetable64 -#define resign_delete resign_delete64 -#define resign_insert resign_insert64 -#define resign_sooner resign_sooner64 -#define resigned resigned64 -#define resume_iteration resume_iteration64 -#define rollback_node rollback_node64 -#define serialize serialize64 -#define set_index set_index64 -#define set_ttl set_ttl64 -#define setcachestats setcachestats64 -#define setgluecachestats setgluecachestats64 -#define setnsec3parameters setnsec3parameters64 -#define setownercase setownercase64 -#define setservestalettl setservestalettl64 -#define setsigningtime setsigningtime64 -#define settask settask64 -#define setup_delegation setup_delegation64 -#define subtractrdataset subtractrdataset64 -#define ttl_sooner ttl_sooner64 -#define update_cachestats update_cachestats64 -#define update_header update_header64 -#define update_newheader update_newheader64 -#define update_recordsandbytes update_recordsandbytes64 -#define update_rrsetstats update_rrsetstats64 -#define valid_glue valid_glue64 -#define zone_find zone_find64 -#define zone_findrdataset zone_findrdataset64 -#define zone_findzonecut zone_findzonecut64 -#define zone_zonecut_callback zone_zonecut_callback64 - -#else typedef isc_uint32_t rbtdb_serial_t; -#endif - typedef isc_uint32_t rbtdb_rdatatype_t; #define RBTDB_RDATATYPE_BASE(type) ((dns_rdatatype_t)((type) & 0xFFFF)) @@ -8435,12 +8247,7 @@ static dns_dbmethods_t cache_methods = { }; isc_result_t -#ifdef DNS_RBTDB_VERSION64 -dns_rbtdb64_create -#else -dns_rbtdb_create -#endif - (isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, +dns_rbtdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp) { diff --git a/lib/dns/rbtdb64.c b/lib/dns/rbtdb64.c deleted file mode 100644 index 6f4a659c9c0..00000000000 --- a/lib/dns/rbtdb64.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 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 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/* $Id: rbtdb64.c,v 1.11 2007/06/19 23:47:16 tbox Exp $ */ - -/*! \file */ - -#define DNS_RBTDB_VERSION64 1 -#include "rbtdb.c" diff --git a/lib/dns/rbtdb64.h b/lib/dns/rbtdb64.h deleted file mode 100644 index 796fc664e8b..00000000000 --- a/lib/dns/rbtdb64.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 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 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/* $Id: rbtdb64.h,v 1.17 2007/06/19 23:47:16 tbox Exp $ */ - -#ifndef DNS_RBTDB64_H -#define DNS_RBTDB64_H 1 - -#include - -/***** - ***** Module Info - *****/ - -/*! \file - * \brief - * DNS Red-Black Tree DB Implementation with 64-bit version numbers - */ - -#include - -ISC_LANG_BEGINDECLS - -isc_result_t -dns_rbtdb64_create(isc_mem_t *mctx, const dns_name_t *base, dns_dbtype_t type, - dns_rdataclass_t rdclass, unsigned int argc, char *argv[], - void *driverarg, dns_db_t **dbp); - -ISC_LANG_ENDDECLS - -#endif /* DNS_RBTDB64_H */ diff --git a/lib/dns/win32/libdns.vcxproj.filters.in b/lib/dns/win32/libdns.vcxproj.filters.in index 067daf95428..3ae2af9888e 100644 --- a/lib/dns/win32/libdns.vcxproj.filters.in +++ b/lib/dns/win32/libdns.vcxproj.filters.in @@ -173,9 +173,6 @@ Library Source Files - - Library Source Files - Library Source Files @@ -356,9 +353,6 @@ Library Header Files - - Library Header Files - Library Header Files diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in index d6d272d03bf..ea568bd702c 100644 --- a/lib/dns/win32/libdns.vcxproj.in +++ b/lib/dns/win32/libdns.vcxproj.in @@ -184,7 +184,6 @@ - @@ -336,7 +335,6 @@ - diff --git a/util/checklibs.sh b/util/checklibs.sh index 8d080cad244..0b8dae54bc3 100755 --- a/util/checklibs.sh +++ b/util/checklibs.sh @@ -60,7 +60,7 @@ list=`git ls-files -c bin lib | grep '\.c$' | xargs grep -L '#include ["<]config.h[">]' | grep -vE -e '(/win32/|bin/pkcs11/|lib/dns/rdata|lib/bind/)' \ -e '(ifiter_|lib/dns/gen.c|lib/dns/spnego_asn1.c)' \ - -e '(lib/dns/rbtdb64.c|lib/isc/entropy.c|lib/isc/fsaccess.c)' \ + -e '(lib/isc/entropy.c|lib/isc/fsaccess.c)' \ -e '(bin/tests/virtual-time/vtwrapper.c|symtbl.c|version.c)'` [ -n "$list" ] && { status=1 diff --git a/util/copyrights b/util/copyrights index bf3d26b0628..2c9a3d34352 100644 --- a/util/copyrights +++ b/util/copyrights @@ -3118,8 +3118,6 @@ ./lib/dns/rbt.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018 ./lib/dns/rbtdb.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 ./lib/dns/rbtdb.h C 1999,2000,2001,2004,2005,2007,2011,2012,2016,2018 -./lib/dns/rbtdb64.c C 1999,2000,2001,2004,2005,2007,2016,2018 -./lib/dns/rbtdb64.h C 1999,2000,2001,2004,2005,2007,2016,2018 ./lib/dns/rcode.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 ./lib/dns/rdata.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 ./lib/dns/rdata/any_255/tsig_250.c C 1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017,2018