From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: kaber@trash.net, fw@strlen.de
Subject: [PATCH nft 5/7] evaluate: transfer right shifts to range side
Date: Sat, 5 Dec 2015 20:04:24 +0100 [thread overview]
Message-ID: <1449342266-2756-5-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1449342266-2756-1-git-send-email-pablo@netfilter.org>
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>
---
src/evaluate.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/evaluate.c b/src/evaluate.c
index d62870a..0fcdb73 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1073,6 +1073,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);
--
2.1.4
next prev parent reply other threads:[~2015-12-05 19:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-05 19:04 [PATCH nft 1/7,v2] tests: vlan pcp and cfi are located in the first byte Pablo Neira Ayuso
2015-12-05 19:04 ` [PATCH nft 2/7,v2] src: fix sub-byte protocol header definitions Pablo Neira Ayuso
2015-12-14 17:38 ` Pablo Neira Ayuso
2015-12-05 19:04 ` [PATCH nft 3/7] netlink_delinearize: postprocess expression before range merge Pablo Neira Ayuso
2015-12-05 19:04 ` [PATCH nft 4/7] evaluate: transfer right shifts to constant side Pablo Neira Ayuso
2015-12-05 19:04 ` Pablo Neira Ayuso [this message]
2015-12-05 19:04 ` [PATCH nft 6/7] evaluate: transfer right shifts to set reference side Pablo Neira Ayuso
2015-12-05 19:04 ` [PATCH nft 7/7] src: move payload sub-byte matching to the evaluation step Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449342266-2756-5-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).