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/match.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/expr/match.c') diff --git a/src/expr/match.c b/src/expr/match.c index 3342e2c..c48518e 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -240,11 +240,31 @@ static void nftnl_expr_match_free(const struct nftnl_expr *e) xfree(match->data); } +static bool nftnl_expr_match_cmp(const struct nftnl_expr *e1, + const struct nftnl_expr *e2) +{ + struct nftnl_expr_match *m1 = nftnl_expr_data(e1); + struct nftnl_expr_match *m2 = nftnl_expr_data(e2); + bool eq = true; + + if (e1->flags & (1 << NFTNL_EXPR_MT_NAME)) + eq &= !strcmp(m1->name, m2->name); + if (e1->flags & (1 << NFTNL_EXPR_MT_REV)) + eq &= (m1->rev == m2->rev); + if (e1->flags & (1 << NFTNL_EXPR_MT_INFO)) { + eq &= (m1->data_len == m2->data_len); + eq &= !memcmp(m1->data, m2->data, m1->data_len); + } + + return eq; +} + struct expr_ops expr_ops_match = { .name = "match", .alloc_len = sizeof(struct nftnl_expr_match), .max_attr = NFTA_MATCH_MAX, .free = nftnl_expr_match_free, + .cmp = nftnl_expr_match_cmp, .set = nftnl_expr_match_set, .get = nftnl_expr_match_get, .parse = nftnl_expr_match_parse, -- cgit v1.2.3