src: evaluate: catch invalid 'meta day' values in eval step

Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/src/evaluate.c b/src/evaluate.c
index 8d5f5f8014b87925f0007ecf99fae828f19418f0..b8bcf4866d8d1245ed716e4947035f36d142e690 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1863,11 +1863,20 @@ static int expr_evaluate_meta(struct eval_ctx *ctx, struct expr **exprp)
 {
        struct expr *meta = *exprp;
 
-       if (ctx->pctx.family != NFPROTO_INET &&
-           meta->flags & EXPR_F_PROTOCOL &&
-           meta->meta.key == NFT_META_NFPROTO)
-               return expr_error(ctx->msgs, meta,
+       switch (meta->meta.key) {
+       case NFT_META_NFPROTO:
+               if (ctx->pctx.family != NFPROTO_INET &&
+                   meta->flags & EXPR_F_PROTOCOL)
+                       return expr_error(ctx->msgs, meta,
                                          "meta nfproto is only useful in the inet family");
+               break;
+       case NFT_META_TIME_DAY:
+               __expr_set_context(&ctx->ectx, meta->dtype, meta->byteorder,
+                                  meta->len, 6);
+               return 0;
+       default:
+               break;
+       }
 
        return expr_evaluate_primary(ctx, exprp);
 }

diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index 5911b74ac0600b768d0659b0fba5664331515239..86e5d258605dc40ce0b710c181530b0f6e010fb4 100644 (file)
--- a/tests/py/any/meta.t
+++ b/tests/py/any/meta.t
@@ -218,3 +218,7 @@ meta hour "17:00:00" drop;ok;meta hour "17:00" drop
 meta hour "17:00:01" drop;ok
 meta hour "00:00" drop;ok
 meta hour "00:01" drop;ok
+
+meta time "meh";fail
+meta hour "24:00" drop;fail
+meta day 7 drop;fail