From 760768890e60617acfd144dce875a4a3be14513c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 1 Sep 2015 20:19:56 +0200 Subject: src: rename existing functions to use the nftnl_ prefix So we can use the nft_* prefix anytime soon for our upcoming higher level library. After this patch, the nft_* symbols become an alias of the nftnl_* symbols. Signed-off-by: Pablo Neira Ayuso --- tests/nft-expr_bitwise-test.c | 78 +++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 39 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 0fe5329..25ad412 100644 --- a/tests/nft-expr_bitwise-test.c +++ b/tests/nft-expr_bitwise-test.c @@ -27,85 +27,85 @@ static void print_err(const char *msg) printf("\033[31mERROR:\e[0m %s\n", msg); } -static void cmp_nft_rule_expr(struct nft_rule_expr *rule_a, - struct nft_rule_expr *rule_b) +static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a, + struct nftnl_rule_expr *rule_b) { uint32_t maska, maskb; uint32_t xora, xorb; - if (nft_rule_expr_get_u32(rule_a, NFT_EXPR_BITWISE_DREG) != - nft_rule_expr_get_u32(rule_b, NFT_EXPR_BITWISE_DREG)) + if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != + nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) print_err("Expr BITWISE_DREG mismatches"); - if (nft_rule_expr_get_u32(rule_a, NFT_EXPR_BITWISE_SREG) != - nft_rule_expr_get_u32(rule_b, NFT_EXPR_BITWISE_SREG)) + if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_SREG) != + nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_SREG)) print_err("Expr BITWISE_SREG mismatches"); - if (nft_rule_expr_get_u16(rule_a, NFT_EXPR_BITWISE_LEN) != - nft_rule_expr_get_u16(rule_b, NFT_EXPR_BITWISE_LEN)) + if (nftnl_rule_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_LEN) != + nftnl_rule_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_LEN)) print_err("Expr BITWISE_DREG mismatches"); - nft_rule_expr_get(rule_a, NFT_EXPR_BITWISE_MASK, &maska); - nft_rule_expr_get(rule_b, NFT_EXPR_BITWISE_MASK, &maskb); + nftnl_rule_expr_get(rule_a, NFTNL_EXPR_BITWISE_MASK, &maska); + nftnl_rule_expr_get(rule_b, NFTNL_EXPR_BITWISE_MASK, &maskb); if (maska != maskb) print_err("Size of BITWISE_MASK mismatches"); - nft_rule_expr_get(rule_a, NFT_EXPR_BITWISE_XOR, &xora); - nft_rule_expr_get(rule_b, NFT_EXPR_BITWISE_XOR, &xorb); + nftnl_rule_expr_get(rule_a, NFTNL_EXPR_BITWISE_XOR, &xora); + nftnl_rule_expr_get(rule_b, NFTNL_EXPR_BITWISE_XOR, &xorb); if (xora != xorb) print_err("Size of BITWISE_XOR mismatches"); } int main(int argc, char *argv[]) { - struct nft_rule *a, *b = NULL; - struct nft_rule_expr *ex = NULL; + struct nftnl_rule *a, *b = NULL; + struct nftnl_rule_expr *ex = NULL; struct nlmsghdr *nlh; char buf[4096]; - struct nft_rule_expr_iter *iter_a, *iter_b = NULL; - struct nft_rule_expr *rule_a, *rule_b = NULL; + struct nftnl_rule_expr_iter *iter_a, *iter_b = NULL; + struct nftnl_rule_expr *rule_a, *rule_b = NULL; uint32_t mask = 0x01010101; uint32_t xor = 0x12345678; - a = nft_rule_alloc(); - b = nft_rule_alloc(); + a = nftnl_rule_alloc(); + b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nft_rule_expr_alloc("bitwise"); + ex = nftnl_rule_expr_alloc("bitwise"); if (ex == NULL) print_err("OOM"); - nft_rule_expr_set_u32(ex, NFT_EXPR_BITWISE_SREG, 0x12345678); - nft_rule_expr_set_u32(ex, NFT_EXPR_BITWISE_DREG, 0x12345678); - nft_rule_expr_set_u32(ex, NFT_EXPR_BITWISE_LEN, 0x12345678); - nft_rule_expr_set(ex, NFT_EXPR_BITWISE_MASK, &mask, sizeof(mask)); - nft_rule_expr_set(ex, NFT_EXPR_BITWISE_XOR, &xor, sizeof(xor)); + 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)); - nft_rule_add_expr(a, ex); + nftnl_rule_add_expr(a, ex); - nlh = nft_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); - nft_rule_nlmsg_build_payload(nlh, a); + nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); + nftnl_rule_nlmsg_build_payload(nlh, a); - if (nft_rule_nlmsg_parse(nlh, b) < 0) + if (nftnl_rule_nlmsg_parse(nlh, b) < 0) print_err("parsing problems"); - iter_a = nft_rule_expr_iter_create(a); - iter_b = nft_rule_expr_iter_create(b); + iter_a = nftnl_rule_expr_iter_create(a); + iter_b = nftnl_rule_expr_iter_create(b); if (iter_a == NULL || iter_b == NULL) print_err("OOM"); - rule_a = nft_rule_expr_iter_next(iter_a); - rule_b = nft_rule_expr_iter_next(iter_b); + rule_a = nftnl_rule_expr_iter_next(iter_a); + rule_b = nftnl_rule_expr_iter_next(iter_b); if (rule_a == NULL || rule_b == NULL) print_err("OOM"); - if (nft_rule_expr_iter_next(iter_a) != NULL || - nft_rule_expr_iter_next(iter_b) != NULL) + if (nftnl_rule_expr_iter_next(iter_a) != NULL || + nftnl_rule_expr_iter_next(iter_b) != NULL) print_err("More 1 expr."); - nft_rule_expr_iter_destroy(iter_a); - nft_rule_expr_iter_destroy(iter_b); + nftnl_rule_expr_iter_destroy(iter_a); + nftnl_rule_expr_iter_destroy(iter_b); - cmp_nft_rule_expr(rule_a,rule_b); + cmp_nftnl_rule_expr(rule_a,rule_b); - nft_rule_free(a); - nft_rule_free(b); + nftnl_rule_free(a); + nftnl_rule_free(b); if (!test_ok) exit(EXIT_FAILURE); -- cgit v1.2.3