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_bitwise-test.c | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'tests/nft-expr_bitwise-test.c') diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c index 25ad412..4b59751 100644 --- a/tests/nft-expr_bitwise-test.c +++ b/tests/nft-expr_bitwise-test.c @@ -27,27 +27,27 @@ 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 maska, maskb; uint32_t xora, xorb; - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) print_err("Expr BITWISE_DREG mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_SREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_SREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_SREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_SREG)) print_err("Expr BITWISE_SREG mismatches"); - if (nftnl_rule_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_LEN) != - nftnl_rule_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_LEN)) + if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_LEN) != + nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_LEN)) print_err("Expr BITWISE_DREG mismatches"); - nftnl_rule_expr_get(rule_a, NFTNL_EXPR_BITWISE_MASK, &maska); - nftnl_rule_expr_get(rule_b, NFTNL_EXPR_BITWISE_MASK, &maskb); + nftnl_expr_get(rule_a, NFTNL_EXPR_BITWISE_MASK, &maska); + nftnl_expr_get(rule_b, NFTNL_EXPR_BITWISE_MASK, &maskb); if (maska != maskb) print_err("Size of BITWISE_MASK mismatches"); - nftnl_rule_expr_get(rule_a, NFTNL_EXPR_BITWISE_XOR, &xora); - nftnl_rule_expr_get(rule_b, NFTNL_EXPR_BITWISE_XOR, &xorb); + nftnl_expr_get(rule_a, NFTNL_EXPR_BITWISE_XOR, &xora); + nftnl_expr_get(rule_b, NFTNL_EXPR_BITWISE_XOR, &xorb); if (xora != xorb) print_err("Size of BITWISE_XOR mismatches"); @@ -55,11 +55,11 @@ static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a, int main(int argc, char *argv[]) { struct nftnl_rule *a, *b = NULL; - struct nftnl_rule_expr *ex = NULL; + struct nftnl_expr *ex = NULL; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b = NULL; - struct nftnl_rule_expr *rule_a, *rule_b = NULL; + struct nftnl_expr_iter *iter_a, *iter_b = NULL; + struct nftnl_expr *rule_a, *rule_b = NULL; uint32_t mask = 0x01010101; uint32_t xor = 0x12345678; @@ -67,15 +67,15 @@ int main(int argc, char *argv[]) b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("bitwise"); + ex = nftnl_expr_alloc("bitwise"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_BITWISE_SREG, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DREG, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_BITWISE_LEN, 0x12345678); - nftnl_rule_expr_set(ex, NFTNL_EXPR_BITWISE_MASK, &mask, sizeof(mask)); - nftnl_rule_expr_set(ex, NFTNL_EXPR_BITWISE_XOR, &xor, sizeof(xor)); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_SREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_LEN, 0x12345678); + nftnl_expr_set(ex, NFTNL_EXPR_BITWISE_MASK, &mask, sizeof(mask)); + nftnl_expr_set(ex, NFTNL_EXPR_BITWISE_XOR, &xor, sizeof(xor)); nftnl_rule_add_expr(a, ex); @@ -85,24 +85,24 @@ 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"); - 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); - cmp_nftnl_rule_expr(rule_a,rule_b); + cmp_nftnl_expr(rule_a,rule_b); nftnl_rule_free(a); nftnl_rule_free(b); -- cgit v1.2.3