diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/evaluate.c | 6 | ||||
| -rw-r--r-- | src/netlink_delinearize.c | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 17a437bd..50f1496c 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2336,6 +2336,12 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr) struct expr *range; int ret; + right = rel->right; + if (right->etype == EXPR_SYMBOL && + right->symtype == SYMBOL_SET && + expr_evaluate(ctx, &rel->right) < 0) + return -1; + if (expr_evaluate(ctx, &rel->left) < 0) return -1; left = rel->left; diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 935a6667..9241f466 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -2839,6 +2839,15 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp) case EXPR_PAYLOAD: payload_match_postprocess(ctx, expr, expr->left); return; + case EXPR_CONCAT: + if (expr->right->etype == EXPR_SET_REF) { + assert(expr->left->dtype == &invalid_type); + assert(expr->right->dtype != &invalid_type); + + datatype_set(expr->left, expr->right->dtype); + } + expr_postprocess(ctx, &expr->left); + break; default: expr_postprocess(ctx, &expr->left); break; |