upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-22 18:17:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: dev: Remove unused foundname parameter

Browse source 
The `foundname` parameter in `qp.c:dns_qp_lookup` was effectively used only in unit tests, as in every case the name is needed, it can be retrieved directly from the node pointer. It also required an inefficient implementation that extracted the name by converting it into a key and then immediately converting it back.

This MR refactors `qp.c:dns_qp_lookup` not to have a foundname parameter, resulting in a 5% speedup in the handling of NXDOMAIN responses in perflab.

Merge branch 'alessio/qp-no-foundname' into 'main'

See merge request isc-projects/bind9!11339
This commit is contained in:
Alessio Podda 2025-12-10 11:15:24 +00:00
commit 2d72b48e62
12 changed files with 252 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/dns/forward.c
View file

@ -164,7 +164,7 @@ dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name,
dns_qpmulti_query(fwdtable->table, &qpr);
result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
NULL, &pval, NULL);
&pval, NULL);
if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
dns_forwarders_t *fwdrs = pval;
*forwardersp = fwdrs;

24
lib/dns/include/dns/qp.h
View file

@ -541,8 +541,8 @@ dns_qp_getname(dns_qpreadable_t qpr, const dns_name_t *name,
isc_result_t
dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name,
dns_namespace_t space, dns_name_t *foundname, dns_qpiter_t *iter,
dns_qpchain_t *chain, void **pval_r, uint32_t *ival_r);
dns_namespace_t space, dns_qpiter_t *iter, dns_qpchain_t *chain,
void **pval_r, uint32_t *ival_r);
/*%<
* Look up a leaf in a qp-trie that is equal to, or an ancestor domain of,
* 'name' in the namespace 'space'.
@ -650,17 +650,14 @@ dns_qpiter_init(dns_qpreadable_t qpr, dns_qpiter_t *qpi);
*/
isc_result_t
dns_qpiter_next(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r);
dns_qpiter_next(dns_qpiter_t *qpi, void **pval_r, uint32_t *ival_r);
isc_result_t
dns_qpiter_prev(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r);
dns_qpiter_prev(dns_qpiter_t *qpi, void **pval_r, uint32_t *ival_r);
/*%<
* Iterate forward/backward through a QP trie in lexicographic order.
*
* The leaf values are assigned to whichever of `*pval_r` and `*ival_r`
* are not null, unless the return value is ISC_R_NOMORE. Similarly,
* if `name` is not null, it is updated to contain the node name.
* are not null, unless the return value is ISC_R_NOMORE.
*
* NOTE: see the safety note under `dns_qpiter_init()`.
*
@ -683,15 +680,14 @@ dns_qpiter_prev(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
*/
isc_result_t
dns_qpiter_current(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r);
dns_qpiter_current(dns_qpiter_t *qpi, void **pval_r, uint32_t *ival_r);
/*%<
* Sets the values of `name`, `pval_r` and `ival_r` to those at the
* Sets the values of `pval_r` and `ival_r` to those at the
* node currently pointed to by `qpi`, but without moving the iterator
* in either direction. If the iterator is not currently pointed at a
* leaf node, ISC_R_FAILURE is returned.
* Requires:
*
* Requires:
* \li `qpi` is a pointer to a valid qp iterator
*
* Returns:
@ -720,8 +716,8 @@ dns_qpchain_length(dns_qpchain_t *chain);
*/
void
dns_qpchain_node(dns_qpchain_t *chain, unsigned int level, dns_name_t *name,
void **pval_r, uint32_t *ival_r);
dns_qpchain_node(dns_qpchain_t *chain, unsigned int level, void **pval_r,
uint32_t *ival_r);
/*%<
* Sets 'name' to the name of the leaf referenced at `chain->stack[level]`.
*

10
lib/dns/keytable.c
View file

@ -150,7 +150,7 @@ destroy_keytable(dns_keytable_t *keytable) {
dns_qpmulti_query(keytable->table, &qpr);
dns_qpiter_init(&qpr, &iter);
while (dns_qpiter_next(&iter, NULL, &pval, NULL) == ISC_R_SUCCESS) {
while (dns_qpiter_next(&iter, &pval, NULL) == ISC_R_SUCCESS) {
dns_keynode_t *n = pval;
dns_keynode_detach(&n);
}
@ -512,7 +512,7 @@ dns_keytable_finddeepestmatch(dns_keytable_t *keytable, const dns_name_t *name,
dns_qpmulti_query(keytable->table, &qpr);
result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
NULL, &pval, NULL);
&pval, NULL);
keynode = pval;
if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
@ -542,7 +542,7 @@ dns_keytable_issecuredomain(dns_keytable_t *keytable, const dns_name_t *name,
dns_qpmulti_query(keytable->table, &qpr);
result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
NULL, &pval, NULL);
&pval, NULL);
if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
keynode = pval;
if (foundname != NULL) {
@ -648,7 +648,7 @@ dns_keytable_totext(dns_keytable_t *keytable, isc_buffer_t *text) {
dns_qpmulti_query(keytable->table, &qpr);
dns_qpiter_init(&qpr, &iter);
while (dns_qpiter_next(&iter, NULL, &pval, NULL) == ISC_R_SUCCESS) {
while (dns_qpiter_next(&iter, &pval, NULL) == ISC_R_SUCCESS) {
dns_keynode_t *knode = pval;
if (knode->dslist != NULL) {
result = keynode_dslist_totext(knode, text);
@ -676,7 +676,7 @@ dns_keytable_forall(dns_keytable_t *keytable,
dns_qpmulti_query(keytable->table, &qpr);
dns_qpiter_init(&qpr, &iter);
while (dns_qpiter_next(&iter, NULL, &pval, NULL) == ISC_R_SUCCESS) {
while (dns_qpiter_next(&iter, &pval, NULL) == ISC_R_SUCCESS) {
dns_keynode_t *knode = pval;
(*func)(keytable, knode, &knode->name, arg);
}

2
lib/dns/nametree.c
View file

@ -284,7 +284,7 @@ dns_nametree_covered(dns_nametree_t *nametree, const dns_name_t *name,
dns_qpmulti_query(nametree->table, &qpr);
result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
NULL, (void **)&node, NULL);
(void **)&node, NULL);
if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
if (found != NULL) {
dns_name_copy(&node->name, found);

8
lib/dns/nta.c
View file

@ -414,7 +414,7 @@ dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now,
RWLOCK(&ntatable->rwlock, isc_rwlocktype_read);
dns_qpmulti_query(ntatable->table, &qpr);
result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
NULL, &pval, NULL);
&pval, NULL);
nta = pval;
switch (result) {
@ -475,7 +475,7 @@ dns_ntatable_totext(dns_ntatable_t *ntatable, const char *view,
dns_qpmulti_query(ntatable->table, &qpr);
dns_qpiter_init(&qpr, &iter);
while (dns_qpiter_next(&iter, NULL, &pval, NULL) == ISC_R_SUCCESS) {
while (dns_qpiter_next(&iter, &pval, NULL) == ISC_R_SUCCESS) {
dns__nta_t *n = pval;
char nbuf[DNS_NAME_FORMATSIZE];
char tbuf[ISC_FORMATHTTPTIMESTAMP_SIZE];
@ -528,7 +528,7 @@ dns_ntatable_save(dns_ntatable_t *ntatable, FILE *fp) {
dns_qpmulti_query(ntatable->table, &qpr);
dns_qpiter_init(&qpr, &iter);
while (dns_qpiter_next(&iter, NULL, &pval, NULL) == ISC_R_SUCCESS) {
while (dns_qpiter_next(&iter, &pval, NULL) == ISC_R_SUCCESS) {
dns__nta_t *n = pval;
isc_buffer_t b;
char nbuf[DNS_NAME_FORMATSIZE + 1], tbuf[80];
@ -614,7 +614,7 @@ dns_ntatable_shutdown(dns_ntatable_t *ntatable) {
ntatable->shuttingdown = true;
dns_qpiter_init(&qpr, &iter);
while (dns_qpiter_next(&iter, NULL, &pval, NULL) == ISC_R_SUCCESS) {
while (dns_qpiter_next(&iter, &pval, NULL) == ISC_R_SUCCESS) {
dns__nta_t *n = pval;
dns__nta_shutdown(n);
dns__nta_detach(&n);

48
lib/dns/qp.c
View file

@ -1857,20 +1857,6 @@ dns_qp_deletename(dns_qp_t *qp, const dns_name_t *name, dns_namespace_t space,
/***********************************************************************
* chains
*/
static void
maybe_set_name(dns_qpreader_t *qp, dns_qpnode_t *node, dns_name_t *name) {
dns_qpkey_t key;
size_t len;
if (name == NULL) {
return;
}
dns_name_reset(name);
len = leaf_qpkey(qp, node, key);
dns_qpkey_toname(key, len, name, NULL);
}
void
dns_qpchain_init(dns_qpreadable_t qpr, dns_qpchain_t *chain) {
dns_qpreader_t *qp = dns_qpreader(qpr);
@ -1895,15 +1881,14 @@ dns_qpchain_length(dns_qpchain_t *chain) {
}
void
dns_qpchain_node(dns_qpchain_t *chain, unsigned int level, dns_name_t *name,
void **pval_r, uint32_t *ival_r) {
dns_qpchain_node(dns_qpchain_t *chain, unsigned int level, void **pval_r,
uint32_t *ival_r) {
dns_qpnode_t *node = NULL;
REQUIRE(QPCHAIN_VALID(chain));
REQUIRE(level < chain->len);
node = chain->chain[level].node;
maybe_set_name(chain->qp, node, name);
SET_IF_NOT_NULL(pval_r, leaf_pval(node));
SET_IF_NOT_NULL(ival_r, leaf_ival(node));
}
@ -1956,8 +1941,7 @@ last_twig(dns_qpiter_t *qpi, bool forward) {
* a mutable view of the trie which is altered while iterating
*/
static isc_result_t
iterate(bool forward, dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r) {
iterate(bool forward, dns_qpiter_t *qpi, void **pval_r, uint32_t *ival_r) {
dns_qpnode_t *node = NULL;
bool initial_branch = true;
@ -2032,25 +2016,21 @@ iterate(bool forward, dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
/* we're at a leaf: return its data to the caller */
SET_IF_NOT_NULL(pval_r, leaf_pval(node));
SET_IF_NOT_NULL(ival_r, leaf_ival(node));
maybe_set_name(qpi->qp, node, name);
return ISC_R_SUCCESS;
}
isc_result_t
dns_qpiter_next(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r) {
return iterate(true, qpi, name, pval_r, ival_r);
dns_qpiter_next(dns_qpiter_t *qpi, void **pval_r, uint32_t *ival_r) {
return iterate(true, qpi, pval_r, ival_r);
}
isc_result_t
dns_qpiter_prev(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r) {
return iterate(false, qpi, name, pval_r, ival_r);
dns_qpiter_prev(dns_qpiter_t *qpi, void **pval_r, uint32_t *ival_r) {
return iterate(false, qpi, pval_r, ival_r);
}
isc_result_t
dns_qpiter_current(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r) {
dns_qpiter_current(dns_qpiter_t *qpi, void **pval_r, uint32_t *ival_r) {
dns_qpnode_t *node = NULL;
REQUIRE(QPITER_VALID(qpi));
@ -2062,7 +2042,6 @@ dns_qpiter_current(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
SET_IF_NOT_NULL(pval_r, leaf_pval(node));
SET_IF_NOT_NULL(ival_r, leaf_ival(node));
maybe_set_name(qpi->qp, node, name);
return ISC_R_SUCCESS;
}
@ -2131,9 +2110,9 @@ add_link(dns_qpchain_t *chain, dns_qpnode_t *node, size_t offset) {
static inline void
prevleaf(dns_qpiter_t *it) {
isc_result_t result = dns_qpiter_prev(it, NULL, NULL, NULL);
isc_result_t result = dns_qpiter_prev(it, NULL, NULL);
if (result == ISC_R_NOMORE) {
result = dns_qpiter_prev(it, NULL, NULL, NULL);
result = dns_qpiter_prev(it, NULL, NULL);
}
RUNTIME_CHECK(result == ISC_R_SUCCESS);
}
@ -2289,8 +2268,8 @@ fix_chain(dns_qpchain_t *chain, size_t offset) {
isc_result_t
dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name,
dns_namespace_t space, dns_name_t *foundname, dns_qpiter_t *iter,
dns_qpchain_t *chain, void **pval_r, uint32_t *ival_r) {
dns_namespace_t space, dns_qpiter_t *iter, dns_qpchain_t *chain,
void **pval_r, uint32_t *ival_r) {
dns_qpreader_t *qp = dns_qpreader(qpr);
dns_qpkey_t search, found;
size_t searchlen, foundlen;
@ -2303,7 +2282,6 @@ dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name,
bool setiter = true;
REQUIRE(QP_VALID(qp));
REQUIRE(foundname == NULL || ISC_MAGIC_VALID(name, DNS_NAME_MAGIC));
searchlen = dns_qpkey_fromname(search, name, space);
@ -2406,7 +2384,6 @@ dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name,
SET_IF_NOT_NULL(pval_r, leaf_pval(n));
SET_IF_NOT_NULL(ival_r, leaf_ival(n));
maybe_set_name(qp, n, foundname);
return result;
}
@ -2420,7 +2397,6 @@ dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name,
n = chain->chain[len].node;
SET_IF_NOT_NULL(pval_r, leaf_pval(n));
SET_IF_NOT_NULL(ival_r, leaf_ival(n));
maybe_set_name(qp, n, foundname);
return DNS_R_PARTIALMATCH;
} else {
/*

32
lib/dns/qpcache.c
View file

@ -1419,7 +1419,7 @@ find_deepest_zonecut(qpc_search_t *search, qpcnode_t *node,
isc_rwlock_t *nlock = NULL;
isc_rwlocktype_t nlocktype = isc_rwlocktype_none;
dns_qpchain_node(&search->chain, i, NULL, (void **)&node, NULL);
dns_qpchain_node(&search->chain, i, (void **)&node, NULL);
nlock = &qpdb->buckets[node->locknum].lock;
NODE_RDLOCK(nlock, &nlocktype);
@ -1485,7 +1485,7 @@ find_coveringnsec(qpc_search_t *search, const dns_name_t *name,
* Look for the node in the auxiliary NSEC namespace.
*/
result = dns_qp_lookup(search->qpdb->tree, name, DNS_DBNAMESPACE_NSEC,
NULL, &iter, NULL, (void **)&node, NULL);
&iter, NULL, (void **)&node, NULL);
/*
* When DNS_R_PARTIALMATCH or ISC_R_NOTFOUND is returned from
* dns_qp_lookup there is potentially a covering NSEC present
@ -1502,10 +1502,11 @@ find_coveringnsec(qpc_search_t *search, const dns_name_t *name,
/*
* Extract predecessor from iterator.
*/
result = dns_qpiter_current(&iter, predecessor, NULL, NULL);
result = dns_qpiter_current(&iter, (void **)&node, NULL);
if (result != ISC_R_SUCCESS) {
return ISC_R_NOTFOUND;
}
dns_name_copy(&node->name, predecessor);
/*
* Lookup the predecessor in the normal namespace.
@ -1615,7 +1616,7 @@ qpcache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
* Search down from the root of the tree.
*/
result = dns_qp_lookup(search.qpdb->tree, name, DNS_DBNAMESPACE_NORMAL,
NULL, NULL, &search.chain, (void **)&node, NULL);
NULL, &search.chain, (void **)&node, NULL);
if (result != ISC_R_NOTFOUND && foundname != NULL) {
dns_name_copy(&node->name, foundname);
}
@ -1636,8 +1637,7 @@ qpcache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
isc_result_t zcresult;
qpcnode_t *encloser = NULL;
dns_qpchain_node(&search.chain, i, NULL, (void **)&encloser,
NULL);
dns_qpchain_node(&search.chain, i, (void **)&encloser, NULL);
zcresult = check_zonecut(encloser,
(void *)&search DNS__DB_FLARG_PASS);
@ -2039,7 +2039,7 @@ qpcache_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options,
* Search down from the root of the tree.
*/
result = dns_qp_lookup(search.qpdb->tree, name, DNS_DBNAMESPACE_NORMAL,
NULL, NULL, &search.chain, (void **)&node, NULL);
NULL, &search.chain, (void **)&node, NULL);
switch (result) {
case ISC_R_SUCCESS:
@ -2071,8 +2071,8 @@ qpcache_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options,
INSIST(len >= 2);
node = NULL;
dns_qpchain_node(&search.chain, len - 2, NULL,
(void **)&node, NULL);
dns_qpchain_node(&search.chain, len - 2, (void **)&node,
NULL);
search.chain.len = len - 1;
}
@ -3515,8 +3515,8 @@ resume_iteration(qpc_dbit_t *qpdbiter, bool continuing) {
if (continuing && qpdbiter->node != NULL) {
isc_result_t result;
result = dns_qp_lookup(qpdb->tree, qpdbiter->name,
DNS_DBNAMESPACE_NORMAL, NULL,
&qpdbiter->iter, NULL, NULL, NULL);
DNS_DBNAMESPACE_NORMAL, &qpdbiter->iter,
NULL, NULL, NULL);
INSIST(result == ISC_R_SUCCESS);
}
@ -3566,8 +3566,8 @@ dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) {
dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS);
dns_qpiter_init(qpdb->tree, &qpdbiter->iter);
result = dns_qpiter_next(&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
result = dns_qpiter_next(&qpdbiter->iter, (void **)&qpdbiter->node,
NULL);
if (result == ISC_R_SUCCESS &&
qpdbiter->node->nspace == DNS_DBNAMESPACE_NORMAL)
@ -3618,7 +3618,7 @@ dbiterator_seek(dns_dbiterator_t *iterator,
dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS);
result = dns_qp_lookup(qpdb->tree, name, DNS_DBNAMESPACE_NORMAL, NULL,
result = dns_qp_lookup(qpdb->tree, name, DNS_DBNAMESPACE_NORMAL,
&qpdbiter->iter, NULL, (void **)&qpdbiter->node,
NULL);
@ -3656,8 +3656,8 @@ dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) {
dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS);
result = dns_qpiter_next(&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
result = dns_qpiter_next(&qpdbiter->iter, (void **)&qpdbiter->node,
NULL);
if (result == ISC_R_SUCCESS &&
qpdbiter->node->nspace == DNS_DBNAMESPACE_NORMAL)

151
lib/dns/qpzone.c
View file

@ -2684,7 +2684,10 @@ step(qpz_search_t *search, dns_qpiter_t *it, direction_t direction,
qpznode_t *node = NULL;
isc_result_t result = ISC_R_SUCCESS;
result = dns_qpiter_current(it, nodename, (void **)&node, NULL);
result = dns_qpiter_current(it, (void **)&node, NULL);
if (result == ISC_R_SUCCESS) {
dns_name_copy(&node->name, nodename);
}
while (result == ISC_R_SUCCESS) {
isc_rwlock_t *nlock = qpzone_get_lock(node);
isc_rwlocktype_t nlocktype = isc_rwlocktype_none;
@ -2700,11 +2703,12 @@ step(qpz_search_t *search, dns_qpiter_t *it, direction_t direction,
}
if (direction == FORWARD) {
result = dns_qpiter_next(it, nodename, (void **)&node,
NULL);
result = dns_qpiter_next(it, (void **)&node, NULL);
} else {
result = dns_qpiter_prev(it, nodename, (void **)&node,
NULL);
result = dns_qpiter_prev(it, (void **)&node, NULL);
}
if (result == ISC_R_SUCCESS) {
dns_name_copy(&node->name, nodename);
}
};
if (result == ISC_R_SUCCESS) {
@ -2730,7 +2734,7 @@ activeempty(qpz_search_t *search, dns_qpiter_t *it, const dns_name_t *current) {
* subdomain of the one we were looking for, then we're
* at an active empty nonterminal node.
*/
isc_result_t result = dns_qpiter_next(it, NULL, NULL, NULL);
isc_result_t result = dns_qpiter_next(it, NULL, NULL);
if (result != ISC_R_SUCCESS) {
/* An ENT at the end of the zone is impossible */
return false;
@ -2776,7 +2780,7 @@ wildcard_blocked(qpz_search_t *search, const dns_name_t *qname,
/* Now reset the iterator and look for a successor with data. */
it = search->iter;
result = dns_qpiter_next(&it, NULL, NULL, NULL);
result = dns_qpiter_next(&it, NULL, NULL);
if (result == ISC_R_SUCCESS) {
check_next = step(search, &it, FORWARD, next);
}
@ -2841,7 +2845,7 @@ find_wildcard(qpz_search_t *search, qpznode_t **nodep, const dns_name_t *qname,
isc_rwlocktype_t nlocktype = isc_rwlocktype_none;
bool wild, active;
dns_qpchain_node(&search->chain, i, NULL, (void **)&node, NULL);
dns_qpchain_node(&search->chain, i, (void **)&node, NULL);
nlock = qpzone_get_lock(node);
NODE_RDLOCK(nlock, &nlocktype);
@ -2872,8 +2876,8 @@ find_wildcard(qpz_search_t *search, qpznode_t **nodep, const dns_name_t *qname,
}
result = dns_qp_lookup(&search->qpr, wname, nspace,
NULL, &wit, NULL,
(void **)&wnode, NULL);
&wit, NULL, (void **)&wnode,
NULL);
if (result == ISC_R_SUCCESS) {
/*
* We have found the wildcard node. If it
@ -2939,8 +2943,10 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search,
REQUIRE(type == dns_rdatatype_nsec3 || firstp != NULL);
if (type == dns_rdatatype_nsec3) {
result = dns_qpiter_prev(&search->iter, name, (void **)nodep,
NULL);
result = dns_qpiter_prev(&search->iter, (void **)nodep, NULL);
if (result == ISC_R_SUCCESS) {
dns_name_copy(&(*nodep)->name, name);
}
return result;
}
@ -2954,7 +2960,9 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search,
*/
*firstp = false;
result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NSEC,
NULL, nit, NULL, NULL, NULL);
nit, NULL, NULL, NULL);
qpznode_t *node = NULL;
INSIST(result != ISC_R_NOTFOUND);
if (result == ISC_R_SUCCESS) {
/*
@ -2965,7 +2973,11 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search,
* NSEC record; we want the previous node
* in the NSEC tree.
*/
result = dns_qpiter_prev(nit, name, NULL, NULL);
result = dns_qpiter_prev(nit, (void **)&node,
NULL);
if (result == ISC_R_SUCCESS) {
dns_name_copy(&node->name, name);
}
} else if (result == DNS_R_PARTIALMATCH) {
/*
* This was a partial match, so the
@ -2973,7 +2985,11 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search,
* node in the NSEC namespace, which is
* what we want.
*/
dns_qpiter_current(nit, name, NULL, NULL);
isc_result_t iresult = dns_qpiter_current(
nit, (void **)&node, NULL);
if (iresult == ISC_R_SUCCESS) {
dns_name_copy(&node->name, name);
}
result = ISC_R_SUCCESS;
}
} else {
@ -2984,16 +3000,20 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search,
* work; perhaps they lacked signature records.
* Keep searching.
*/
result = dns_qpiter_prev(nit, name, NULL, NULL);
qpznode_t *tempnode = NULL;
result = dns_qpiter_prev(nit, (void **)&tempnode, NULL);
if (result == ISC_R_SUCCESS) {
dns_name_copy(&tempnode->name, name);
}
}
if (result != ISC_R_SUCCESS) {
break;
}
*nodep = NULL;
result = dns_qp_lookup(
&search->qpr, name, DNS_DBNAMESPACE_NORMAL, NULL,
&search->iter, &search->chain, (void **)nodep, NULL);
result = dns_qp_lookup(&search->qpr, name,
DNS_DBNAMESPACE_NORMAL, &search->iter,
&search->chain, (void **)nodep, NULL);
if (result == ISC_R_SUCCESS) {
break;
}
@ -3050,10 +3070,11 @@ find_closest_nsec(qpz_search_t *search, dns_dbnode_t **nodep,
* then we start using the auxiliary NSEC namespace to find
* the next predecessor.
*/
result = dns_qpiter_current(&search->iter, name, (void **)&node, NULL);
result = dns_qpiter_current(&search->iter, (void **)&node, NULL);
if (result != ISC_R_SUCCESS) {
return result;
}
dns_name_copy(&node->name, name);
again:
do {
dns_slabheader_t *found = NULL, *foundsig = NULL;
@ -3158,9 +3179,9 @@ again:
} while (empty_node && result == ISC_R_SUCCESS);
if (result == ISC_R_NOMORE && wraps) {
result = dns_qpiter_prev(&search->iter, name, (void **)&node,
NULL);
result = dns_qpiter_prev(&search->iter, (void **)&node, NULL);
if (result == ISC_R_SUCCESS) {
dns_name_copy(&node->name, name);
wraps = false;
goto again;
}
@ -3374,7 +3395,7 @@ qpzone_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
/*
* Search down from the root of the tree.
*/
result = dns_qp_lookup(&search.qpr, name, nspace, NULL, &search.iter,
result = dns_qp_lookup(&search.qpr, name, nspace, &search.iter,
&search.chain, (void **)&node, NULL);
if (result != ISC_R_NOTFOUND) {
dns_name_copy(&node->name, foundname);
@ -3395,7 +3416,7 @@ qpzone_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
qpznode_t *n = NULL;
isc_result_t tresult;
dns_qpchain_node(&search.chain, i, NULL, (void **)&n, NULL);
dns_qpchain_node(&search.chain, i, (void **)&n, NULL);
tresult = qpzone_check_zonecut(n, &search DNS__DB_FLARG_PASS);
if (tresult != DNS_R_CONTINUE) {
result = tresult;
@ -3677,7 +3698,7 @@ found:
unsigned int len = search.chain.len - 1;
if (len > 0) {
NODE_UNLOCK(nlock, &nlocktype);
dns_qpchain_node(&search.chain, len - 1, NULL,
dns_qpchain_node(&search.chain, len - 1,
(void **)&node, NULL);
dns_name_copy(&node->name, foundname);
goto partial_match;
@ -4133,8 +4154,8 @@ dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) {
dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS);
dns_qpiter_init(qpdbiter->snap, &qpdbiter->iter);
result = dns_qpiter_next(&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
result = dns_qpiter_next(&qpdbiter->iter, (void **)&qpdbiter->node,
NULL);
switch (qpdbiter->nsec3mode) {
case nonsec3:
@ -4154,7 +4175,7 @@ dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) {
if (result == ISC_R_SUCCESS &&
QPDBITER_NSEC3_ORIGIN_NODE(qpdb, qpdbiter))
{
result = dns_qpiter_next(&qpdbiter->iter, NULL,
result = dns_qpiter_next(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
}
@ -4179,14 +4200,13 @@ dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) {
* origin node.
*/
result = dns_qp_lookup(qpdbiter->snap, &qpdb->common.origin,
DNS_DBNAMESPACE_NSEC3, NULL,
&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
DNS_DBNAMESPACE_NSEC3, &qpdbiter->iter,
NULL, (void **)&qpdbiter->node, NULL);
if (result != ISC_R_SUCCESS ||
QPDBITER_NSEC3_ORIGIN_NODE(qpdb, qpdbiter))
{
/* skip the NSEC3 origin node (or its predecessor) */
result = dns_qpiter_next(&qpdbiter->iter, NULL,
result = dns_qpiter_next(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
}
@ -4221,8 +4241,8 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) {
dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS);
dns_qpiter_init(qpdbiter->snap, &qpdbiter->iter);
result = dns_qpiter_prev(&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
result = dns_qpiter_prev(&qpdbiter->iter, (void **)&qpdbiter->node,
NULL);
switch (qpdbiter->nsec3mode) {
case nsec3only:
@ -4245,7 +4265,7 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) {
if (result == ISC_R_SUCCESS &&
QPDBITER_NSEC3_ORIGIN_NODE(qpdb, qpdbiter))
{
result = dns_qpiter_prev(&qpdbiter->iter, NULL,
result = dns_qpiter_prev(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
}
@ -4269,13 +4289,12 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) {
* The final non-nsec node is before the the NSEC origin node.
*/
result = dns_qp_lookup(qpdbiter->snap, &qpdb->common.origin,
DNS_DBNAMESPACE_NSEC, NULL,
&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
DNS_DBNAMESPACE_NSEC, &qpdbiter->iter,
NULL, (void **)&qpdbiter->node, NULL);
if (result == ISC_R_SUCCESS) {
INSIST(QPDBITER_NSEC_ORIGIN_NODE(qpdb, qpdbiter));
/* skip the NSEC origin node */
result = dns_qpiter_prev(&qpdbiter->iter, NULL,
result = dns_qpiter_prev(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
} else {
@ -4284,7 +4303,7 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) {
* should point to its predecessor, which is the node we
* want.
*/
result = dns_qpiter_current(&qpdbiter->iter, NULL,
result = dns_qpiter_current(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
INSIST(result == ISC_R_SUCCESS);
@ -4323,22 +4342,22 @@ dbiterator_seek(dns_dbiterator_t *iterator,
switch (qpdbiter->nsec3mode) {
case nsec3only:
result = dns_qp_lookup(
qpdbiter->snap, name, DNS_DBNAMESPACE_NSEC3, NULL,
&qpdbiter->iter, NULL, (void **)&qpdbiter->node, NULL);
result = dns_qp_lookup(qpdbiter->snap, name,
DNS_DBNAMESPACE_NSEC3, &qpdbiter->iter,
NULL, (void **)&qpdbiter->node, NULL);
break;
case nonsec3:
result = dns_qp_lookup(
qpdbiter->snap, name, DNS_DBNAMESPACE_NORMAL, NULL,
&qpdbiter->iter, NULL, (void **)&qpdbiter->node, NULL);
result = dns_qp_lookup(qpdbiter->snap, name,
DNS_DBNAMESPACE_NORMAL, &qpdbiter->iter,
NULL, (void **)&qpdbiter->node, NULL);
break;
case full:
result = dns_qp_lookup(
qpdbiter->snap, name, DNS_DBNAMESPACE_NORMAL, NULL,
&qpdbiter->iter, NULL, (void **)&qpdbiter->node, NULL);
result = dns_qp_lookup(qpdbiter->snap, name,
DNS_DBNAMESPACE_NORMAL, &qpdbiter->iter,
NULL, (void **)&qpdbiter->node, NULL);
if (result != ISC_R_SUCCESS) {
tresult = dns_qp_lookup(qpdbiter->snap, name,
DNS_DBNAMESPACE_NSEC3, NULL,
DNS_DBNAMESPACE_NSEC3,
&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
if (tresult == ISC_R_SUCCESS) {
@ -4383,8 +4402,8 @@ dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) {
node = qpdbiter->node;
qpdbiter->node = NULL;
result = dns_qpiter_prev(&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
result = dns_qpiter_prev(&qpdbiter->iter, (void **)&qpdbiter->node,
NULL);
switch (qpdbiter->nsec3mode) {
case nsec3only:
@ -4407,7 +4426,7 @@ dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) {
if (result == ISC_R_SUCCESS &&
QPDBITER_NSEC3_ORIGIN_NODE(qpdb, qpdbiter))
{
result = dns_qpiter_prev(&qpdbiter->iter, NULL,
result = dns_qpiter_prev(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
}
@ -4426,14 +4445,13 @@ dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) {
INSIST(qpdbiter->node->nspace == DNS_DBNAMESPACE_NSEC);
result = dns_qp_lookup(qpdbiter->snap, &qpdb->common.origin,
DNS_DBNAMESPACE_NSEC, NULL,
&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
DNS_DBNAMESPACE_NSEC, &qpdbiter->iter,
NULL, (void **)&qpdbiter->node, NULL);
if (result == ISC_R_SUCCESS) {
INSIST(QPDBITER_NSEC_ORIGIN_NODE(qpdb, qpdbiter));
/* skip the NSEC origin node */
result = dns_qpiter_prev(&qpdbiter->iter, NULL,
result = dns_qpiter_prev(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
} else {
@ -4442,7 +4460,7 @@ dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) {
* should point to its predecessor, which is the node we
* want.
*/
result = dns_qpiter_current(&qpdbiter->iter, NULL,
result = dns_qpiter_current(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
INSIST(result == ISC_R_SUCCESS);
@ -4496,8 +4514,8 @@ dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) {
node = qpdbiter->node;
qpdbiter->node = NULL;
result = dns_qpiter_next(&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
result = dns_qpiter_next(&qpdbiter->iter, (void **)&qpdbiter->node,
NULL);
switch (qpdbiter->nsec3mode) {
case nonsec3:
@ -4514,7 +4532,7 @@ dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) {
if (result == ISC_R_SUCCESS &&
QPDBITER_NSEC3_ORIGIN_NODE(qpdb, qpdbiter))
{
result = dns_qpiter_next(&qpdbiter->iter, NULL,
result = dns_qpiter_next(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
}
@ -4533,14 +4551,13 @@ dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) {
INSIST(qpdbiter->node->nspace == DNS_DBNAMESPACE_NSEC);
result = dns_qp_lookup(qpdbiter->snap, &qpdb->common.origin,
DNS_DBNAMESPACE_NSEC3, NULL,
&qpdbiter->iter, NULL,
(void **)&qpdbiter->node, NULL);
DNS_DBNAMESPACE_NSEC3, &qpdbiter->iter,
NULL, (void **)&qpdbiter->node, NULL);
if (result != ISC_R_SUCCESS ||
QPDBITER_NSEC3_ORIGIN_NODE(qpdb, qpdbiter))
{
/* skip the NSEC3 origin node (or its predecessor). */
result = dns_qpiter_next(&qpdbiter->iter, NULL,
result = dns_qpiter_next(&qpdbiter->iter,
(void **)&qpdbiter->node,
NULL);
}
@ -4646,8 +4663,8 @@ qpzone_createiterator(dns_db_t *db, unsigned int options,
* seek the NSEC3 origin node.
*/
result = dns_qp_lookup(iter->snap, &qpdb->common.origin,
DNS_DBNAMESPACE_NSEC3, NULL, &iter->iter,
NULL, NULL, NULL);
DNS_DBNAMESPACE_NSEC3, &iter->iter, NULL,
NULL, NULL);
INSIST(result == ISC_R_SUCCESS);
break;
default:

4
lib/dns/rpz.c
View file

@ -2497,7 +2497,7 @@ dns_rpz_find_name(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type,
dns_qpchain_init(&qpr, &chain);
result = dns_qp_lookup(&qpr, trig_name, DNS_DBNAMESPACE_NORMAL, NULL,
NULL, &chain, (void **)&data, NULL);
&chain, (void **)&data, NULL);
switch (result) {
case ISC_R_SUCCESS:
INSIST(data != NULL);
@ -2511,7 +2511,7 @@ dns_rpz_find_name(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type,
case DNS_R_PARTIALMATCH:
i = dns_qpchain_length(&chain);
while (i-- > 0) {
dns_qpchain_node(&chain, i, NULL, (void **)&data, NULL);
dns_qpchain_node(&chain, i, (void **)&data, NULL);
INSIST(data != NULL);
if (rpz_type == DNS_RPZ_TYPE_QNAME) {
found_zbits |= data->wild.qname;

7
lib/dns/zt.c
View file

@ -184,14 +184,13 @@ dns_zt_find(dns_zt_t *zt, const dns_name_t *name, dns_ztfind_t options,
&pval, NULL);
} else {
result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL,
NULL, &chain, &pval, NULL);
&chain, &pval, NULL);
if (exactopts == DNS_ZTFIND_NOEXACT && result == ISC_R_SUCCESS)
{
/* get pval from the previous chain link */
int len = dns_qpchain_length(&chain);
if (len >= 2) {
dns_qpchain_node(&chain, len - 2, NULL, &pval,
NULL);
dns_qpchain_node(&chain, len - 2, &pval, NULL);
result = DNS_R_PARTIALMATCH;
} else {
result = ISC_R_NOTFOUND;
@ -527,7 +526,7 @@ dns_zt_apply(dns_zt_t *zt, bool stop, isc_result_t *sub,
dns_qpmulti_query(zt->multi, &qpr);
dns_qpiter_init(&qpr, &qpi);
while (dns_qpiter_next(&qpi, NULL, &zone, NULL) == ISC_R_SUCCESS) {
while (dns_qpiter_next(&qpi, &zone, NULL) == ISC_R_SUCCESS) {
result = action(zone, uap);
if (tresult == ISC_R_SUCCESS) {
tresult = result;

9
tests/bench/qplookups.c
View file

@ -212,10 +212,13 @@ main(int argc, char **argv) {
start = isc_time_monotonic();
for (i = 0;; i++) {
void *pval = NULL;
uint32_t ival = 0;
name = dns_fixedname_initname(&items[i]);
if (dns_qpiter_next(&it, name, NULL, NULL) != ISC_R_SUCCESS) {
if (dns_qpiter_next(&it, &pval, &ival) != ISC_R_SUCCESS) {
break;
}
name_from_smallname(name, pval, ival);
}
stop = isc_time_monotonic();
@ -237,7 +240,7 @@ main(int argc, char **argv) {
for (i = 0; i < n; i++) {
name = dns_fixedname_name(&items[i]);
dns_qp_lookup(qp, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
NULL, NULL, NULL);
NULL, NULL);
}
stop = isc_time_monotonic();
@ -263,7 +266,7 @@ main(int argc, char **argv) {
}
dns_qp_lookup(qp, search, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
NULL, NULL, NULL);
NULL, NULL);
}
stop = isc_time_monotonic();

149
tests/dns/qp_test.c
View file

@ -46,6 +46,70 @@
bool verbose = false;
/*
* Test-only functions for dns_qpiter_*_with_name functionality
*/
static void
maybe_set_name(dns_qpreader_t *qp, void *pval, uint32_t ival,
dns_name_t *name) {
if (name != NULL) {
dns_qpkey_t key;
size_t len;
dns_qpnode_t node = make_leaf(pval, ival);
dns_name_reset(name);
len = leaf_qpkey(qp, &node, key);
dns_qpkey_toname(key, len, name, NULL);
}
}
static isc_result_t
qpiter_next_with_name(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r) {
isc_result_t result;
void *pval = NULL;
uint32_t ival = 0;
result = iterate(true, qpi, &pval, &ival);
if (result == ISC_R_SUCCESS) {
SET_IF_NOT_NULL(pval_r, pval);
SET_IF_NOT_NULL(ival_r, ival);
maybe_set_name(qpi->qp, pval, ival, name);
}
return result;
}
static isc_result_t
qpiter_prev_with_name(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r) {
isc_result_t result;
void *pval = NULL;
uint32_t ival = 0;
result = iterate(false, qpi, &pval, &ival);
if (result == ISC_R_SUCCESS) {
SET_IF_NOT_NULL(pval_r, pval);
SET_IF_NOT_NULL(ival_r, ival);
maybe_set_name(qpi->qp, pval, ival, name);
}
return result;
}
static isc_result_t
qpiter_current_with_name(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r,
uint32_t *ival_r) {
isc_result_t result;
void *pval = NULL;
uint32_t ival = 0;
result = dns_qpiter_current(qpi, &pval, &ival);
if (result == ISC_R_SUCCESS) {
SET_IF_NOT_NULL(pval_r, pval);
SET_IF_NOT_NULL(ival_r, ival);
maybe_set_name(qpi->qp, pval, ival, name);
}
return result;
}
ISC_RUN_TEST_IMPL(qpkey_name) {
struct {
const char *namestr;
@ -288,9 +352,7 @@ ISC_RUN_TEST_IMPL(qpiter) {
/* check that we see only valid items in the correct order */
uint32_t prev = 0;
dns_qpiter_init(qp, &qpi);
while (dns_qpiter_next(&qpi, NULL, &pval, &ival) ==
ISC_R_SUCCESS)
{
while (dns_qpiter_next(&qpi, &pval, &ival) == ISC_R_SUCCESS) {
assert_in_range(ival, prev + 1, ITER_ITEMS - 1);
assert_int_equal(ival, item[ival]);
assert_ptr_equal(pval, &item[ival]);
@ -309,15 +371,13 @@ ISC_RUN_TEST_IMPL(qpiter) {
/* now iterate backward and check correctness */
n = inserted;
while (dns_qpiter_prev(&qpi, NULL, NULL, &ival) ==
ISC_R_SUCCESS)
{
while (dns_qpiter_prev(&qpi, NULL, &ival) == ISC_R_SUCCESS) {
--n;
assert_int_equal(ival, order[n]);
/* and check current iterator value as well */
result = dns_qpiter_current(&qpi, NULL, NULL, &ival);
result = dns_qpiter_current(&qpi, NULL, &ival);
assert_int_equal(result, ISC_R_SUCCESS);
assert_int_equal(ival, order[n]);
}
@ -325,13 +385,11 @@ ISC_RUN_TEST_IMPL(qpiter) {
assert_int_equal(n, 0);
/* ...and forward again */
while (dns_qpiter_next(&qpi, NULL, NULL, &ival) ==
ISC_R_SUCCESS)
{
while (dns_qpiter_next(&qpi, NULL, &ival) == ISC_R_SUCCESS) {
assert_int_equal(ival, order[n]);
/* and check current iterator value as well */
result = dns_qpiter_current(&qpi, NULL, NULL, &ival);
result = dns_qpiter_current(&qpi, NULL, &ival);
assert_int_equal(result, ISC_R_SUCCESS);
assert_int_equal(ival, order[n]);
@ -346,34 +404,28 @@ ISC_RUN_TEST_IMPL(qpiter) {
* to confirm we can change directions while iterating.
*/
if (inserted > 3) {
assert_int_equal(
dns_qpiter_next(&qpi, NULL, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(dns_qpiter_next(&qpi, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(ival, order[0]);
assert_int_equal(
dns_qpiter_next(&qpi, NULL, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(dns_qpiter_next(&qpi, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(ival, order[1]);
assert_int_equal(
dns_qpiter_prev(&qpi, NULL, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(dns_qpiter_prev(&qpi, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(ival, order[0]);
assert_int_equal(
dns_qpiter_next(&qpi, NULL, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(dns_qpiter_next(&qpi, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(ival, order[1]);
assert_int_equal(
dns_qpiter_prev(&qpi, NULL, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(dns_qpiter_prev(&qpi, NULL, &ival),
ISC_R_SUCCESS);
assert_int_equal(ival, order[0]);
assert_int_equal(
dns_qpiter_prev(&qpi, NULL, NULL, &ival),
ISC_R_NOMORE);
assert_int_equal(dns_qpiter_prev(&qpi, NULL, &ival),
ISC_R_NOMORE);
}
}
@ -418,11 +470,21 @@ check_partialmatch(dns_qp_t *qp, struct check_partialmatch check[],
dns_fixedname_t fn1, fn2;
dns_name_t *name = dns_fixedname_initname(&fn1);
dns_name_t *foundname = dns_fixedname_initname(&fn2);
dns_qpchain_t chain;
void *pval = NULL;
dns_test_namefromstring(check[i].query, &fn1);
result = dns_qp_lookup(qp, name, space, foundname, NULL, NULL,
&pval, NULL);
dns_qpchain_init(qp, &chain);
result = dns_qp_lookup(qp, name, space, NULL, &chain, &pval,
NULL);
/* Extract the found name if we found something */
if ((result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) &&
pval != NULL)
{
maybe_set_name((dns_qpreader_t *)qp, pval, space,
foundname);
}
#if 0
fprintf(stderr, "%s%s %s (expected %s) "
@ -584,8 +646,8 @@ check_qpchainiter(dns_qp_t *qp, struct check_qpchain check[],
dns_qpchain_init(qp, &chain);
dns_test_namefromstring(check[i].query, &fn1);
result = dns_qp_lookup(qp, name, check[i].space, NULL, iter,
&chain, NULL, NULL);
result = dns_qp_lookup(qp, name, check[i].space, iter, &chain,
NULL, NULL);
#if 0
fprintf(stderr,
"%s %s (expected %s), "
@ -602,7 +664,10 @@ check_qpchainiter(dns_qp_t *qp, struct check_qpchain check[],
dns_name_t *expected = dns_fixedname_initname(&fn2);
dns_name_t *found = dns_fixedname_initname(&fn3);
dns_test_namefromstring(check[i].names[j], &fn2);
dns_qpchain_node(&chain, j, found, NULL, NULL);
void *pval = NULL;
uint32_t ival = 0;
dns_qpchain_node(&chain, j, &pval, &ival);
maybe_set_name(chain.qp, pval, ival, found);
#if 0
char nb[DNS_NAME_FORMATSIZE];
dns_name_format(found, nb, sizeof(nb));
@ -810,8 +875,8 @@ check_predecessors_withchain(dns_qp_t *qp, struct check_predecessors check[],
result = dns_name_tostring(expred, &predstr, isc_g_mctx);
assert_int_equal(result, ISC_R_SUCCESS);
result = dns_qp_lookup(qp, name, check[i].space, NULL, &it,
chain, NULL, NULL);
result = dns_qp_lookup(qp, name, check[i].space, &it, chain,
NULL, NULL);
#if 0
fprintf(stderr, "%s %s: expected %s got %s\n", check[i].query,
check[i].space == DNS_DBNAMESPACE_NSEC3
@ -829,17 +894,18 @@ check_predecessors_withchain(dns_qp_t *qp, struct check_predecessors check[],
* we found an exact match; iterate to find
* the predecessor.
*/
result = dns_qpiter_prev(&it, pred, NULL, &ival);
result = qpiter_prev_with_name(&it, pred, NULL, &ival);
if (result == ISC_R_NOMORE) {
result = dns_qpiter_prev(&it, pred, NULL,
&ival);
result = qpiter_prev_with_name(&it, pred, NULL,
&ival);
}
} else {
/*
* we didn't find a match, so the iterator should
* already be pointed at the predecessor node.
*/
result = dns_qpiter_current(&it, pred, NULL, &ival);
result = qpiter_current_with_name(&it, pred, NULL,
&ival);
}
assert_int_equal(result, ISC_R_SUCCESS);
@ -859,7 +925,8 @@ check_predecessors_withchain(dns_qp_t *qp, struct check_predecessors check[],
isc_mem_free(isc_g_mctx, predstr);
int j = 0;
while (dns_qpiter_next(&it, name, NULL, NULL) == ISC_R_SUCCESS)
while (qpiter_next_with_name(&it, name, NULL, NULL) ==
ISC_R_SUCCESS)
{
#if 0
result = dns_name_tostring(name, &namestr, isc_g_mctx);