Refactor code that checks if records are seen

There are three places that do roughly the same. Refactor the code to
a helper function.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 9de591b50ad72faa7527aef0022ae1ec4923252d..dfd847aeffa979234fb1fdf20c2133cbc5f99841 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -7862,6 +7862,55 @@ check_if_bottom_of_zone(dns_db_t *db, dns_dbnode_t *node,
        return ISC_R_SUCCESS;
 }
 
+typedef struct seen {
+       bool rr;
+       bool soa;
+       bool ns;
+       bool nsec;
+       bool nsec3;
+       bool ds;
+       bool dname;
+} seen_t;
+
+static isc_result_t
+allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
+            dns_rdatasetiter_t **iterp, seen_t *seen) {
+       dns_rdataset_t rdataset = DNS_RDATASET_INIT;
+
+       *seen = (seen_t){};
+
+       RETERR(dns_db_allrdatasets(db, node, version, 0, 0, iterp));
+
+       DNS_RDATASETITER_FOREACH(*iterp) {
+               dns_rdatasetiter_current(*iterp, &rdataset);
+
+               if (rdataset.type == dns_rdatatype_rrsig) {
+                       dns_rdataset_disassociate(&rdataset);
+                       continue;
+               }
+
+               (*seen).rr = true;
+
+               if (rdataset.type == dns_rdatatype_soa) {
+                       (*seen).soa = true;
+               } else if (rdataset.type == dns_rdatatype_ns) {
+                       (*seen).ns = true;
+               } else if (rdataset.type == dns_rdatatype_ds) {
+                       (*seen).ds = true;
+               } else if (rdataset.type == dns_rdatatype_dname) {
+                       (*seen).dname = true;
+               } else if (rdataset.type == dns_rdatatype_nsec) {
+                       (*seen).nsec = true;
+               } else if (rdataset.type == dns_rdatatype_nsec3) {
+                       (*seen).nsec3 = true;
+               }
+
+               dns_rdataset_disassociate(&rdataset);
+       }
+
+       return ISC_R_SUCCESS;
+}
+
 static isc_result_t
 sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name,
            dns_dbnode_t *node, dns_dbversion_t *version, bool build_nsec3,
@@ -7878,13 +7927,13 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name,
        bool offlineksk = false;
        isc_buffer_t buffer;
        unsigned char data[1024];
-       bool seen_soa, seen_ns, seen_rr, seen_nsec, seen_nsec3, seen_ds;
+       seen_t seen;
 
        if (zone->kasp != NULL) {
                offlineksk = dns_kasp_offlineksk(zone->kasp);
        }
 
-       result = dns_db_allrdatasets(db, node, version, 0, 0, &iterator);
+       result = allrdatasets(db, node, version, &iterator, &seen);
        if (result != ISC_R_SUCCESS) {
                if (result == ISC_R_NOTFOUND) {
                        result = ISC_R_SUCCESS;
@@ -7893,32 +7942,13 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name,
        }
 
        isc_buffer_init(&buffer, data, sizeof(data));
-       seen_rr = seen_soa = seen_ns = seen_nsec = seen_nsec3 = seen_ds = false;
-       DNS_RDATASETITER_FOREACH(iterator) {
-               dns_rdatasetiter_current(iterator, &rdataset);
-               if (rdataset.type == dns_rdatatype_soa) {
-                       seen_soa = true;
-               } else if (rdataset.type == dns_rdatatype_ns) {
-                       seen_ns = true;
-               } else if (rdataset.type == dns_rdatatype_ds) {
-                       seen_ds = true;
-               } else if (rdataset.type == dns_rdatatype_nsec) {
-                       seen_nsec = true;
-               } else if (rdataset.type == dns_rdatatype_nsec3) {
-                       seen_nsec3 = true;
-               }
-               if (rdataset.type != dns_rdatatype_rrsig) {
-                       seen_rr = true;
-               }
-               dns_rdataset_disassociate(&rdataset);
-       }
 
        /*
         * Going from insecure to NSEC3.
         * Don't generate NSEC3 records for NSEC3 records.
         */
-       if (build_nsec3 && !seen_nsec3 && seen_rr) {
-               bool unsecure = !seen_ds && seen_ns && !seen_soa;
+       if (build_nsec3 && !seen.nsec3 && seen.rr) {
+               bool unsecure = !seen.ds && seen.ns && !seen.soa;
                CHECK(dns_nsec3_addnsec3s(db, version, name, nsecttl, unsecure,
                                          diff));
                (*signatures)--;
@@ -7927,7 +7957,7 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name,
         * Going from insecure to NSEC.
         * Don't generate NSEC records for NSEC3 records.
         */
-       if (build_nsec && !seen_nsec3 && !seen_nsec && seen_rr) {
+       if (build_nsec && !seen.nsec3 && !seen.nsec && seen.rr) {
                /*
                 * Build a NSEC record except at the origin.
                 */
@@ -7971,7 +8001,7 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name,
                        }
                }
 
-               if (seen_ns && !seen_soa && rdataset.type != dns_rdatatype_ds &&
+               if (seen.ns && !seen.soa && rdataset.type != dns_rdatatype_ds &&
                    rdataset.type != dns_rdatatype_nsec)
                {
                        continue;
@@ -8644,8 +8674,7 @@ zone_nsec3chain(dns_zone_t *zone) {
        unsigned int nkeys = 0;
        uint32_t nodes;
        bool unsecure = false;
-       bool seen_soa, seen_ns, seen_dname, seen_ds;
-       bool seen_nsec, seen_nsec3, seen_rr;
+       seen_t seen;
        dns_rdatasetiter_t *iterator = NULL;
        bool buildnsecchain;
        bool updatensec = false;
@@ -8813,43 +8842,27 @@ zone_nsec3chain(dns_zone_t *zone) {
                /*
                 * Check to see if this is a bottom of zone node.
                 */
-               result = dns_db_allrdatasets(db, node, version, 0, 0,
-                                            &iterator);
+               result = allrdatasets(db, node, version, &iterator, &seen);
                if (result == ISC_R_NOTFOUND) {
                        /* Empty node? */
                        goto next_addnode;
                }
                CHECK(result);
 
-               seen_soa = seen_ns = seen_dname = seen_ds = seen_nsec = false;
-               DNS_RDATASETITER_FOREACH(iterator) {
-                       dns_rdataset_t rdataset = DNS_RDATASET_INIT;
-                       dns_rdatasetiter_current(iterator, &rdataset);
-                       INSIST(rdataset.type != dns_rdatatype_nsec3);
-                       if (rdataset.type == dns_rdatatype_soa) {
-                               seen_soa = true;
-                       } else if (rdataset.type == dns_rdatatype_ns) {
-                               seen_ns = true;
-                       } else if (rdataset.type == dns_rdatatype_dname) {
-                               seen_dname = true;
-                       } else if (rdataset.type == dns_rdatatype_ds) {
-                               seen_ds = true;
-                       } else if (rdataset.type == dns_rdatatype_nsec) {
-                               seen_nsec = true;
-                       }
-                       dns_rdataset_disassociate(&rdataset);
-               }
+               INSIST(!seen.nsec3);
+
                dns_rdatasetiter_destroy(&iterator);
                /*
                 * Is there a NSEC chain than needs to be cleaned up?
                 */
-               if (seen_nsec) {
+               if (seen.nsec) {
                        nsec3chain->seen_nsec = true;
                }
-               if (seen_ns && !seen_soa && !seen_ds) {
+
+               if (seen.ns && !seen.soa && !seen.ds) {
                        unsecure = true;
                }
-               if ((seen_ns && !seen_soa) || seen_dname) {
+               if ((seen.ns && !seen.soa) || seen.dname) {
                        delegation = true;
                }
 
@@ -9074,41 +9087,19 @@ zone_nsec3chain(dns_zone_t *zone) {
                /*
                 * Check to see if this is a bottom of zone node.
                 */
-               result = dns_db_allrdatasets(db, node, version, 0, 0,
-                                            &iterator);
+               result = allrdatasets(db, node, version, &iterator, &seen);
                if (result == ISC_R_NOTFOUND) {
                        /* Empty node? */
                        goto next_removenode;
                }
                CHECK(result);
 
-               seen_soa = seen_ns = seen_dname = seen_nsec3 = seen_nsec =
-                       seen_rr = false;
-               DNS_RDATASETITER_FOREACH(iterator) {
-                       dns_rdataset_t rdataset = DNS_RDATASET_INIT;
-                       dns_rdatasetiter_current(iterator, &rdataset);
-                       if (rdataset.type == dns_rdatatype_soa) {
-                               seen_soa = true;
-                       } else if (rdataset.type == dns_rdatatype_ns) {
-                               seen_ns = true;
-                       } else if (rdataset.type == dns_rdatatype_dname) {
-                               seen_dname = true;
-                       } else if (rdataset.type == dns_rdatatype_nsec) {
-                               seen_nsec = true;
-                       } else if (rdataset.type == dns_rdatatype_nsec3) {
-                               seen_nsec3 = true;
-                       }
-                       if (rdataset.type != dns_rdatatype_rrsig) {
-                               seen_rr = true;
-                       }
-                       dns_rdataset_disassociate(&rdataset);
-               }
                dns_rdatasetiter_destroy(&iterator);
 
-               if (!seen_rr || seen_nsec3 || seen_nsec) {
+               if (!seen.rr || seen.nsec3 || seen.nsec) {
                        goto next_removenode;
                }
-               if ((seen_ns && !seen_soa) || seen_dname) {
+               if ((seen.ns && !seen.soa) || seen.dname) {
                        delegation = true;
                }