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

chg: nil: Cleanup the duplicate logic and comments around add into NSEC tree

Browse source 
After merging the NORMAL, NSEC and NSEC3 tree into single QP tree, there were some comments still speaking about auxiliary NSEC tree. These were cleaned up and the logic when we pass the qp tree (write transaction) to qpzone_addrdataset_inner() was changed to be more obvious that this is needed only when we are adding NSEC records.

Merge branch 'ondrej/additional-cleanups-around-NSEC-namespace' into 'main'

See merge request isc-projects/bind9!11695
This commit is contained in:
Ondřej Surý 2026-03-16 12:17:16 +01:00
commit afe1dc5da0
2 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
lib/dns/qpzone.c
View file

@ -2462,7 +2462,7 @@ findnodeintree(qpzonedb_t *qpdb, dns_qp_t *qp, const dns_name_t *name,
INSIST(node->nspace == DNS_DBNAMESPACE_NSEC3 || !nsec3);
} else if (result != ISC_R_SUCCESS && create) {
/*
* ... if the lookup is unsuccesful, but the caller asked us to
* ... if the lookup is unsuccessful, but the caller asked us to
* create a new node, create one and insert it into the tree.
*/
node = new_qpznode(qpdb, name, nspace);
@ -4679,18 +4679,18 @@ qpzone_createiterator(dns_db_t *db, unsigned int options,
* The reason this is split from qpzone_addrdataset is to allow the reuse of
* the same qp transaction for multiple adds.
*
* If the rdataset is of type NSEC, 'nsec' must point to the qp trie for the
* zone, otherwise it must be NULL.
*
* qpzone_subtractrdataset doesn't have the same problem since it cannot delete
* nodes, only rdatasets.
*/
static isc_result_t
qpzone_addrdataset_inner(dns_db_t *db, dns_dbnode_t *dbnode,
dns_dbversion_t *dbversion,
isc_stdtime_t now ISC_ATTR_UNUSED,
dns_rdataset_t *rdataset, unsigned int options,
dns_rdataset_t *addedrdataset, dns_qp_t *nsec) {
qpzone_addrdataset_inner(qpzonedb_t *qpdb, qpznode_t *node,
dns_dbversion_t *dbversion, dns_rdataset_t *rdataset,
unsigned int options, dns_rdataset_t *addedrdataset,
dns_qp_t *nsec) {
isc_result_t result;
qpzonedb_t *qpdb = (qpzonedb_t *)db;
qpznode_t *node = (qpznode_t *)dbnode;
qpz_version_t *version = (qpz_version_t *)dbversion;
isc_region_t region;
isc_rwlocktype_t nlocktype = isc_rwlocktype_none;
@ -4748,16 +4748,10 @@ qpzone_addrdataset_inner(dns_db_t *db, dns_dbnode_t *dbnode,
newheader->resign_lsb = rdataset->resign & 0x1;
}
/*
* Add to the auxiliary NSEC tree if we're adding an NSEC record.
*/
bool is_nsec = !node->havensec && rdataset->type == dns_rdatatype_nsec;
REQUIRE(!is_nsec || nsec != NULL);
/*
* If we're adding a delegation type or adding to the auxiliary NSEC
* tree hold an exclusive lock on the tree. In the latter case the
* lock does not necessarily have to be acquired but it will help
* namespace, hold an exclusive lock on the tree. In the latter case
* the lock does not necessarily have to be acquired but it will help
* purge ancient entries more effectively.
*
* (Note: node lock must be acquired after starting
@ -4768,7 +4762,7 @@ qpzone_addrdataset_inner(dns_db_t *db, dns_dbnode_t *dbnode,
NODE_WRLOCK(nlock, &nlocktype);
result = ISC_R_SUCCESS;
if (is_nsec) {
if (nsec != NULL) {
node->havensec = true;
/*
@ -4819,15 +4813,15 @@ qpzone_addrdataset(dns_db_t *db, dns_dbnode_t *dbnode,
REQUIRE(VALID_QPZONE(qpdb));
/*
* Add to the auxiliary NSEC tree if we're adding an NSEC record.
* Open a new write transaction if we're adding to the auxiliary
* NSEC namespace.
*/
if (!node->havensec && rdataset->type == dns_rdatatype_nsec) {
dns_qpmulti_write(qpdb->tree, &nsec);
}
isc_result_t result = qpzone_addrdataset_inner(db, dbnode, dbversion,
now, rdataset, options,
addedrdataset, nsec);
isc_result_t result = qpzone_addrdataset_inner(
qpdb, node, dbversion, rdataset, options, addedrdataset, nsec);
if (nsec != NULL) {
dns_qpmulti_commit(qpdb->tree, &nsec);
@ -5391,7 +5385,8 @@ qpzone_update_rdataset(qpzonedb_t *qpdb, qpz_version_t *version, dns_qp_t *qp,
isc_result_t result;
unsigned int options;
dns_rdataset_t ardataset;
dns_dbnode_t *node = NULL;
qpznode_t *node = NULL;
dns_qp_t *nsec = NULL;
bool is_nsec3;
dns_rdataset_init(&ardataset);
@ -5400,7 +5395,7 @@ qpzone_update_rdataset(qpzonedb_t *qpdb, qpz_version_t *version, dns_qp_t *qp,
rds->covers == dns_rdatatype_nsec3);
result = findnodeintree(qpdb, qp, name, true, is_nsec3,
&node DNS__DB_FLARG_PASS);
(dns_dbnode_t **)&node DNS__DB_FLARG_PASS);
if (result != ISC_R_SUCCESS) {
goto failure;
@ -5415,16 +5410,20 @@ qpzone_update_rdataset(qpzonedb_t *qpdb, qpz_version_t *version, dns_qp_t *qp,
*/
options = DNS_DBADD_MERGE | DNS_DBADD_EXACT |
DNS_DBADD_EXACTTTL;
if (!node->havensec && ardataset.type == dns_rdatatype_nsec) {
nsec = qp;
}
result = qpzone_addrdataset_inner(
(dns_db_t *)qpdb, node, (dns_dbversion_t *)version, 0,
rds, options, &ardataset, qp DNS__DB_FLARG_PASS);
qpdb, node, (dns_dbversion_t *)version, rds, options,
&ardataset, nsec DNS__DB_FLARG_PASS);
break;
case DNS_DIFFOP_DEL:
case DNS_DIFFOP_DELRESIGN:
options = DNS_DBSUB_EXACT | DNS_DBSUB_WANTOLD;
result = qpzone_subtractrdataset(
(dns_db_t *)qpdb, node, (dns_dbversion_t *)version, rds,
options, &ardataset DNS__DB_FLARG_PASS);
(dns_db_t *)qpdb, (dns_dbnode_t *)node,
(dns_dbversion_t *)version, rds, options,
&ardataset DNS__DB_FLARG_PASS);
break;
default:
UNREACHABLE();
@ -5442,7 +5441,7 @@ qpzone_update_rdataset(qpzonedb_t *qpdb, qpz_version_t *version, dns_qp_t *qp,
failure:
if (node != NULL) {
dns_db_detachnode(&node);
dns_db_detachnode((dns_dbnode_t **)&node);
}
dns_rdataset_cleanup(&ardataset);
return result;

16
lib/dns/xfrin.c
View file

@ -80,7 +80,13 @@ typedef enum {
* Incoming zone transfer context.
*/
typedef struct dns_ixfr dns_ixfr_t;
typedef struct dns_ixfr {
uint32_t diffs;
uint32_t maxdiffs;
uint32_t request_serial;
uint32_t current_serial;
dns_journal_t *journal;
} dns_ixfr_t;
struct dns_xfrin {
unsigned int magic;
@ -174,13 +180,7 @@ struct dns_xfrin {
*/
dns_rdatacallbacks_t axfr;
struct dns_ixfr {
uint32_t diffs;
uint32_t maxdiffs;
uint32_t request_serial;
uint32_t current_serial;
dns_journal_t *journal;
} ixfr;
dns_ixfr_t ixfr;
dns_rdata_t firstsoa;
unsigned char *firstsoa_data;