evaluate: compact STMT_F_STATEFUL checks

We'll gain another F_STATEFUL check in a followup patch,
so lets condense the pattern into a helper to reduce copypaste.

Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/evaluate.c b/src/evaluate.c
index 0db3d80f8b56ffa05a65c30d308fcc7940d4dbe4..92bf47a38d8370ba1e1b72a2d7e1c05e613d4506 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -3453,6 +3453,17 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)
        return expr_evaluate(ctx, &stmt->payload.val);
 }
 
+static int stmt_evaluate_stateful(struct eval_ctx *ctx, struct stmt *stmt, const char *name)
+{
+       if (stmt_evaluate(ctx, stmt) < 0)
+               return -1;
+
+       if (!(stmt->flags & STMT_F_STATEFUL))
+               return stmt_error(ctx, stmt, "%s statement must be stateful", name);
+
+       return 0;
+}
+
 static int stmt_evaluate_meter(struct eval_ctx *ctx, struct stmt *stmt)
 {
        struct expr *key, *setref;
@@ -3526,11 +3537,8 @@ static int stmt_evaluate_meter(struct eval_ctx *ctx, struct stmt *stmt)
 
        stmt->meter.set = setref;
 
-       if (stmt_evaluate(ctx, stmt->meter.stmt) < 0)
+       if (stmt_evaluate_stateful(ctx, stmt->meter.stmt, "meter") < 0)
                return -1;
-       if (!(stmt->meter.stmt->flags & STMT_F_STATEFUL))
-               return stmt_binary_error(ctx, stmt->meter.stmt, stmt,
-                                        "meter statement must be stateful");
 
        return 0;
 }
@@ -4656,11 +4664,8 @@ static int stmt_evaluate_set(struct eval_ctx *ctx, struct stmt *stmt)
                return expr_error(ctx->msgs, stmt->set.key,
                                  "Key expression comments are not supported");
        list_for_each_entry(this, &stmt->set.stmt_list, list) {
-               if (stmt_evaluate(ctx, this) < 0)
+               if (stmt_evaluate_stateful(ctx, this, "set") < 0)
                        return -1;
-               if (!(this->flags & STMT_F_STATEFUL))
-                       return stmt_error(ctx, this,
-                                         "statement must be stateful");
        }
 
        this_set = stmt->set.set->set;
@@ -4720,11 +4725,8 @@ static int stmt_evaluate_map(struct eval_ctx *ctx, struct stmt *stmt)
                                  "Data expression timeouts are not supported");
 
        list_for_each_entry(this, &stmt->map.stmt_list, list) {
-               if (stmt_evaluate(ctx, this) < 0)
+               if (stmt_evaluate_stateful(ctx, this, "map") < 0)
                        return -1;
-               if (!(this->flags & STMT_F_STATEFUL))
-                       return stmt_error(ctx, this,
-                                         "statement must be stateful");
        }
 
        return 0;