Add namespace to new_qp(c|z)node

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.

diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c
index 8645a114eb5971891e5fcda96ad5cd21b6cfc103..7e685318b88d3b654cd1f2dc98fe876dc9e149bd 100644 (file)
--- a/lib/dns/qpcache.c
+++ b/lib/dns/qpcache.c
@@ -2327,10 +2327,11 @@ reactivate_node(qpcache_t *qpdb, qpcnode_t *node,
 }
 
 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));
        *newdata = (qpcnode_t){
                .name = DNS_NAME_INITEMPTY,
+               .nspace = nspace,
                .references = ISC_REFCOUNT_INITIALIZER(1),
                .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,
                                        (void **)&node, NULL);
                if (result != ISC_R_SUCCESS) {
-                       node = new_qpcnode(qpdb, name);
-                       node->nspace = nspace;
+                       node = new_qpcnode(qpdb, name, nspace);
                        result = dns_qp_insert(qpdb->tree, node, 0);
                        INSIST(result == ISC_R_SUCCESS);
                        qpcnode_unref(node);
@@ -3049,8 +3049,8 @@ qpcache_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
                                        (void **)&nsecnode, NULL);
                if (result != ISC_R_SUCCESS) {
                        INSIST(nsecnode == NULL);
-                       nsecnode = new_qpcnode(qpdb, name);
-                       nsecnode->nspace = DNS_DBNAMESPACE_NSEC;
+                       nsecnode = new_qpcnode(qpdb, name,
+                                              DNS_DBNAMESPACE_NSEC);
                        result = dns_qp_insert(qpdb->nsec, nsecnode, 0);
                        INSIST(result == ISC_R_SUCCESS);
                        qpcnode_detach(&nsecnode);

diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c
index 93caeb3d52af20598ee2e2f5bc9c99e2cec120f0..51c96a8c9050e914a96511a34350c7fee56a2545 100644 (file)
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -662,10 +662,11 @@ qpz_heap_destroy(qpz_heap_t *qpheap) {
 }
 
 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));
        *newdata = (qpznode_t){
                .name = DNS_NAME_INITEMPTY,
+               .nspace = nspace,
                .heap = qpdb->heap,
                .references = ISC_REFCOUNT_INITIALIZER(1),
                .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 simply remember the node data's address.
         */
-       qpdb->origin = new_qpznode(qpdb, &qpdb->common.origin);
-       qpdb->origin->nspace = DNS_DBNAMESPACE_NORMAL;
+       qpdb->origin = new_qpznode(qpdb, &qpdb->common.origin,
+                                  DNS_DBNAMESPACE_NORMAL);
+
        result = dns_qp_insert(qp, qpdb->origin, 0);
        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
         * the NSEC nodes while iterating over the full tree.
         */
-       qpdb->nsec_origin = new_qpznode(qpdb, &qpdb->common.origin);
-       qpdb->nsec_origin->nspace = DNS_DBNAMESPACE_NSEC;
+       qpdb->nsec_origin = new_qpznode(qpdb, &qpdb->common.origin,
+                                       DNS_DBNAMESPACE_NSEC);
        result = dns_qp_insert(qp, qpdb->nsec_origin, 0);
        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
         * record in the tree.
         */
-       qpdb->nsec3_origin = new_qpznode(qpdb, &qpdb->common.origin);
-       qpdb->nsec3_origin->nspace = DNS_DBNAMESPACE_NSEC3;
+       qpdb->nsec3_origin = new_qpznode(qpdb, &qpdb->common.origin,
+                                        DNS_DBNAMESPACE_NSEC3);
        result = dns_qp_insert(qp, qpdb->nsec3_origin, 0);
        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) {
                        *nodep = node;
                } else {
-                       node = new_qpznode(qpdb, name);
-                       node->nspace = DNS_DBNAMESPACE_NSEC3;
+                       node = new_qpznode(qpdb, name, DNS_DBNAMESPACE_NSEC3);
                        result = dns_qp_insert(loadctx->tree, node, 0);
                        INSIST(result == ISC_R_SUCCESS);
                        *nodep = node;
@@ -1736,8 +1737,7 @@ loading_addnode(qpz_load_t *loadctx, const dns_name_t *name,
                }
        } else {
                INSIST(node == NULL);
-               node = new_qpznode(qpdb, name);
-               node->nspace = DNS_DBNAMESPACE_NORMAL;
+               node = new_qpznode(qpdb, name, DNS_DBNAMESPACE_NORMAL);
                result = dns_qp_insert(loadctx->tree, node, 0);
                INSIST(result == ISC_R_SUCCESS);
                qpznode_unref(node);
@@ -1755,8 +1755,7 @@ loading_addnode(qpz_load_t *loadctx, const dns_name_t *name,
         * move on.
         */
        node->havensec = true;
-       nsecnode = new_qpznode(qpdb, name);
-       nsecnode->nspace = DNS_DBNAMESPACE_NSEC;
+       nsecnode = new_qpznode(qpdb, name, DNS_DBNAMESPACE_NSEC);
        (void)dns_qp_insert(loadctx->tree, nsecnode, 0);
        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);
        if (result != ISC_R_SUCCESS) {
                INSIST(node == NULL);
-               node = new_qpznode(qpdb, &foundname);
-               node->nspace = nspace;
+               node = new_qpznode(qpdb, &foundname, nspace);
                result = dns_qp_insert(qp, node, 0);
                INSIST(result == ISC_R_SUCCESS);
                qpznode_unref(node);
@@ -2569,8 +2567,7 @@ findnodeintree(qpzonedb_t *qpdb, const dns_name_t *name, bool create,
                        return result;
                }
 
-               node = new_qpznode(qpdb, name);
-               node->nspace = nspace;
+               node = new_qpznode(qpdb, name, nspace);
                result = dns_qp_insert(qp, node, 0);
                INSIST(result == ISC_R_SUCCESS);
                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
                 * move on.
                 */
-               qpznode_t *nsecnode = new_qpznode(qpdb, name);
-               nsecnode->nspace = DNS_DBNAMESPACE_NSEC;
+               qpznode_t *nsecnode = new_qpznode(qpdb, name,
+                                                 DNS_DBNAMESPACE_NSEC);
                (void)dns_qp_insert(nsec, nsecnode, 0);
                qpznode_detach(&nsecnode);
        }