From e35693fd13de771e1e047ffa4f799f72f1446e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Falgueras=20Garc=C3=ADa?= Date: Wed, 17 Aug 2016 16:07:09 +0200 Subject: src: Implement rule comparison MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch implements the function: bool nftnl_rule_cmp(const struct nftnl_rule *r1, const struct nftnl_rule *r2) for rule comparison. Expressions within rules need to be compared, so also has been created the function: bool nftnl_expr_cmp(const struct nftnl_expr *e1, const struct nftnl_expr *e2); Also includes all expression comparators. Signed-off-by: Carlos Falgueras García Signed-off-by: Pablo Neira Ayuso --- src/expr/byteorder.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src/expr/byteorder.c') diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c index ca697cf..a7914ef 100644 --- a/src/expr/byteorder.c +++ b/src/expr/byteorder.c @@ -326,10 +326,32 @@ nftnl_expr_byteorder_snprintf(char *buf, size_t size, uint32_t type, return -1; } +static bool nftnl_expr_byteorder_cmp(const struct nftnl_expr *e1, + const struct nftnl_expr *e2) +{ + struct nftnl_expr_byteorder *b1 = nftnl_expr_data(e1); + struct nftnl_expr_byteorder *b2 = nftnl_expr_data(e2); + bool eq = true; + + if (e1->flags & (1 << NFTNL_EXPR_BYTEORDER_SREG)) + eq &= (b1->sreg == b2->sreg); + if (e1->flags & (1 << NFTNL_EXPR_BYTEORDER_DREG)) + eq &= (b1->dreg == b2->dreg); + if (e1->flags & (1 << NFTNL_EXPR_BYTEORDER_OP)) + eq &= (b1->op == b2->op); + if (e1->flags & (1 << NFTNL_EXPR_BYTEORDER_LEN)) + eq &= (b1->len == b2->len); + if (e1->flags & (1 << NFTNL_EXPR_BYTEORDER_SIZE)) + eq &= (b1->size == b2->size); + + return eq; +} + struct expr_ops expr_ops_byteorder = { .name = "byteorder", .alloc_len = sizeof(struct nftnl_expr_byteorder), .max_attr = NFTA_BYTEORDER_MAX, + .cmp = nftnl_expr_byteorder_cmp, .set = nftnl_expr_byteorder_set, .get = nftnl_expr_byteorder_get, .parse = nftnl_expr_byteorder_parse, -- cgit v1.2.3