[libnftnl,v2,8/9] tests: bitwise: refactor shift tests

Message ID	20220404120623.188439-9-jeremy@azazel.net
State	Changes Requested
Delegated to:	Pablo Neira
Headers	show Return-Path: <netfilter-devel-owner@vger.kernel.org> From: Jeremy Sowden <jeremy@azazel.net> To: Netfilter Devel <netfilter-devel@vger.kernel.org> Subject: [libnftnl PATCH v2 8/9] tests: bitwise: refactor shift tests Date: Mon, 4 Apr 2022 13:06:22 +0100 Message-Id: <20220404120623.188439-9-jeremy@azazel.net> In-Reply-To: <20220404120623.188439-1-jeremy@azazel.net> References: <20220404120623.188439-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	bitwise: support for boolean operations with variable RHS operands \| expand [libnftnl,v2,0/9] bitwise: support for boolean operations with variable RHS operands [libnftnl,v2,1/9] include: update nf_tables.h [libnftnl,v2,2/9] include: add new bitwise bit-length attribute to nf_tables.h [libnftnl,v2,3/9] expr: bitwise: pass bit-length to and from the kernel [libnftnl,v2,4/9] include: add new bitwise boolean attributes to nf_tables.h [libnftnl,v2,5/9] expr: bitwise: fix a couple of white-space mistakes [libnftnl,v2,6/9] expr: bitwise: rename some boolean operation functions [libnftnl,v2,7/9] expr: bitwise: add support for kernel space AND, OR and XOR operations [libnftnl,v2,8/9] tests: bitwise: refactor shift tests [libnftnl,v2,9/9] tests: bitwise: add tests for new boolean operations

diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c index 96298a4a97d2..5e7e277a5081 100644 --- a/tests/nft-expr_bitwise-test.c +++ b/tests/nft-expr_bitwise-test.c @@ -58,58 +58,6 @@ static void cmp_nftnl_expr_mask_xor(struct nftnl_expr *rule_a, print_err("mask & xor", "Size of BITWISE_XOR mismatches"); } -static void cmp_nftnl_expr_lshift(struct nftnl_expr *rule_a, - struct nftnl_expr *rule_b) -{ - uint32_t data_a, data_b; - - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) - print_err("lshift", "Expr BITWISE_DREG mismatches"); - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_SREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_SREG)) - print_err("lshift", "Expr BITWISE_SREG mismatches"); - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_OP) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_OP)) - print_err("lshift", "Expr BITWISE_OP mismatches"); - if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_LEN) != - nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_LEN)) - print_err("lshift", "Expr BITWISE_LEN mismatches"); - if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_NBITS) != - nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_NBITS)) - print_err("lshift", "Expr BITWISE_NBITS mismatches"); - nftnl_expr_get(rule_a, NFTNL_EXPR_BITWISE_DATA, &data_a); - nftnl_expr_get(rule_b, NFTNL_EXPR_BITWISE_DATA, &data_b); - if (data_a != data_b) - print_err("lshift", "Expr BITWISE_DATA mismatches"); -} - -static void cmp_nftnl_expr_rshift(struct nftnl_expr *rule_a, - struct nftnl_expr *rule_b) -{ - uint32_t data_a, data_b; - - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) - print_err("rshift", "Expr BITWISE_DREG mismatches"); - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_SREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_SREG)) - print_err("rshift", "Expr BITWISE_SREG mismatches"); - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_OP) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_OP)) - print_err("rshift", "Expr BITWISE_OP mismatches"); - if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_LEN) != - nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_LEN)) - print_err("rshift", "Expr BITWISE_LEN mismatches"); - if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_NBITS) != - nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_NBITS)) - print_err("rshift", "Expr BITWISE_NBITS mismatches"); - nftnl_expr_get(rule_a, NFTNL_EXPR_BITWISE_DATA, &data_a); - nftnl_expr_get(rule_b, NFTNL_EXPR_BITWISE_DATA, &data_b); - if (data_a != data_b) - print_err("rshift", "Expr BITWISE_DATA mismatches"); -} - static void test_mask_xor(void) { struct nftnl_rule *a, *b = NULL; @@ -168,26 +116,54 @@ static void test_mask_xor(void) nftnl_rule_free(b); } -static void test_lshift(void) +static void cmp_nftnl_expr_shift(const char *opname, + const struct nftnl_expr *rule_a, + const struct nftnl_expr *rule_b) { - struct nftnl_rule *a, *b = NULL; - struct nftnl_expr *ex = NULL; + uint32_t data_a, data_b; + + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) + print_err(opname, "Expr BITWISE_DREG mismatches"); + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_SREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_SREG)) + print_err(opname, "Expr BITWISE_SREG mismatches"); + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_OP) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_OP)) + print_err(opname, "Expr BITWISE_OP mismatches"); + if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_LEN) != + nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_LEN)) + print_err(opname, "Expr BITWISE_LEN mismatches"); + if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_NBITS) != + nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_NBITS)) + print_err(opname, "Expr BITWISE_NBITS mismatches"); + nftnl_expr_get(rule_a, NFTNL_EXPR_BITWISE_DATA, &data_a); + nftnl_expr_get(rule_b, NFTNL_EXPR_BITWISE_DATA, &data_b); + if (data_a != data_b) + print_err(opname, "Expr BITWISE_DATA mismatches"); +} + +static void test_shift(enum nft_bitwise_ops op) +{ + struct nftnl_rule *a, *b; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_expr_iter *iter_a, *iter_b = NULL; - struct nftnl_expr *rule_a, *rule_b = NULL; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; + const char *opname = op == NFT_BITWISE_LSHIFT ? "lshift" : "rshift"; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) - print_err("lshift", "OOM"); + print_err(opname, "OOM"); ex = nftnl_expr_alloc("bitwise"); if (ex == NULL) - print_err("lshift", "OOM"); + print_err(opname, "OOM"); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_SREG, 0x12345678); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DREG, 0x78123456); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_OP, NFT_BITWISE_LSHIFT); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_OP, op); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_LEN, 0x56781234); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_NBITS, 0x11223344); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DATA, 13); @@ -198,84 +174,39 @@ static void test_lshift(void) nftnl_rule_nlmsg_build_payload(nlh, a); if (nftnl_rule_nlmsg_parse(nlh, b) < 0) - print_err("lshift", "parsing problems"); + print_err(opname, "parsing problems"); iter_a = nftnl_expr_iter_create(a); iter_b = nftnl_expr_iter_create(b); if (iter_a == NULL || iter_b == NULL) - print_err("lshift", "OOM"); + print_err(opname, "OOM"); 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("lshift", "OOM"); + print_err(opname, "OOM"); if (nftnl_expr_iter_next(iter_a) != NULL || nftnl_expr_iter_next(iter_b) != NULL) - print_err("lshift", "More 1 expr."); + print_err(opname, "More 1 expr."); nftnl_expr_iter_destroy(iter_a); nftnl_expr_iter_destroy(iter_b); - cmp_nftnl_expr_lshift(rule_a,rule_b); + cmp_nftnl_expr_shift(opname, rule_a, rule_b); nftnl_rule_free(a); nftnl_rule_free(b); } -static void test_rshift(void) +static void test_lshift(void) { - struct nftnl_rule *a, *b = NULL; - struct nftnl_expr *ex = NULL; - struct nlmsghdr *nlh; - char buf[4096]; - struct nftnl_expr_iter *iter_a, *iter_b = NULL; - struct nftnl_expr *rule_a, *rule_b = NULL; - - a = nftnl_rule_alloc(); - b = nftnl_rule_alloc(); - if (a == NULL || b == NULL) - print_err("rshift", "OOM"); - ex = nftnl_expr_alloc("bitwise"); - if (ex == NULL) - print_err("rshift", "OOM"); - - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_SREG, 0x12345678); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DREG, 0x78123456); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_OP, NFT_BITWISE_RSHIFT); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_LEN, 0x56781234); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_NBITS, 0x11223344); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DATA, 17); - - nftnl_rule_add_expr(a, ex); - - nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); - nftnl_rule_nlmsg_build_payload(nlh, a); - - if (nftnl_rule_nlmsg_parse(nlh, b) < 0) - print_err("rshift", "parsing problems"); - - iter_a = nftnl_expr_iter_create(a); - iter_b = nftnl_expr_iter_create(b); - if (iter_a == NULL || iter_b == NULL) - print_err("rshift", "OOM"); - - 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("rshift", "OOM"); - - if (nftnl_expr_iter_next(iter_a) != NULL || - nftnl_expr_iter_next(iter_b) != NULL) - print_err("rshift", "More 1 expr."); - - nftnl_expr_iter_destroy(iter_a); - nftnl_expr_iter_destroy(iter_b); - - cmp_nftnl_expr_rshift(rule_a,rule_b); + test_shift(NFT_BITWISE_LSHIFT); +} - nftnl_rule_free(a); - nftnl_rule_free(b); +static void test_rshift(void) +{ + test_shift(NFT_BITWISE_RSHIFT); } int main(int argc, char *argv[])

[libnftnl,v2,8/9] tests: bitwise: refactor shift tests

Commit Message

Patch