src: replace 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.

Reported-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/evaluate.c b/src/evaluate.c
index 4397bacf662b0e265dd516d0e2f1d7e65267bb80..aa7ec9bee4aeb577394c135a998b8e611c69255a 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -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);

diff --git a/src/mnl.c b/src/mnl.c
index ce58ae7219ecc92880412ced3c478f020e6eace0..f28d6605835ffc7ef3eabb2741183dcebc5a9862 100644 (file)
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -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;
 

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 57af71a75609acbe70a5ee6d3a50e6f995b8128a..5c80397db26c6be140ce2c1538f4f5b47ad3ea05 100644 (file)
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -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;

diff --git a/src/segtree.c b/src/segtree.c
index 9de5422c7d7f63e4c747b2de5deba3bdb0074ee7..5eaf684578bfb397484cb0c4d3db51f21f01a332 100644 (file)
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -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);