Change the (acl)->node_count macro to dns_acl_node_count(acl) macro to clean the...

(cherry picked from commit 8120088ec73c6399c921a112aca93d8c9a76f1d9)

diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index 017bb4a2376dfb648a42adb71c7de649d0cc5d3f..abdb6ccca492e6e8d57ec27499537ce08725f647 100644 (file)
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -140,7 +140,7 @@ dns_acl_isanyornone(dns_acl_t *acl, bool pos)
            acl->iptable->radix->head->prefix == NULL)
                return (false);
 
-       if (acl->length != 0 || acl->node_count != 1)
+       if (acl->length != 0 || dns_acl_node_count(acl) != 1)
                return (false);
 
        if (acl->iptable->radix->head->prefix->bitlen == 0 &&
@@ -313,7 +313,7 @@ dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, bool pos)
 
                /* Adjust node numbering. */
                dest->elements[nelem + i].node_num =
-                       source->elements[i].node_num + dest->node_count;
+                       source->elements[i].node_num + dns_acl_node_count(dest);
 
                /* Duplicate nested acl. */
                if (source->elements[i].type == dns_aclelementtype_nestedacl &&
@@ -352,12 +352,12 @@ dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, bool pos)
         * Merge the iptables.  Make sure the destination ACL's
         * node_count value is set correctly afterward.
         */
-       nodes = max_node + dest->node_count;
+       nodes = max_node + dns_acl_node_count(dest);
        result = dns_iptable_merge(dest->iptable, source->iptable, pos);
        if (result != ISC_R_SUCCESS)
                return (result);
-       if (nodes > dest->node_count)
-               dest->node_count = nodes;
+       if (nodes > dns_acl_node_count(dest))
+               dns_acl_node_count(dest) = nodes;
 
        return (ISC_R_SUCCESS);
 }

diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h
index 68aea28a66c19066225e60dc88973ab7c6d5f317..6e17f6b73ad8650297db5c9b96d2829886a4c449 100644 (file)
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -73,18 +73,19 @@ struct dns_aclelement {
        int                     node_num;
 };
 
+#define dns_acl_node_count(acl) acl->iptable->radix->num_added_node
+
 struct dns_acl {
        unsigned int            magic;
        isc_mem_t               *mctx;
        isc_refcount_t          refcount;
        dns_iptable_t           *iptable;
-#define node_count             iptable->radix->num_added_node
        dns_aclelement_t        *elements;
-       bool            has_negatives;
-       unsigned int            alloc;          /*%< Elements allocated */
-       unsigned int            length;         /*%< Elements initialized */
-       char                    *name;          /*%< Temporary use only */
-       ISC_LINK(dns_acl_t)     nextincache;    /*%< Ditto */
+       bool                    has_negatives;
+       unsigned int            alloc;          /*%< Elements allocated */
+       unsigned int            length;         /*%< Elements initialized */
+       char                    *name;          /*%< Temporary use only */
+       ISC_LINK(dns_acl_t)     nextincache;    /*%< Ditto */
 };
 
 struct dns_aclenv {

diff --git a/lib/dns/tests/acl_test.c b/lib/dns/tests/acl_test.c
index a2b7f16b577cc239cbd6129da2904b531c6f3e80..07d33c70abfd5929d47caa58a520e98beb46345e 100644 (file)
--- a/lib/dns/tests/acl_test.c
+++ b/lib/dns/tests/acl_test.c
@@ -105,8 +105,8 @@ dns_acl_isinsecure_test(void **state) {
        de->type = dns_aclelementtype_geoip;
        de->negative = false;
        assert_true(geoip->length < geoip->alloc);
-       geoip->node_count++;
-       de->node_num = geoip->node_count;
+       dns_acl_node_count(geoip)++;
+       de->node_num = dns_acl_node_count(geoip);
        geoip->length++;
 
        result = dns_acl_create(mctx, 1, &notgeoip);

diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index 528144e3992e4e91f8c59df2332ad340c7f88db5..b8759a8605573370c931e44cc00fc887898f6ebd 100644 (file)
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -1282,8 +1282,8 @@ nested_acl:
                        dns_acl_detach(&de->nestedacl);
                }
 
-               dacl->node_count++;
-               de->node_num = dacl->node_count;
+               dns_acl_node_count(dacl)++;
+               de->node_num = dns_acl_node_count(dacl);
 
                dacl->length++;
                de++;