mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Add namespace to new_qp(c|z)node

Browse Source 
Is there a time when new_qp(c|z)node() would not be followed by
assignment of the namespace? No, so let's add the assignment to the
function that creates the node.
This commit is contained in:
Matthijs Mekking 2025-07-07 11:42:17 +02:00
parent df6763fd2a
commit c5a14f263f
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dns/qpcache.c
View File

@ -2327,10 +2327,11 @@ reactivate_node(qpcache_t *qpdb, qpcnode_t *node,
} }
static qpcnode_t * static qpcnode_t *
new_qpcnode(qpcache_t *qpdb, const dns_name_t *name) { new_qpcnode(qpcache_t *qpdb, const dns_name_t *name, dns_namespace_t nspace) {
qpcnode_t *newdata = isc_mem_get(qpdb->common.mctx, sizeof(*newdata)); qpcnode_t *newdata = isc_mem_get(qpdb->common.mctx, sizeof(*newdata));
*newdata = (qpcnode_t){ *newdata = (qpcnode_t){
.name = DNS_NAME_INITEMPTY, .name = DNS_NAME_INITEMPTY,
.nspace = nspace,
.references = ISC_REFCOUNT_INITIALIZER(1), .references = ISC_REFCOUNT_INITIALIZER(1),
.locknum = isc_random_uniform(qpdb->buckets_count), .locknum = isc_random_uniform(qpdb->buckets_count),
}; };
@ -2367,8 +2368,7 @@ qpcache_findnode(dns_db_t *db, const dns_name_t *name, bool create,
result = dns_qp_getname(qpdb->tree, name, nspace, result = dns_qp_getname(qpdb->tree, name, nspace,
(void **)&node, NULL); (void **)&node, NULL);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
node = new_qpcnode(qpdb, name); node = new_qpcnode(qpdb, name, nspace);
node->nspace = nspace;
result = dns_qp_insert(qpdb->tree, node, 0); result = dns_qp_insert(qpdb->tree, node, 0);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
qpcnode_unref(node); qpcnode_unref(node);
@ -3049,8 +3049,8 @@ qpcache_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
(void **)&nsecnode, NULL); (void **)&nsecnode, NULL);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
INSIST(nsecnode == NULL); INSIST(nsecnode == NULL);
nsecnode = new_qpcnode(qpdb, name); nsecnode = new_qpcnode(qpdb, name,
nsecnode->nspace = DNS_DBNAMESPACE_NSEC; DNS_DBNAMESPACE_NSEC);
result = dns_qp_insert(qpdb->nsec, nsecnode, 0); result = dns_qp_insert(qpdb->nsec, nsecnode, 0);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
qpcnode_detach(&nsecnode); qpcnode_detach(&nsecnode);

35
lib/dns/qpzone.c
View File

@ -662,10 +662,11 @@ qpz_heap_destroy(qpz_heap_t *qpheap) {
} }
static qpznode_t * static qpznode_t *
new_qpznode(qpzonedb_t *qpdb, const dns_name_t *name) { new_qpznode(qpzonedb_t *qpdb, const dns_name_t *name, dns_namespace_t nspace) {
qpznode_t *newdata = isc_mem_get(qpdb->common.mctx, sizeof(*newdata)); qpznode_t *newdata = isc_mem_get(qpdb->common.mctx, sizeof(*newdata));
*newdata = (qpznode_t){ *newdata = (qpznode_t){
.name = DNS_NAME_INITEMPTY, .name = DNS_NAME_INITEMPTY,
.nspace = nspace,
.heap = qpdb->heap, .heap = qpdb->heap,
.references = ISC_REFCOUNT_INITIALIZER(1), .references = ISC_REFCOUNT_INITIALIZER(1),
.locknum = qpzone_get_locknum(), .locknum = qpzone_get_locknum(),
@ -766,8 +767,9 @@ dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
* We now explicitly create a node for the zone's origin, and then * We now explicitly create a node for the zone's origin, and then
* we simply remember the node data's address. * we simply remember the node data's address.
*/ */
qpdb->origin = new_qpznode(qpdb, &qpdb->common.origin); qpdb->origin = new_qpznode(qpdb, &qpdb->common.origin,
qpdb->origin->nspace = DNS_DBNAMESPACE_NORMAL; DNS_DBNAMESPACE_NORMAL);
result = dns_qp_insert(qp, qpdb->origin, 0); result = dns_qp_insert(qp, qpdb->origin, 0);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
@ -775,8 +777,8 @@ dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
* Add an apex node to the NSEC tree so that we can quickly skip over * Add an apex node to the NSEC tree so that we can quickly skip over
* the NSEC nodes while iterating over the full tree. * the NSEC nodes while iterating over the full tree.
*/ */
qpdb->nsec_origin = new_qpznode(qpdb, &qpdb->common.origin); qpdb->nsec_origin = new_qpznode(qpdb, &qpdb->common.origin,
qpdb->nsec_origin->nspace = DNS_DBNAMESPACE_NSEC; DNS_DBNAMESPACE_NSEC);
result = dns_qp_insert(qp, qpdb->nsec_origin, 0); result = dns_qp_insert(qp, qpdb->nsec_origin, 0);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
@ -785,8 +787,8 @@ dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
* return partial matches when there is only a single NSEC3 * return partial matches when there is only a single NSEC3
* record in the tree. * record in the tree.
*/ */
qpdb->nsec3_origin = new_qpznode(qpdb, &qpdb->common.origin); qpdb->nsec3_origin = new_qpznode(qpdb, &qpdb->common.origin,
qpdb->nsec3_origin->nspace = DNS_DBNAMESPACE_NSEC3; DNS_DBNAMESPACE_NSEC3);
result = dns_qp_insert(qp, qpdb->nsec3_origin, 0); result = dns_qp_insert(qp, qpdb->nsec3_origin, 0);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
@ -1718,8 +1720,7 @@ loading_addnode(qpz_load_t *loadctx, const dns_name_t *name,
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
*nodep = node; *nodep = node;
} else { } else {
node = new_qpznode(qpdb, name); node = new_qpznode(qpdb, name, DNS_DBNAMESPACE_NSEC3);
node->nspace = DNS_DBNAMESPACE_NSEC3;
result = dns_qp_insert(loadctx->tree, node, 0); result = dns_qp_insert(loadctx->tree, node, 0);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
*nodep = node; *nodep = node;
@ -1736,8 +1737,7 @@ loading_addnode(qpz_load_t *loadctx, const dns_name_t *name,
} }
} else { } else {
INSIST(node == NULL); INSIST(node == NULL);
node = new_qpznode(qpdb, name); node = new_qpznode(qpdb, name, DNS_DBNAMESPACE_NORMAL);
node->nspace = DNS_DBNAMESPACE_NORMAL;
result = dns_qp_insert(loadctx->tree, node, 0); result = dns_qp_insert(loadctx->tree, node, 0);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
qpznode_unref(node); qpznode_unref(node);
@ -1755,8 +1755,7 @@ loading_addnode(qpz_load_t *loadctx, const dns_name_t *name,
* move on. * move on.
*/ */
node->havensec = true; node->havensec = true;
nsecnode = new_qpznode(qpdb, name); nsecnode = new_qpznode(qpdb, name, DNS_DBNAMESPACE_NSEC);
nsecnode->nspace = DNS_DBNAMESPACE_NSEC;
(void)dns_qp_insert(loadctx->tree, nsecnode, 0); (void)dns_qp_insert(loadctx->tree, nsecnode, 0);
qpznode_detach(&nsecnode); qpznode_detach(&nsecnode);
@ -2137,8 +2136,7 @@ wildcardmagic(qpzonedb_t *qpdb, dns_qp_t *qp, const dns_name_t *name,
result = dns_qp_getname(qp, &foundname, nspace, (void **)&node, NULL); result = dns_qp_getname(qp, &foundname, nspace, (void **)&node, NULL);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
INSIST(node == NULL); INSIST(node == NULL);
node = new_qpznode(qpdb, &foundname); node = new_qpznode(qpdb, &foundname, nspace);
node->nspace = nspace;
result = dns_qp_insert(qp, node, 0); result = dns_qp_insert(qp, node, 0);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
qpznode_unref(node); qpznode_unref(node);
@ -2569,8 +2567,7 @@ findnodeintree(qpzonedb_t *qpdb, const dns_name_t *name, bool create,
return result; return result;
} }
node = new_qpznode(qpdb, name); node = new_qpznode(qpdb, name, nspace);
node->nspace = nspace;
result = dns_qp_insert(qp, node, 0); result = dns_qp_insert(qp, node, 0);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
qpznode_unref(node); qpznode_unref(node);
@ -4894,8 +4891,8 @@ qpzone_addrdataset(dns_db_t *db, dns_dbnode_t *dbnode,
* so we can detach the new one we created and * so we can detach the new one we created and
* move on. * move on.
*/ */
qpznode_t *nsecnode = new_qpznode(qpdb, name); qpznode_t *nsecnode = new_qpznode(qpdb, name,
nsecnode->nspace = DNS_DBNAMESPACE_NSEC; DNS_DBNAMESPACE_NSEC);
(void)dns_qp_insert(nsec, nsecnode, 0); (void)dns_qp_insert(nsec, nsecnode, 0);
qpznode_detach(&nsecnode); qpznode_detach(&nsecnode);
} }