evaluate: missing basic evaluation of expectations

Basic ct expectation object evaluation. This fixes tests/py errors.

Error reporting is very sparse at this stage. I'm intentionally leaving
this as future work to store location objects for each field, so user
gets better indication on what is missing when configuring expectations.

Fixes: 1dd08fcfa07a ("src: add ct expectations support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/evaluate.c b/src/evaluate.c
index ff0271c757c280b35308db7e98c254216537c683..864d3daf1a5fe524986f27a3e79483bbd795e2ff 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -3425,15 +3425,26 @@ static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain)
        return 0;
 }
 
-static int obj_evaluate(struct eval_ctx *ctx, struct obj *obj)
+static int ct_expect_evaluate(struct eval_ctx *ctx, struct obj *obj)
+{
+       struct ct_expect *ct = &obj->ct_expect;
+
+       if (!ct->l4proto ||
+           !ct->dport ||
+           !ct->timeout ||
+           !ct->size)
+               return __stmt_binary_error(ctx, &obj->location, NULL,
+                                          "missing options");
+
+       return 0;
+}
+
+static int ct_timeout_evaluate(struct eval_ctx *ctx, struct obj *obj)
 {
        struct ct_timeout *ct = &obj->ct_timeout;
        struct timeout_state *ts, *next;
        unsigned int i;
 
-       if (obj->type != NFT_OBJECT_CT_TIMEOUT)
-               return 0;
-
        for (i = 0; i < timeout_protocol[ct->l4proto].array_size; i++)
                ct->timeout[i] = timeout_protocol[ct->l4proto].dflt_timeout[i];
 
@@ -3446,6 +3457,21 @@ static int obj_evaluate(struct eval_ctx *ctx, struct obj *obj)
                list_del(&ts->head);
                xfree(ts);
        }
+
+       return 0;
+}
+
+static int obj_evaluate(struct eval_ctx *ctx, struct obj *obj)
+{
+       switch (obj->type) {
+       case NFT_OBJECT_CT_TIMEOUT:
+               return ct_timeout_evaluate(ctx, obj);
+       case NFT_OBJECT_CT_EXPECT:
+               return ct_expect_evaluate(ctx, obj);
+       default:
+               break;
+       }
+
        return 0;
 }