upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 07:22:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fewer name copies in previous_closest_nsec

Browse source 
Part of an refactor to eliminate intermediate copies in qpzone_find.
This commit is contained in:
Alessio Podda 2025-12-10 10:56:48 +01:00 committed by Ondřej Surý
parent 242dd34ad8
commit d0e04ed0e7
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/dns/qpzone.c
View file

@ -2916,6 +2916,8 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search,
dns_qpmulti_query(search->qpdb->tree, &qpr);
for (;;) {
qpznode_t *nsec_node = NULL;
if (*firstp) {
/*
* This is the first attempt to find 'name' in the
@ -2924,7 +2926,6 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search,
*firstp = false;
result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NSEC,
nit, NULL, NULL, NULL);
qpznode_t *node = NULL;
INSIST(result != ISC_R_NOTFOUND);
if (result == ISC_R_SUCCESS) {
@ -2936,11 +2937,8 @@ 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, (void **)&node,
NULL);
if (result == ISC_R_SUCCESS) {
dns_name_copy(&node->name, name);
}
result = dns_qpiter_prev(
nit, (void **)&nsec_node, NULL);
} else if (result == DNS_R_PARTIALMATCH) {
/*
* This was a partial match, so the
@ -2949,10 +2947,8 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search,
* what we want.
*/
isc_result_t iresult = dns_qpiter_current(
nit, (void **)&node, NULL);
if (iresult == ISC_R_SUCCESS) {
dns_name_copy(&node->name, name);
}
nit, (void **)&nsec_node, NULL);
REQUIRE(iresult == ISC_R_SUCCESS);
result = ISC_R_SUCCESS;
}
} else {
@ -2963,21 +2959,20 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search,
* work; perhaps they lacked signature records.
* Keep searching.
*/
qpznode_t *tempnode = NULL;
result = dns_qpiter_prev(nit, (void **)&tempnode, NULL);
if (result == ISC_R_SUCCESS) {
dns_name_copy(&tempnode->name, name);
}
result = dns_qpiter_prev(nit, (void **)&nsec_node,
NULL);
}
if (result != ISC_R_SUCCESS) {
break;
}
*nodep = NULL;
result = dns_qp_lookup(&search->qpr, name,
result = dns_qp_lookup(&search->qpr, &nsec_node->name,
DNS_DBNAMESPACE_NORMAL, &search->iter,
&search->chain, (void **)nodep, NULL);
if (result == ISC_R_SUCCESS) {
dns_name_copy(&nsec_node->name, name);
break;
}