Skip to contentSkip to conversation

src: use opencoded NFT_SET_ANONYMOUS set flag check by set_is_anonymous()

PATCH In review Pablo Neira Ayuso 2 participants 3 messages Jun 14, 2021 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 src: use opencoded NFT_SET_ANONYMOUS set flag check by set_is_anonymous()

Use set_is_anonymous() to check for the NFT_SET_ANONYMOUS set flag instead.

---
 src/evaluate.c            | 2 +-
 src/mnl.c                 | 2 +-
 src/netlink_delinearize.c | 2 +-
 src/segtree.c             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
src/evaluate.c +1 -1
index 4397bacf662b..aa7ec9bee4ae 100644
@@ -3781,7 +3781,7 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set)
 	struct stmt *stmt;
 	const char *type;
 
-	if (!(set->flags & NFT_SET_ANONYMOUS)) {
+	if (!set_is_anonymous(set->flags)) {
 		table = table_cache_find(&ctx->nft->cache.table_cache,
 					 set->handle.table.name,
 					 set->handle.family);
src/mnl.c +1 -1
index ce58ae7219ec..f28d6605835f 100644
@@ -1045,7 +1045,7 @@ static void set_key_expression(struct netlink_ctx *ctx,
 	struct nftnl_udata *nest1, *nest2;
 
 	if (expr->flags & EXPR_F_CONSTANT ||
-	    set_flags & NFT_SET_ANONYMOUS ||
+	    set_is_anonymous(set_flags) ||
 	    !expr_ops(expr)->build_udata)
 		return;
 
src/netlink_delinearize.c +1 -1
index 57af71a75609..5c80397db26c 100644
@@ -1591,7 +1591,7 @@ static void netlink_parse_dynset(struct netlink_parse_ctx *ctx,
 				 &stmt->map.stmt_list);
 	} else {
 		if (!list_empty(&dynset_parse_ctx.stmt_list) &&
-		    set->flags & NFT_SET_ANONYMOUS) {
+		    set_is_anonymous(set->flags)) {
 			stmt = meter_stmt_alloc(loc);
 			stmt->meter.set  = set_ref_expr_alloc(loc, set);
 			stmt->meter.key  = expr;
src/segtree.c +1 -1
index 9de5422c7d7f..5eaf684578bf 100644
@@ -537,7 +537,7 @@ static void segtree_linearize(struct list_head *list, const struct set *set,
 			 */
 			mpz_add_ui(p, prev->right, 1);
 			if (mpz_cmp(p, ei->left) < 0 ||
-			    (!(set->flags & NFT_SET_ANONYMOUS) && !merge)) {
+			    (!set_is_anonymous(set->flags) && !merge)) {
 				mpz_sub_ui(q, ei->left, 1);
 				nei = ei_alloc(p, q, NULL, EI_F_INTERVAL_END);
 				list_add_tail(&nei->list, list);
Signature · 1 line
2.30.2
reviewer
#1 lore raw
Quoted 2 lines · Pablo Neira Ayuso

Use set_is_anonymous() to check for the NFT_SET_ANONYMOUS set flag instead.

Thanks for fixing them all at once! :)

author maintainer
#2 lore raw
In reply to Pablo Neira Ayuso

Proposed patch subject should be instead:

src: replace opencoded NFT_SET_ANONYMOUS set flag check by set_is_anonymous()

Quoted 67 lines · Pablo Neira Ayuso

Use set_is_anonymous() to check for the NFT_SET_ANONYMOUS set flag instead.

---
 src/evaluate.c            | 2 +-
 src/mnl.c                 | 2 +-
 src/netlink_delinearize.c | 2 +-
 src/segtree.c             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
src/evaluate.c +1 -1
index 4397bacf662b..aa7ec9bee4ae 100644
@@ -3781,7 +3781,7 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set)
 	struct stmt *stmt;
 	const char *type;
 
-	if (!(set->flags & NFT_SET_ANONYMOUS)) {
+	if (!set_is_anonymous(set->flags)) {
 		table = table_cache_find(&ctx->nft->cache.table_cache,
 					 set->handle.table.name,
 					 set->handle.family);
src/mnl.c +1 -1
index ce58ae7219ec..f28d6605835f 100644
@@ -1045,7 +1045,7 @@ static void set_key_expression(struct netlink_ctx *ctx,
 	struct nftnl_udata *nest1, *nest2;
 
 	if (expr->flags & EXPR_F_CONSTANT ||
-	    set_flags & NFT_SET_ANONYMOUS ||
+	    set_is_anonymous(set_flags) ||
 	    !expr_ops(expr)->build_udata)
 		return;
 
src/netlink_delinearize.c +1 -1
index 57af71a75609..5c80397db26c 100644
@@ -1591,7 +1591,7 @@ static void netlink_parse_dynset(struct netlink_parse_ctx *ctx,
 				 &stmt->map.stmt_list);
 	} else {
 		if (!list_empty(&dynset_parse_ctx.stmt_list) &&
-		    set->flags & NFT_SET_ANONYMOUS) {
+		    set_is_anonymous(set->flags)) {
 			stmt = meter_stmt_alloc(loc);
 			stmt->meter.set  = set_ref_expr_alloc(loc, set);
 			stmt->meter.key  = expr;
src/segtree.c +1 -1
index 9de5422c7d7f..5eaf684578bf 100644
@@ -537,7 +537,7 @@ static void segtree_linearize(struct list_head *list, const struct set *set,
 			 */
 			mpz_add_ui(p, prev->right, 1);
 			if (mpz_cmp(p, ei->left) < 0 ||
-			    (!(set->flags & NFT_SET_ANONYMOUS) && !merge)) {
+			    (!set_is_anonymous(set->flags) && !merge)) {
 				mpz_sub_ui(q, ei->left, 1);
 				nei = ei_alloc(p, q, NULL, EI_F_INTERVAL_END);
 				list_add_tail(&nei->list, list);
Signature · 1 line
2.30.2