From 8120088ec73c6399c921a112aca93d8c9a76f1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Fri, 6 Dec 2019 15:47:39 +0100
Subject: [PATCH] Change the (acl)->node_count macro to dns_acl_node_count(acl)
 macro to clean the global namespace

---
 lib/dns/acl.c             | 10 +++++-----
 lib/dns/include/dns/acl.h | 13 +++++++------
 lib/dns/tests/acl_test.c  |  4 ++--
 lib/isccfg/aclconf.c      |  4 ++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index a8b7bd258d..f6cc4c1d73 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -128,7 +128,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 &&
@@ -299,7 +299,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 &&
@@ -335,12 +335,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 07082d4891..c4078471a4 100644
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -71,18 +71,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 5e7c34dbea..da0aea0273 100644
--- a/lib/dns/tests/acl_test.c
+++ b/lib/dns/tests/acl_test.c
@@ -103,8 +103,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(dt_mctx, 1, &notgeoip);
diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index c4d14570cd..66e4b2e7ba 100644
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -921,8 +921,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++;