summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-12-05 18:42:40 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2016-05-11 22:58:53 +0200
commite30af92ea2c661af5de84a8f991947090c0243d2 (patch)
tree3605e94f860ecdb1cdb8450a423564216cb0917b
parenta037b2e3867940ab7f786fbc5e6e4b7dc71d89f1 (diff)
evaluate: transfer right shifts to range side
This provides a generic way to transfer shifts from the left hand side to the right hand range side of a relational expression when performing transformations from the evaluation step. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/evaluate.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/evaluate.c b/src/evaluate.c
index f862cd04..60bbce1b 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1146,6 +1146,18 @@ static int binop_transfer(struct eval_ctx *ctx, struct expr **expr)
if (binop_transfer_one(ctx, left, &(*expr)->right) < 0)
return -1;
break;
+ case EXPR_RANGE:
+ err = binop_can_transfer(ctx, left, (*expr)->right->left);
+ if (err <= 0)
+ return err;
+ err = binop_can_transfer(ctx, left, (*expr)->right->right);
+ if (err <= 0)
+ return err;
+ if (binop_transfer_one(ctx, left, &(*expr)->right->left) < 0)
+ return -1;
+ if (binop_transfer_one(ctx, left, &(*expr)->right->right) < 0)
+ return -1;
+ break;
case EXPR_SET:
list_for_each_entry(i, &(*expr)->right->expressions, list) {
err = binop_can_transfer(ctx, left, i);