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/immediate.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/expr/immediate.c') diff --git a/src/expr/immediate.c b/src/expr/immediate.c index 22ec864..cb8a81b 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -320,11 +320,29 @@ static void nftnl_expr_immediate_free(const struct nftnl_expr *e) nftnl_free_verdict(&imm->data); } +static bool nftnl_expr_immediate_cmp(const struct nftnl_expr *e1, + const struct nftnl_expr *e2) +{ + struct nftnl_expr_immediate *i1 = nftnl_expr_data(e1); + struct nftnl_expr_immediate *i2 = nftnl_expr_data(e2); + bool eq = true; + + if (e1->flags & (1 << NFTNL_EXPR_IMM_DREG)) + eq &= (i1->dreg == i2->dreg); + if (e1->flags & (1 << NFTNL_EXPR_IMM_VERDICT)) + eq &= nftnl_data_reg_cmp(&i1->data, &i2->data, DATA_VERDICT); + else if (e1->flags & (1 << NFTNL_EXPR_IMM_DATA)) + eq &= nftnl_data_reg_cmp(&i1->data, &i2->data, DATA_VALUE); + + return eq; +} + struct expr_ops expr_ops_immediate = { .name = "immediate", .alloc_len = sizeof(struct nftnl_expr_immediate), .max_attr = NFTA_IMMEDIATE_MAX, .free = nftnl_expr_immediate_free, + .cmp = nftnl_expr_immediate_cmp, .set = nftnl_expr_immediate_set, .get = nftnl_expr_immediate_get, .parse = nftnl_expr_immediate_parse, -- cgit v1.2.3