diff options
-rw-r--r-- | src/evaluate.c | 8 | ||||
-rw-r--r-- | tests/py/ip/meta.t | 2 | ||||
-rw-r--r-- | tests/py/ip/meta.t.json | 20 | ||||
-rw-r--r-- | tests/py/ip/meta.t.payload | 8 |
4 files changed, 2 insertions, 36 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 47caf3b0..edc3c5cb 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2733,12 +2733,8 @@ static int __stmt_evaluate_arg(struct eval_ctx *ctx, struct stmt *stmt, "expression has type %s with length %d", dtype->desc, (*expr)->dtype->desc, (*expr)->len); - - if ((dtype->type == TYPE_MARK && - !datatype_equal(datatype_basetype(dtype), datatype_basetype((*expr)->dtype))) || - (dtype->type != TYPE_MARK && - (*expr)->dtype->type != TYPE_INTEGER && - !datatype_equal((*expr)->dtype, dtype))) + else if ((*expr)->dtype->type != TYPE_INTEGER && + !datatype_equal((*expr)->dtype, dtype)) return stmt_binary_error(ctx, *expr, stmt, /* verdict vs invalid? */ "datatype mismatch: expected %s, " "expression has type %s", diff --git a/tests/py/ip/meta.t b/tests/py/ip/meta.t index 85eaf54c..5a05923a 100644 --- a/tests/py/ip/meta.t +++ b/tests/py/ip/meta.t @@ -15,5 +15,3 @@ meta obrname "br0";fail meta sdif "lo" accept;ok meta sdifname != "vrf1" accept;ok - -meta mark set ip dscp;ok diff --git a/tests/py/ip/meta.t.json b/tests/py/ip/meta.t.json index a93d7e78..3df31ce3 100644 --- a/tests/py/ip/meta.t.json +++ b/tests/py/ip/meta.t.json @@ -156,23 +156,3 @@ } } ] - -# meta mark set ip dscp -[ - { - "mangle": { - "key": { - "meta": { - "key": "mark" - } - }, - "value": { - "payload": { - "field": "dscp", - "protocol": "ip" - } - } - } - } -] - diff --git a/tests/py/ip/meta.t.payload b/tests/py/ip/meta.t.payload index 1aa8d003..afde5cc1 100644 --- a/tests/py/ip/meta.t.payload +++ b/tests/py/ip/meta.t.payload @@ -51,11 +51,3 @@ ip test-ip4 input [ cmp eq reg 1 0x00000011 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ cmp eq reg 1 0x00004300 ] - -# meta mark set ip dscp -ip test-ip4 input - [ payload load 1b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000fc ) ^ 0x00000000 ] - [ bitwise reg 1 = ( reg 1 >> 0x00000002 ) ] - [ meta set mark with reg 1 ] - |