upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 05:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'ondrej/remove-too-generic-node_count-macro-from-dns_acl' into 'master'

Browse source 
Change the (acl)->node_count macro to dns_acl_node_count(acl) macro to clean the global namespace

See merge request isc-projects/bind9!2725
This commit is contained in:
Ondřej Surý 2019-12-09 06:49:00 +00:00
commit 6f096f5245
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/dns/acl.c
View file

@ -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);
}

13
lib/dns/include/dns/acl.h
View file

@ -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 {

4
lib/dns/tests/acl_test.c
View file

@ -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);

4
lib/isccfg/aclconf.c
View file

@ -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++;