From 206d98a54305a1178c7d9c5e234699813f8c6f5a Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 7 Sep 2015 17:56:47 +0200 Subject: src: rename nftnl_rule_expr to nftnl_expr Use a shorter name for this, morever this can be used from sets so the _rule_ is misleading. Signed-off-by: Pablo Neira Ayuso --- tests/nft-expr_lookup-test.c | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'tests/nft-expr_lookup-test.c') diff --git a/tests/nft-expr_lookup-test.c b/tests/nft-expr_lookup-test.c index b9235a1..ad028e9 100644 --- a/tests/nft-expr_lookup-test.c +++ b/tests/nft-expr_lookup-test.c @@ -27,19 +27,19 @@ static void print_err(const char *msg) printf("\033[31mERROR:\e[0m %s\n", msg); } -static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a, - struct nftnl_rule_expr *rule_b) +static void cmp_nftnl_expr(struct nftnl_expr *rule_a, + struct nftnl_expr *rule_b) { uint32_t data_lena, data_lenb; - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_LOOKUP_SREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_LOOPUP_SREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_LOOKUP_SREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_LOOPUP_SREG)) print_err("Expr NFTNL_EXPR_LOOkUP_SREG mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_LOOKUP_DREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_LOOPUP_DREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_LOOKUP_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_LOOPUP_DREG)) print_err("Expr NFTNL_EXPR_LOOkUP_DREG mismatches"); - nftnl_rule_expr_get(rule_a, NFTNL_EXPR_LOOKUP_SET, &data_lena); - nftnl_rule_expr_get(rule_b, NFTNL_EXPR_LOOKUP_SET, &data_lenb); + nftnl_expr_get(rule_a, NFTNL_EXPR_LOOKUP_SET, &data_lena); + nftnl_expr_get(rule_b, NFTNL_EXPR_LOOKUP_SET, &data_lenb); if (data_lena != data_lenb) print_err("Expr NFTNL_EXPR_LOOKUP_SET size mismatches"); } @@ -47,24 +47,24 @@ static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a, int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; uint32_t lookup_set = 0x12345678; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("lookup"); + ex = nftnl_expr_alloc("lookup"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_SREG, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_DREG, 0x12345678); - nftnl_rule_expr_set(ex, NFTNL_EXPR_LOOKUP_SET, &lookup_set, + nftnl_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_SREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_DREG, 0x12345678); + nftnl_expr_set(ex, NFTNL_EXPR_LOOKUP_SET, &lookup_set, sizeof(lookup_set)); nftnl_rule_add_expr(a, ex); @@ -75,23 +75,23 @@ int main(int argc, char *argv[]) if (nftnl_rule_nlmsg_parse(nlh, b) < 0) print_err("parsing problems"); - iter_a = nftnl_rule_expr_iter_create(a); - iter_b = nftnl_rule_expr_iter_create(b); + iter_a = nftnl_expr_iter_create(a); + iter_b = nftnl_expr_iter_create(b); if (iter_a == NULL || iter_b == NULL) print_err("OOM"); - rule_a = nftnl_rule_expr_iter_next(iter_a); - rule_b = nftnl_rule_expr_iter_next(iter_b); + rule_a = nftnl_expr_iter_next(iter_a); + rule_b = nftnl_expr_iter_next(iter_b); if (rule_a == NULL || rule_b == NULL) print_err("OOM"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - if (nftnl_rule_expr_iter_next(iter_a) != NULL || - nftnl_rule_expr_iter_next(iter_b) != NULL) + if (nftnl_expr_iter_next(iter_a) != NULL || + nftnl_expr_iter_next(iter_b) != NULL) print_err("More 1 expr."); - nftnl_rule_expr_iter_destroy(iter_a); - nftnl_rule_expr_iter_destroy(iter_b); + nftnl_expr_iter_destroy(iter_a); + nftnl_expr_iter_destroy(iter_b); nftnl_rule_free(a); nftnl_rule_free(b); -- cgit v1.2.3