From c8cc25b987e761d6924b5517f10dd0686685942d Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 31 Mar 2020 20:49:54 +0200 Subject: Revert "bitwise: add support for passing mask and xor via registers." This reverts commit 75b8778e5bf630a3fc13e5d76bc64838135f02a9. Kernel support for this new feature might be reworked, keep this back. Signed-off-by: Pablo Neira Ayuso --- tests/nft-expr_bitwise-test.c | 70 +++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 46 deletions(-) (limited to 'tests') diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c index c1d5957..f134728 100644 --- a/tests/nft-expr_bitwise-test.c +++ b/tests/nft-expr_bitwise-test.c @@ -28,42 +28,31 @@ static void print_err(const char *test, const char *msg) } static void cmp_nftnl_expr_bool(struct nftnl_expr *rule_a, - struct nftnl_expr *rule_b, - bool data) + struct nftnl_expr *rule_b) { - const char *test_name = data ? "bool data" : "bool reg"; uint32_t maska, maskb; uint32_t xora, xorb; if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) - print_err(test_name, "Expr BITWISE_DREG mismatches"); + print_err("bool", "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(test_name, "Expr BITWISE_SREG mismatches"); + print_err("bool", "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(test_name, "Expr BITWISE_OP mismatches"); + print_err("bool", "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(test_name, "Expr BITWISE_LEN mismatches"); - if (data) { - 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(test_name, "Size of BITWISE_MASK mismatches"); - 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(test_name, "Size of BITWISE_XOR mismatches"); - } else { - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_MREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_MREG)) - print_err("bool reg", "Expr BITWISE_MREG mismatches"); - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_XREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_XREG)) - print_err("bool reg", "Expr BITWISE_XREG mismatches"); - } + print_err("bool", "Expr BITWISE_LEN mismatches"); + 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("bool", "Size of BITWISE_MASK mismatches"); + 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("bool", "Size of BITWISE_XOR mismatches"); } static void cmp_nftnl_expr_lshift(struct nftnl_expr *rule_a, @@ -112,9 +101,8 @@ static void cmp_nftnl_expr_rshift(struct nftnl_expr *rule_a, print_err("rshift", "Expr BITWISE_DATA mismatches"); } -static void test_bool(bool data) +static void test_bool(void) { - const char *test_name = data ? "bool data" : "bool reg"; struct nftnl_rule *a, *b = NULL; struct nftnl_expr *ex = NULL; struct nlmsghdr *nlh; @@ -127,23 +115,17 @@ static void test_bool(bool data) a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) - print_err(test_name, "OOM"); + print_err("bool", "OOM"); ex = nftnl_expr_alloc("bitwise"); if (ex == NULL) - print_err(test_name, "OOM"); + print_err("bool", "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_BOOL); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_LEN, 0x56781234); - if (data) { - nftnl_expr_set(ex, NFTNL_EXPR_BITWISE_MASK, &mask, - sizeof(mask)); - nftnl_expr_set(ex, NFTNL_EXPR_BITWISE_XOR, &xor, sizeof(xor)); - } else { - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_MREG, mask); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_XREG, xor); - } + 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); @@ -151,26 +133,26 @@ static void test_bool(bool data) nftnl_rule_nlmsg_build_payload(nlh, a); if (nftnl_rule_nlmsg_parse(nlh, b) < 0) - print_err(test_name, "parsing problems"); + print_err("bool", "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(test_name, "OOM"); + print_err("bool", "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(test_name, "OOM"); + print_err("bool", "OOM"); if (nftnl_expr_iter_next(iter_a) != NULL || nftnl_expr_iter_next(iter_b) != NULL) - print_err(test_name, "More 1 expr."); + print_err("bool", "More 1 expr."); nftnl_expr_iter_destroy(iter_a); nftnl_expr_iter_destroy(iter_b); - cmp_nftnl_expr_bool(rule_a, rule_b, data); + cmp_nftnl_expr_bool(rule_a,rule_b); nftnl_rule_free(a); nftnl_rule_free(b); @@ -286,11 +268,7 @@ static void test_rshift(void) int main(int argc, char *argv[]) { - test_bool(true); - if (!test_ok) - exit(EXIT_FAILURE); - - test_bool(false); + test_bool(); if (!test_ok) exit(EXIT_FAILURE); -- cgit v1.2.3