summaryrefslogtreecommitdiffstats
path: root/src/evaluate.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2016-05-11 00:12:09 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2016-05-11 23:01:28 +0200
commitb8b8e7b6ae10d6a0ab9f3778705f1b075e760859 (patch)
tree6ec617dee9c3727906994fd7310fc7f7b53e9200 /src/evaluate.c
parente30af92ea2c661af5de84a8f991947090c0243d2 (diff)
evaluate: transfer right shifts to set reference 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>
Diffstat (limited to 'src/evaluate.c')
-rw-r--r--src/evaluate.c40
1 files changed, 40 insertions, 0 deletions
diff --git a/src/evaluate.c b/src/evaluate.c
index 60bbce1b..72a0e435 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1172,6 +1172,46 @@ static int binop_transfer(struct eval_ctx *ctx, struct expr **expr)
list_add_tail(&i->list, &next->list);
}
break;
+ case EXPR_SET_REF:
+ list_for_each_entry(i, &(*expr)->right->set->init->expressions, list) {
+ switch (i->key->ops->type) {
+ case EXPR_VALUE:
+ err = binop_can_transfer(ctx, left, i->key);
+ if (err <= 0)
+ return err;
+ break;
+ case EXPR_RANGE:
+ err = binop_can_transfer(ctx, left, i->key->left);
+ if (err <= 0)
+ return err;
+ err = binop_can_transfer(ctx, left, i->key->right);
+ if (err <= 0)
+ return err;
+ break;
+ default:
+ break;
+ }
+ }
+ list_for_each_entry_safe(i, next, &(*expr)->right->set->init->expressions,
+ list) {
+ list_del(&i->list);
+ switch (i->key->ops->type) {
+ case EXPR_VALUE:
+ if (binop_transfer_one(ctx, left, &i->key) < 0)
+ return -1;
+ break;
+ case EXPR_RANGE:
+ if (binop_transfer_one(ctx, left, &i->key->left) < 0)
+ return -1;
+ if (binop_transfer_one(ctx, left, &i->key->right) < 0)
+ return -1;
+ break;
+ default:
+ break;
+ }
+ list_add_tail(&i->list, &next->list);
+ }
+ break;
default:
return 0;
}