Remove 'ephemeral' database implementation

The 'ephemeral' database implementation was used to provide a
lightweight database implemenation that doesn't cache results, and the
only place where it was really use is "samples" because delv is
overriding this to use "rbtdb" instead. Otherwise it was completely
unused.

 * The 'ephemeral' cache DB (ecdb) implementation.  An ecdb just provides
 * temporary storage for ongoing name resolution with the common DB interfaces.
 * It actually doesn't cache anything.  The implementation expects any stored
 * data is released within a short period, and does not care about the
 * scalability in terms of the number of nodes.

bin/delv/delv.c

@@ -1713,7 +1713,7 @@ main(int argc, char *argv[]) {
 	char namestr[DNS_NAME_FORMATSIZE];
 	dns_rdataset_t *rdataset;
 	dns_namelist_t namelist;
-	unsigned int resopt, clopt;
+	unsigned int resopt;
 	isc_appctx_t *actx = NULL;
 	isc_taskmgr_t *taskmgr = NULL;
 	isc_socketmgr_t *socketmgr = NULL;
@@ -1760,9 +1760,8 @@ main(int argc, char *argv[]) {
 #endif /* ifndef WIN32 */
 
 	/* Create client */
-	clopt = DNS_CLIENTCREATEOPT_USECACHE;
+	result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr, 0,
-	result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr,
+				    &client, srcaddr4, srcaddr6);
-				    clopt, &client, srcaddr4, srcaddr6);
 	if (result != ISC_R_SUCCESS) {
 		delv_log(ISC_LOG_ERROR, "dns_client_create: %s",
 			 isc_result_totext(result));

lib/dns/Makefile.am

@@ -74,7 +74,6 @@ libdns_la_HEADERS =			\
 	include/dns/dyndb.h		\
 	include/dns/ecs.h		\
 	include/dns/edns.h		\
-	include/dns/ecdb.h		\
 	include/dns/events.h		\
 	include/dns/fixedname.h		\
 	include/dns/forward.h		\
@@ -248,7 +247,6 @@ libdns_la_SOURCES =			\
 	zonekey.c			\
 	zt.c				\
 	client.c			\
-	ecdb.c				\
 	rdatalist_p.h			\
 	tsig_p.h			\
 	zone_p.h

lib/dns/client.c

@@ -358,14 +358,13 @@ getudpdispatch(int family, dns_dispatchmgr_t *dispatchmgr,
 }
 
 static isc_result_t
-createview(isc_mem_t *mctx, dns_rdataclass_t rdclass, unsigned int options,
+createview(isc_mem_t *mctx, dns_rdataclass_t rdclass, isc_taskmgr_t *taskmgr,
-	   isc_taskmgr_t *taskmgr, unsigned int ntasks,
+	   unsigned int ntasks, isc_socketmgr_t *socketmgr,
-	   isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr,
+	   isc_timermgr_t *timermgr, dns_dispatchmgr_t *dispatchmgr,
-	   dns_dispatchmgr_t *dispatchmgr, dns_dispatch_t *dispatchv4,
+	   dns_dispatch_t *dispatchv4, dns_dispatch_t *dispatchv6,
-	   dns_dispatch_t *dispatchv6, dns_view_t **viewp) {
+	   dns_view_t **viewp) {
 	isc_result_t result;
 	dns_view_t *view = NULL;
-	const char *dbtype;
 
 	result = dns_view_create(mctx, rdclass, DNS_CLIENTVIEW_NAME, &view);
 	if (result != ISC_R_SUCCESS) {
@@ -387,17 +386,7 @@ createview(isc_mem_t *mctx, dns_rdataclass_t rdclass, unsigned int options,
 		return (result);
 	}
 
-	/*
+	result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_cache,
-	 * Set cache DB.
-	 * XXX: it may be better if specific DB implementations can be
-	 * specified via some configuration knob.
-	 */
-	if ((options & DNS_CLIENTCREATEOPT_USECACHE) != 0) {
-		dbtype = "rbt";
-	} else {
-		dbtype = "ecdb";
-	}
-	result = dns_db_create(mctx, dbtype, dns_rootname, dns_dbtype_cache,
 			       rdclass, 0, NULL, &view->cachedb);
 	if (result != ISC_R_SUCCESS) {
 		dns_view_detach(&view);
@@ -505,6 +494,8 @@ dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr,
 	REQUIRE(socketmgr != NULL);
 	REQUIRE(clientp != NULL && *clientp == NULL);
 
+	UNUSED(options);
+
 	client = isc_mem_get(mctx, sizeof(*client));
 
 	isc_mutex_init(&client->lock);
@@ -558,9 +549,9 @@ dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr,
 	isc_refcount_init(&client->references, 1);
 
 	/* Create the default view for class IN */
-	result = createview(mctx, dns_rdataclass_in, options, taskmgr,
+	result = createview(mctx, dns_rdataclass_in, taskmgr, RESOLVER_NTASKS,
-			    RESOLVER_NTASKS, socketmgr, timermgr, dispatchmgr,
+			    socketmgr, timermgr, dispatchmgr, dispatchv4,
-			    dispatchv4, dispatchv6, &view);
+			    dispatchv6, &view);
 	if (result != ISC_R_SUCCESS) {
 		goto cleanup_references;
 	}

lib/dns/ecdb.c

@@ -1,793 +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.
- */
-
-#include <stdbool.h>
-
-#include <isc/mem.h>
-#include <isc/mutex.h>
-#include <isc/refcount.h>
-#include <isc/result.h>
-#include <isc/util.h>
-
-#include <dns/db.h>
-#include <dns/ecdb.h>
-#include <dns/rdata.h>
-#include <dns/rdataset.h>
-#include <dns/rdatasetiter.h>
-#include <dns/rdataslab.h>
-
-#define ECDB_MAGIC     ISC_MAGIC('E', 'C', 'D', 'B')
-#define VALID_ECDB(db) ((db) != NULL && (db)->common.impmagic == ECDB_MAGIC)
-
-#define ECDBNODE_MAGIC	      ISC_MAGIC('E', 'C', 'D', 'N')
-#define VALID_ECDBNODE(ecdbn) ISC_MAGIC_VALID(ecdbn, ECDBNODE_MAGIC)
-
-/*%
- * The 'ephemeral' cache DB (ecdb) implementation.  An ecdb just provides
- * temporary storage for ongoing name resolution with the common DB interfaces.
- * It actually doesn't cache anything.  The implementation expects any stored
- * data is released within a short period, and does not care about the
- * scalability in terms of the number of nodes.
- */
-
-typedef struct dns_ecdb {
-	/* Unlocked */
-	dns_db_t common;
-	isc_mutex_t lock;
-
-	/* Protected by atomics */
-	isc_refcount_t references;
-
-	/* Locked */
-	ISC_LIST(struct dns_ecdbnode) nodes;
-} dns_ecdb_t;
-
-typedef struct dns_ecdbnode {
-	/* Unlocked */
-	unsigned int magic;
-	isc_mutex_t lock;
-	dns_ecdb_t *ecdb;
-	dns_name_t name;
-	ISC_LINK(struct dns_ecdbnode) link;
-
-	/* Locked */
-	ISC_LIST(struct rdatasetheader) rdatasets;
-
-	/* Protected by atomics */
-	isc_refcount_t references;
-} dns_ecdbnode_t;
-
-typedef struct rdatasetheader {
-	dns_rdatatype_t type;
-	dns_ttl_t ttl;
-	dns_trust_t trust;
-	dns_rdatatype_t covers;
-	unsigned int attributes;
-
-	ISC_LINK(struct rdatasetheader) link;
-} rdatasetheader_t;
-
-/* Copied from rbtdb.c */
-#define RDATASET_ATTR_NXDOMAIN 0x0010
-#define RDATASET_ATTR_NEGATIVE 0x0100
-#define NXDOMAIN(header)       (((header)->attributes & RDATASET_ATTR_NXDOMAIN) != 0)
-#define NEGATIVE(header)       (((header)->attributes & RDATASET_ATTR_NEGATIVE) != 0)
-
-static isc_result_t
-dns_ecdb_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);
-
-static void
-rdataset_disassociate(dns_rdataset_t *rdataset);
-static isc_result_t
-rdataset_first(dns_rdataset_t *rdataset);
-static isc_result_t
-rdataset_next(dns_rdataset_t *rdataset);
-static void
-rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
-static void
-rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target);
-static unsigned int
-rdataset_count(dns_rdataset_t *rdataset);
-static void
-rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust);
-
-static dns_rdatasetmethods_t rdataset_methods = {
-	rdataset_disassociate,
-	rdataset_first,
-	rdataset_next,
-	rdataset_current,
-	rdataset_clone,
-	rdataset_count,
-	NULL,		   /* addnoqname */
-	NULL,		   /* getnoqname */
-	NULL,		   /* addclosest */
-	NULL,		   /* getclosest */
-	rdataset_settrust, /* settrust */
-	NULL,		   /* expire */
-	NULL,		   /* clearprefetch */
-	NULL,		   /* setownercase */
-	NULL,		   /* getownercase */
-	NULL		   /* addglue */
-};
-
-typedef struct ecdb_rdatasetiter {
-	dns_rdatasetiter_t common;
-	rdatasetheader_t *current;
-} ecdb_rdatasetiter_t;
-
-static void
-rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp);
-static isc_result_t
-rdatasetiter_first(dns_rdatasetiter_t *iterator);
-static isc_result_t
-rdatasetiter_next(dns_rdatasetiter_t *iterator);
-static void
-rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset);
-
-static dns_rdatasetitermethods_t rdatasetiter_methods = {
-	rdatasetiter_destroy, rdatasetiter_first, rdatasetiter_next,
-	rdatasetiter_current
-};
-
-isc_result_t
-dns_ecdb_register(isc_mem_t *mctx, dns_dbimplementation_t **dbimp) {
-	REQUIRE(mctx != NULL);
-	REQUIRE(dbimp != NULL && *dbimp == NULL);
-
-	return (dns_db_register("ecdb", dns_ecdb_create, NULL, mctx, dbimp));
-}
-
-void
-dns_ecdb_unregister(dns_dbimplementation_t **dbimp) {
-	REQUIRE(dbimp != NULL && *dbimp != NULL);
-
-	dns_db_unregister(dbimp);
-}
-
-/*%
- * DB routines
- */
-
-static void
-attach(dns_db_t *source, dns_db_t **targetp) {
-	dns_ecdb_t *ecdb = (dns_ecdb_t *)source;
-
-	REQUIRE(VALID_ECDB(ecdb));
-	REQUIRE(targetp != NULL && *targetp == NULL);
-
-	isc_refcount_increment(&ecdb->references);
-
-	*targetp = source;
-}
-
-static void
-destroy_ecdb(dns_ecdb_t *ecdb) {
-	if (isc_refcount_decrement(&ecdb->references) == 1) {
-		isc_refcount_destroy(&ecdb->references);
-
-		INSIST(ISC_LIST_EMPTY(ecdb->nodes));
-
-		if (dns_name_dynamic(&ecdb->common.origin)) {
-			dns_name_free(&ecdb->common.origin, ecdb->common.mctx);
-		}
-
-		isc_mutex_destroy(&ecdb->lock);
-
-		ecdb->common.impmagic = 0;
-		ecdb->common.magic = 0;
-
-		isc_mem_putanddetach(&ecdb->common.mctx, ecdb, sizeof(*ecdb));
-	}
-}
-
-static void
-detach(dns_db_t **dbp) {
-	dns_ecdb_t *ecdb;
-
-	REQUIRE(dbp != NULL);
-	ecdb = (dns_ecdb_t *)*dbp;
-	REQUIRE(VALID_ECDB(ecdb));
-
-	*dbp = NULL;
-
-	destroy_ecdb(ecdb);
-}
-
-static void
-attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) {
-	dns_ecdb_t *ecdb = (dns_ecdb_t *)db;
-	dns_ecdbnode_t *node = (dns_ecdbnode_t *)source;
-
-	REQUIRE(VALID_ECDB(ecdb));
-	REQUIRE(VALID_ECDBNODE(node));
-	REQUIRE(targetp != NULL && *targetp == NULL);
-
-	isc_refcount_increment(&node->references);
-	isc_refcount_increment(&node->references);
-
-	*targetp = node;
-}
-
-static void
-destroynode(dns_ecdbnode_t *node) {
-	isc_mem_t *mctx;
-	dns_ecdb_t *ecdb = node->ecdb;
-	rdatasetheader_t *header;
-
-	mctx = ecdb->common.mctx;
-
-	LOCK(&ecdb->lock);
-	ISC_LIST_UNLINK(ecdb->nodes, node, link);
-	UNLOCK(&ecdb->lock);
-
-	dns_name_free(&node->name, mctx);
-
-	while ((header = ISC_LIST_HEAD(node->rdatasets)) != NULL) {
-		unsigned int headersize;
-
-		ISC_LIST_UNLINK(node->rdatasets, header, link);
-		headersize = dns_rdataslab_size((unsigned char *)header,
-						sizeof(*header));
-		isc_mem_put(mctx, header, headersize);
-	}
-
-	isc_mutex_destroy(&node->lock);
-	isc_refcount_destroy(&node->references);
-
-	node->magic = 0;
-	isc_mem_put(mctx, node, sizeof(*node));
-
-	destroy_ecdb(ecdb);
-}
-
-static void
-detachnode(dns_db_t *db, dns_dbnode_t **nodep) {
-	dns_ecdb_t *ecdb = (dns_ecdb_t *)db;
-	dns_ecdbnode_t *node;
-
-	REQUIRE(VALID_ECDB(ecdb));
-	REQUIRE(nodep != NULL);
-	node = (dns_ecdbnode_t *)*nodep;
-	REQUIRE(VALID_ECDBNODE(node));
-	*nodep = NULL;
-
-	if (isc_refcount_decrement(&node->references) == 1) {
-		destroynode(node);
-	}
-}
-
-static isc_result_t
-find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
-     dns_rdatatype_t type, unsigned int options, isc_stdtime_t now,
-     dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset,
-     dns_rdataset_t *sigrdataset) {
-	dns_ecdb_t *ecdb = (dns_ecdb_t *)db;
-
-	REQUIRE(VALID_ECDB(ecdb));
-
-	UNUSED(name);
-	UNUSED(version);
-	UNUSED(type);
-	UNUSED(options);
-	UNUSED(now);
-	UNUSED(nodep);
-	UNUSED(foundname);
-	UNUSED(rdataset);
-	UNUSED(sigrdataset);
-
-	return (ISC_R_NOTFOUND);
-}
-
-static isc_result_t
-findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options,
-	    isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname,
-	    dns_name_t *dcname, dns_rdataset_t *rdataset,
-	    dns_rdataset_t *sigrdataset) {
-	dns_ecdb_t *ecdb = (dns_ecdb_t *)db;
-
-	REQUIRE(VALID_ECDB(ecdb));
-
-	UNUSED(name);
-	UNUSED(options);
-	UNUSED(now);
-	UNUSED(nodep);
-	UNUSED(foundname);
-	UNUSED(dcname);
-	UNUSED(rdataset);
-	UNUSED(sigrdataset);
-
-	return (ISC_R_NOTFOUND);
-}
-
-static isc_result_t
-findnode(dns_db_t *db, const dns_name_t *name, bool create,
-	 dns_dbnode_t **nodep) {
-	dns_ecdb_t *ecdb = (dns_ecdb_t *)db;
-	isc_mem_t *mctx;
-	dns_ecdbnode_t *node;
-
-	REQUIRE(VALID_ECDB(ecdb));
-	REQUIRE(nodep != NULL && *nodep == NULL);
-
-	UNUSED(name);
-
-	if (create != true) {
-		/* an 'ephemeral' node is never reused. */
-		return (ISC_R_NOTFOUND);
-	}
-
-	mctx = ecdb->common.mctx;
-	node = isc_mem_get(mctx, sizeof(*node));
-
-	isc_mutex_init(&node->lock);
-
-	dns_name_init(&node->name, NULL);
-	dns_name_dup(name, mctx, &node->name);
-
-	isc_refcount_init(&node->references, 1);
-	ISC_LIST_INIT(node->rdatasets);
-
-	ISC_LINK_INIT(node, link);
-
-	isc_refcount_increment(&ecdb->references);
-	node->ecdb = ecdb;
-
-	LOCK(&ecdb->lock);
-	ISC_LIST_APPEND(ecdb->nodes, node, link);
-	UNLOCK(&ecdb->lock);
-
-	node->magic = ECDBNODE_MAGIC;
-
-	*nodep = node;
-
-	return (ISC_R_SUCCESS);
-}
-
-static void
-bind_rdataset(dns_ecdb_t *ecdb, dns_ecdbnode_t *node, rdatasetheader_t *header,
-	      dns_rdataset_t *rdataset) {
-	unsigned char *raw;
-
-	/*
-	 * Caller must be holding the node lock.
-	 */
-
-	REQUIRE(!dns_rdataset_isassociated(rdataset));
-
-	rdataset->methods = &rdataset_methods;
-	rdataset->rdclass = ecdb->common.rdclass;
-	rdataset->type = header->type;
-	rdataset->covers = header->covers;
-	rdataset->ttl = header->ttl;
-	rdataset->trust = header->trust;
-	if (NXDOMAIN(header)) {
-		rdataset->attributes |= DNS_RDATASETATTR_NXDOMAIN;
-	}
-	if (NEGATIVE(header)) {
-		rdataset->attributes |= DNS_RDATASETATTR_NEGATIVE;
-	}
-
-	rdataset->private1 = ecdb;
-	rdataset->private2 = node;
-	raw = (unsigned char *)header + sizeof(*header);
-	rdataset->private3 = raw;
-	rdataset->count = 0;
-
-	/*
-	 * Reset iterator state.
-	 */
-	rdataset->privateuint4 = 0;
-	rdataset->private5 = NULL;
-
-	isc_refcount_increment(&node->references);
-}
-
-static isc_result_t
-addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
-	    isc_stdtime_t now, dns_rdataset_t *rdataset, unsigned int options,
-	    dns_rdataset_t *addedrdataset) {
-	dns_ecdb_t *ecdb = (dns_ecdb_t *)db;
-	isc_region_t r;
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_mem_t *mctx;
-	dns_ecdbnode_t *ecdbnode = (dns_ecdbnode_t *)node;
-	rdatasetheader_t *header;
-
-	REQUIRE(VALID_ECDB(ecdb));
-	REQUIRE(VALID_ECDBNODE(ecdbnode));
-
-	UNUSED(version);
-	UNUSED(now);
-	UNUSED(options);
-
-	mctx = ecdb->common.mctx;
-
-	LOCK(&ecdbnode->lock);
-
-	/*
-	 * Sanity check: this implementation does not allow overriding an
-	 * existing rdataset of the same type.
-	 */
-	for (header = ISC_LIST_HEAD(ecdbnode->rdatasets); header != NULL;
-	     header = ISC_LIST_NEXT(header, link))
-	{
-		INSIST(header->type != rdataset->type ||
-		       header->covers != rdataset->covers);
-	}
-
-	result = dns_rdataslab_fromrdataset(rdataset, mctx, &r,
-					    sizeof(rdatasetheader_t));
-	if (result != ISC_R_SUCCESS) {
-		goto unlock;
-	}
-
-	header = (rdatasetheader_t *)r.base;
-	header->type = rdataset->type;
-	header->ttl = rdataset->ttl;
-	header->trust = rdataset->trust;
-	header->covers = rdataset->covers;
-	header->attributes = 0;
-	if ((rdataset->attributes & DNS_RDATASETATTR_NXDOMAIN) != 0) {
-		header->attributes |= RDATASET_ATTR_NXDOMAIN;
-	}
-	if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) {
-		header->attributes |= RDATASET_ATTR_NEGATIVE;
-	}
-	ISC_LINK_INIT(header, link);
-	ISC_LIST_APPEND(ecdbnode->rdatasets, header, link);
-
-	if (addedrdataset == NULL) {
-		goto unlock;
-	}
-
-	bind_rdataset(ecdb, ecdbnode, header, addedrdataset);
-
-unlock:
-	UNLOCK(&ecdbnode->lock);
-
-	return (result);
-}
-
-static isc_result_t
-deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
-	       dns_rdatatype_t type, dns_rdatatype_t covers) {
-	UNUSED(db);
-	UNUSED(node);
-	UNUSED(version);
-	UNUSED(type);
-	UNUSED(covers);
-
-	return (ISC_R_NOTIMPLEMENTED);
-}
-
-static isc_result_t
-createiterator(dns_db_t *db, unsigned int options,
-	       dns_dbiterator_t **iteratorp) {
-	UNUSED(db);
-	UNUSED(options);
-	UNUSED(iteratorp);
-
-	return (ISC_R_NOTIMPLEMENTED);
-}
-
-static isc_result_t
-allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
-	     isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) {
-	dns_ecdb_t *ecdb = (dns_ecdb_t *)db;
-	dns_ecdbnode_t *ecdbnode = (dns_ecdbnode_t *)node;
-	isc_mem_t *mctx;
-	ecdb_rdatasetiter_t *iterator;
-
-	REQUIRE(VALID_ECDB(ecdb));
-	REQUIRE(VALID_ECDBNODE(ecdbnode));
-
-	mctx = ecdb->common.mctx;
-
-	iterator = isc_mem_get(mctx, sizeof(ecdb_rdatasetiter_t));
-
-	iterator->common.magic = DNS_RDATASETITER_MAGIC;
-	iterator->common.methods = &rdatasetiter_methods;
-	iterator->common.db = db;
-	iterator->common.node = NULL;
-	attachnode(db, node, &iterator->common.node);
-	iterator->common.version = version;
-	iterator->common.now = now;
-
-	*iteratorp = (dns_rdatasetiter_t *)iterator;
-
-	return (ISC_R_SUCCESS);
-}
-
-static dns_dbmethods_t ecdb_methods = {
-	attach,
-	detach,
-	NULL, /* beginload */
-	NULL, /* endload */
-	NULL, /* serialize */
-	NULL, /* dump */
-	NULL, /* currentversion */
-	NULL, /* newversion */
-	NULL, /* attachversion */
-	NULL, /* closeversion */
-	findnode,
-	find,
-	findzonecut,
-	attachnode,
-	detachnode,
-	NULL,		/* expirenode */
-	NULL,		/* printnode */
-	createiterator, /* createiterator */
-	NULL,		/* findrdataset */
-	allrdatasets,
-	addrdataset,
-	NULL, /* subtractrdataset */
-	deleterdataset,
-	NULL, /* issecure */
-	NULL, /* nodecount */
-	NULL, /* ispersistent */
-	NULL, /* overmem */
-	NULL, /* settask */
-	NULL, /* getoriginnode */
-	NULL, /* transfernode */
-	NULL, /* getnsec3parameters */
-	NULL, /* findnsec3node */
-	NULL, /* setsigningtime */
-	NULL, /* getsigningtime */
-	NULL, /* resigned */
-	NULL, /* isdnssec */
-	NULL, /* getrrsetstats */
-	NULL, /* rpz_attach */
-	NULL, /* rpz_ready */
-	NULL, /* findnodeext */
-	NULL, /* findext */
-	NULL, /* setcachestats */
-	NULL, /* hashsize */
-	NULL, /* nodefullname */
-	NULL, /* getsize */
-	NULL, /* setservestalettl */
-	NULL, /* getservestalettl */
-	NULL  /* setgluecachestats */
-};
-
-static isc_result_t
-dns_ecdb_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) {
-	dns_ecdb_t *ecdb;
-	isc_result_t result;
-
-	REQUIRE(mctx != NULL);
-	REQUIRE(origin == dns_rootname);
-	REQUIRE(type == dns_dbtype_cache);
-	REQUIRE(dbp != NULL && *dbp == NULL);
-
-	UNUSED(argc);
-	UNUSED(argv);
-	UNUSED(driverarg);
-
-	ecdb = isc_mem_get(mctx, sizeof(*ecdb));
-
-	ecdb->common.attributes = DNS_DBATTR_CACHE;
-	ecdb->common.rdclass = rdclass;
-	ecdb->common.methods = &ecdb_methods;
-	dns_name_init(&ecdb->common.origin, NULL);
-	result = dns_name_dupwithoffsets(origin, mctx, &ecdb->common.origin);
-	if (result != ISC_R_SUCCESS) {
-		isc_mem_put(mctx, ecdb, sizeof(*ecdb));
-		return (result);
-	}
-
-	isc_mutex_init(&ecdb->lock);
-
-	isc_refcount_init(&ecdb->references, 1);
-	ISC_LIST_INIT(ecdb->nodes);
-
-	ecdb->common.mctx = NULL;
-	isc_mem_attach(mctx, &ecdb->common.mctx);
-	ecdb->common.impmagic = ECDB_MAGIC;
-	ecdb->common.magic = DNS_DB_MAGIC;
-
-	*dbp = (dns_db_t *)ecdb;
-
-	return (ISC_R_SUCCESS);
-}
-
-/*%
- * Rdataset Methods
- */
-
-static void
-rdataset_disassociate(dns_rdataset_t *rdataset) {
-	dns_db_t *db = rdataset->private1;
-	dns_dbnode_t *node = rdataset->private2;
-
-	dns_db_detachnode(db, &node);
-}
-
-static isc_result_t
-rdataset_first(dns_rdataset_t *rdataset) {
-	unsigned char *raw = rdataset->private3;
-	unsigned int count;
-
-	count = raw[0] * 256 + raw[1];
-	if (count == 0) {
-		rdataset->private5 = NULL;
-		return (ISC_R_NOMORE);
-	}
-#if DNS_RDATASET_FIXED
-	raw += 2 + (4 * count);
-#else  /* if DNS_RDATASET_FIXED */
-	raw += 2;
-#endif /* if DNS_RDATASET_FIXED */
-	/*
-	 * The privateuint4 field is the number of rdata beyond the cursor
-	 * position, so we decrement the total count by one before storing
-	 * it.
-	 */
-	count--;
-	rdataset->privateuint4 = count;
-	rdataset->private5 = raw;
-
-	return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-rdataset_next(dns_rdataset_t *rdataset) {
-	unsigned int count;
-	unsigned int length;
-	unsigned char *raw;
-
-	count = rdataset->privateuint4;
-	if (count == 0) {
-		return (ISC_R_NOMORE);
-	}
-	count--;
-	rdataset->privateuint4 = count;
-	raw = rdataset->private5;
-	length = raw[0] * 256 + raw[1];
-#if DNS_RDATASET_FIXED
-	raw += length + 4;
-#else  /* if DNS_RDATASET_FIXED */
-	raw += length + 2;
-#endif /* if DNS_RDATASET_FIXED */
-	rdataset->private5 = raw;
-
-	return (ISC_R_SUCCESS);
-}
-
-static void
-rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
-	unsigned char *raw = rdataset->private5;
-	isc_region_t r;
-	unsigned int length;
-	unsigned int flags = 0;
-
-	REQUIRE(raw != NULL);
-
-	length = raw[0] * 256 + raw[1];
-#if DNS_RDATASET_FIXED
-	raw += 4;
-#else  /* if DNS_RDATASET_FIXED */
-	raw += 2;
-#endif /* if DNS_RDATASET_FIXED */
-	if (rdataset->type == dns_rdatatype_rrsig) {
-		if ((*raw & DNS_RDATASLAB_OFFLINE) != 0) {
-			flags |= DNS_RDATA_OFFLINE;
-		}
-		length--;
-		raw++;
-	}
-	r.length = length;
-	r.base = raw;
-	dns_rdata_fromregion(rdata, rdataset->rdclass, rdataset->type, &r);
-	rdata->flags |= flags;
-}
-
-static void
-rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) {
-	dns_db_t *db = source->private1;
-	dns_dbnode_t *node = source->private2;
-	dns_dbnode_t *cloned_node = NULL;
-
-	attachnode(db, node, &cloned_node);
-	*target = *source;
-
-	/*
-	 * Reset iterator state.
-	 */
-	target->privateuint4 = 0;
-	target->private5 = NULL;
-}
-
-static unsigned int
-rdataset_count(dns_rdataset_t *rdataset) {
-	unsigned char *raw = rdataset->private3;
-	unsigned int count;
-
-	count = raw[0] * 256 + raw[1];
-
-	return (count);
-}
-
-static void
-rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) {
-	rdatasetheader_t *header = rdataset->private3;
-
-	header--;
-	header->trust = rdataset->trust = trust;
-}
-
-/*
- * Rdataset Iterator Methods
- */
-
-static void
-rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) {
-	isc_mem_t *mctx;
-	union {
-		dns_rdatasetiter_t *rdatasetiterator;
-		ecdb_rdatasetiter_t *ecdbiterator;
-	} u;
-
-	REQUIRE(iteratorp != NULL);
-	REQUIRE(DNS_RDATASETITER_VALID(*iteratorp));
-
-	u.rdatasetiterator = *iteratorp;
-	*iteratorp = NULL;
-
-	mctx = u.ecdbiterator->common.db->mctx;
-	u.ecdbiterator->common.magic = 0;
-
-	dns_db_detachnode(u.ecdbiterator->common.db,
-			  &u.ecdbiterator->common.node);
-	isc_mem_put(mctx, u.ecdbiterator, sizeof(ecdb_rdatasetiter_t));
-}
-
-static isc_result_t
-rdatasetiter_first(dns_rdatasetiter_t *iterator) {
-	REQUIRE(DNS_RDATASETITER_VALID(iterator));
-
-	ecdb_rdatasetiter_t *ecdbiterator = (ecdb_rdatasetiter_t *)iterator;
-	dns_ecdbnode_t *ecdbnode = (dns_ecdbnode_t *)iterator->node;
-
-	if (ISC_LIST_EMPTY(ecdbnode->rdatasets)) {
-		return (ISC_R_NOMORE);
-	}
-	ecdbiterator->current = ISC_LIST_HEAD(ecdbnode->rdatasets);
-	return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-rdatasetiter_next(dns_rdatasetiter_t *iterator) {
-	REQUIRE(DNS_RDATASETITER_VALID(iterator));
-
-	ecdb_rdatasetiter_t *ecdbiterator = (ecdb_rdatasetiter_t *)iterator;
-
-	ecdbiterator->current = ISC_LIST_NEXT(ecdbiterator->current, link);
-	if (ecdbiterator->current == NULL) {
-		return (ISC_R_NOMORE);
-	} else {
-		return (ISC_R_SUCCESS);
-	}
-}
-
-static void
-rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) {
-	ecdb_rdatasetiter_t *ecdbiterator = (ecdb_rdatasetiter_t *)iterator;
-	dns_ecdb_t *ecdb;
-
-	ecdb = (dns_ecdb_t *)iterator->db;
-	REQUIRE(VALID_ECDB(ecdb));
-
-	bind_rdataset(ecdb, iterator->node, ecdbiterator->current, rdataset);
-}

lib/dns/include/dns/client.h

@@ -61,12 +61,6 @@ ISC_LANG_BEGINDECLS
  *** Types
  ***/
 
-/*%
- * Optional flags for dns_client_create(x).
- */
-/*%< Enable caching resolution results (experimental). */
-#define DNS_CLIENTCREATEOPT_USECACHE 0x8000
-
 /*%
  * Optional flags for dns_client_(start)resolve.
  */
@@ -183,7 +177,6 @@ dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr,
  * families. If only one is NULL, then the other address will be used
  * as the local address, and the other protocol family will not be used.
  *
- * If the DNS_CLIENTCREATEOPT_USECACHE flag is set in 'options',
  * dns_client_create(x) will create a cache database with the view.
  *
  * Requires:

lib/dns/include/dns/ecdb.h

@@ -1,47 +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.
- */
-
-#ifndef DNS_ECDB_H
-#define DNS_ECDB_H 1
-
-/*****
-***** Module Info
-*****/
-
-/* TBD */
-
-/***
- *** Imports
- ***/
-
-#include <dns/types.h>
-
-/***
- *** Types
- ***/
-
-/***
- *** Functions
- ***/
-
-ISC_LANG_BEGINDECLS
-
-/* TBD: describe those */
-
-isc_result_t
-dns_ecdb_register(isc_mem_t *mctx, dns_dbimplementation_t **dbimp);
-
-void
-dns_ecdb_unregister(dns_dbimplementation_t **dbimp);
-
-ISC_LANG_ENDDECLS
-
-#endif /* DNS_ECDB_H */

lib/dns/lib.c

@@ -22,7 +22,6 @@
 #include <isc/util.h>
 
 #include <dns/db.h>
-#include <dns/ecdb.h>
 #include <dns/lib.h>
 #include <dns/result.h>
 
@@ -40,7 +39,6 @@ LIBDNS_EXTERNAL_DATA unsigned int dns_pps = 0U;
 
 static isc_once_t init_once = ISC_ONCE_INIT;
 static isc_mem_t *dns_g_mctx = NULL;
-static dns_dbimplementation_t *dbimp = NULL;
 static bool initialize_done = false;
 static isc_refcount_t references;
 
@@ -54,23 +52,15 @@ initialize(void) {
 
 	isc_mem_create(&dns_g_mctx);
 	dns_result_register();
-	result = dns_ecdb_register(dns_g_mctx, &dbimp);
-	if (result != ISC_R_SUCCESS) {
-		goto cleanup_mctx;
-	}
 
 	result = dst_lib_init(dns_g_mctx, NULL);
 	if (result != ISC_R_SUCCESS) {
-		goto cleanup_db;
+		goto cleanup_mctx;
 	}
 
 	initialize_done = true;
 	return;
 
-cleanup_db:
-	if (dbimp != NULL) {
-		dns_ecdb_unregister(&dbimp);
-	}
 cleanup_mctx:
 	if (dns_g_mctx != NULL) {
 		isc_mem_detach(&dns_g_mctx);
@@ -107,9 +97,6 @@ dns_lib_shutdown(void) {
 
 		isc_refcount_destroy(&references);
 
-		if (dbimp != NULL) {
-			dns_ecdb_unregister(&dbimp);
-		}
 		if (dns_g_mctx != NULL) {
 			isc_mem_detach(&dns_g_mctx);
 		}

lib/dns/win32/libdns.def.in

@@ -380,8 +380,6 @@ dns_dyndb_load
 dns_dyndb_cleanup
 dns_dyndb_createctx
 dns_dyndb_destroyctx
-dns_ecdb_register
-dns_ecdb_unregister
 dns_ecs_init
 dns_ecs_format
 dns_fixedname_init

lib/dns/win32/libdns.vcxproj.filters.in

@@ -87,9 +87,6 @@
     <ClCompile Include="..\dyndb.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\ecdb.c">
-      <Filter>Library Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\ecs.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
@@ -414,9 +411,6 @@
     <ClInclude Include="..\include\dns\dyndb.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\dns\ecdb.h">
-      <Filter>Library Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\dns\ecs.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>

lib/dns/win32/libdns.vcxproj.in

@@ -141,7 +141,6 @@
     <ClCompile Include="..\dst_parse.c" />
     <ClCompile Include="..\dst_result.c" />
     <ClCompile Include="..\dyndb.c" />
-    <ClCompile Include="..\ecdb.c" />
     <ClCompile Include="..\ecs.c" />
     <ClCompile Include="..\fixedname.c" />
     <ClCompile Include="..\forward.c" />
@@ -256,7 +255,6 @@
     <ClInclude Include="..\include\dns\ds.h" />
     <ClInclude Include="..\include\dns\dsdigest.h" />
     <ClInclude Include="..\include\dns\dyndb.h" />
-    <ClInclude Include="..\include\dns\ecdb.h" />
     <ClInclude Include="..\include\dns\ecs.h" />
     <ClInclude Include="..\include\dns\edns.h" />
     <ClInclude Include="..\include\dns\enumclass.h" />

util/copyrights

@@ -1422,7 +1422,6 @@
 ./lib/dns/dst_pkcs11.h				C	2014,2016,2018,2019,2020
 ./lib/dns/dst_result.c				C	1999,2000,2001,2004,2005,2007,2008,2012,2013,2014,2015,2016,2018,2019,2020
 ./lib/dns/dyndb.c				C	2015,2016,2017,2018,2019,2020
-./lib/dns/ecdb.c				C	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
 ./lib/dns/ecs.c					C	2017,2018,2019,2020
 ./lib/dns/fixedname.c				C	2018,2019,2020
 ./lib/dns/forward.c				C	2000,2001,2004,2005,2007,2009,2013,2016,2018,2019,2020
@@ -1460,7 +1459,6 @@
 ./lib/dns/include/dns/ds.h			C	2002,2004,2005,2006,2007,2010,2012,2014,2016,2018,2019,2020
 ./lib/dns/include/dns/dsdigest.h		C	2012,2016,2018,2019,2020
 ./lib/dns/include/dns/dyndb.h			C	2015,2016,2018,2019,2020
-./lib/dns/include/dns/ecdb.h			C	2009,2012,2016,2018,2019,2020
 ./lib/dns/include/dns/ecs.h			C	2017,2018,2019,2020
 ./lib/dns/include/dns/edns.h			C	2014,2015,2016,2018,2019,2020
 ./lib/dns/include/dns/events.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2014,2016,2017,2018,2019,2020