diff options
| -rw-r--r-- | include/libnftnl/expr.h | 2 | ||||
| -rw-r--r-- | src/expr/bitwise.c | 60 | ||||
| -rw-r--r-- | tests/nft-expr_bitwise-test.c | 70 |
3 files changed, 102 insertions, 30 deletions
diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h index cfe456d..edeeeb1 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -118,6 +118,8 @@ enum { NFTNL_EXPR_BITWISE_XOR, NFTNL_EXPR_BITWISE_OP, NFTNL_EXPR_BITWISE_DATA, + NFTNL_EXPR_BITWISE_MREG, + NFTNL_EXPR_BITWISE_XREG, }; enum { diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index 9ea2f66..1ad4f08 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -29,6 +29,8 @@ struct nftnl_expr_bitwise { union nftnl_data_reg mask; union nftnl_data_reg xor; union nftnl_data_reg data; + enum nft_registers mreg; + enum nft_registers xreg; }; static int @@ -51,10 +53,14 @@ nftnl_expr_bitwise_set(struct nftnl_expr *e, uint16_t type, memcpy(&bitwise->len, data, sizeof(bitwise->len)); break; case NFTNL_EXPR_BITWISE_MASK: + if (e->flags & (1 << NFTNL_EXPR_BITWISE_MREG)) + return -1; memcpy(&bitwise->mask.val, data, data_len); bitwise->mask.len = data_len; break; case NFTNL_EXPR_BITWISE_XOR: + if (e->flags & (1 << NFTNL_EXPR_BITWISE_XREG)) + return -1; memcpy(&bitwise->xor.val, data, data_len); bitwise->xor.len = data_len; break; @@ -62,6 +68,16 @@ nftnl_expr_bitwise_set(struct nftnl_expr *e, uint16_t type, memcpy(&bitwise->data.val, data, data_len); bitwise->data.len = data_len; break; + case NFTNL_EXPR_BITWISE_MREG: + if (e->flags & (1 << NFTNL_EXPR_BITWISE_MASK)) + return -1; + memcpy(&bitwise->mreg, data, sizeof(bitwise->mreg)); + break; + case NFTNL_EXPR_BITWISE_XREG: + if (e->flags & (1 << NFTNL_EXPR_BITWISE_XOR)) + return -1; + memcpy(&bitwise->xreg, data, sizeof(bitwise->xreg)); + break; default: return -1; } @@ -96,6 +112,12 @@ nftnl_expr_bitwise_get(const struct nftnl_expr *e, uint16_t type, case NFTNL_EXPR_BITWISE_DATA: *data_len = bitwise->data.len; return &bitwise->data.val; + case NFTNL_EXPR_BITWISE_MREG: + *data_len = sizeof(bitwise->mreg); + return &bitwise->mreg; + case NFTNL_EXPR_BITWISE_XREG: + *data_len = sizeof(bitwise->xreg); + return &bitwise->xreg; } return NULL; } @@ -113,6 +135,8 @@ static int nftnl_expr_bitwise_cb(const struct nlattr *attr, void *data) case NFTA_BITWISE_DREG: case NFTA_BITWISE_OP: case NFTA_BITWISE_LEN: + case NFTA_BITWISE_MREG: + case NFTA_BITWISE_XREG: if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) abi_breakage(); break; @@ -165,6 +189,10 @@ nftnl_expr_bitwise_build(struct nlmsghdr *nlh, const struct nftnl_expr *e) bitwise->data.val); mnl_attr_nest_end(nlh, nest); } + if (e->flags & (1 << NFTNL_EXPR_BITWISE_MREG)) + mnl_attr_put_u32(nlh, NFTA_BITWISE_MREG, htonl(bitwise->mreg)); + if (e->flags & (1 << NFTNL_EXPR_BITWISE_XREG)) + mnl_attr_put_u32(nlh, NFTA_BITWISE_XREG, htonl(bitwise->xreg)); } static int @@ -205,13 +233,22 @@ nftnl_expr_bitwise_parse(struct nftnl_expr *e, struct nlattr *attr) ret = nftnl_parse_data(&bitwise->data, tb[NFTA_BITWISE_DATA], NULL); e->flags |= (1 << NFTNL_EXPR_BITWISE_DATA); } + if (tb[NFTA_BITWISE_MREG]) { + bitwise->mreg = ntohl(mnl_attr_get_u32(tb[NFTA_BITWISE_MREG])); + e->flags |= (1 << NFTNL_EXPR_BITWISE_MREG); + } + if (tb[NFTA_BITWISE_XREG]) { + bitwise->xreg = ntohl(mnl_attr_get_u32(tb[NFTA_BITWISE_XREG])); + e->flags |= (1 << NFTNL_EXPR_BITWISE_XREG); + } return ret; } static int nftnl_expr_bitwise_snprintf_bool(char *buf, size_t size, - const struct nftnl_expr_bitwise *bitwise) + const struct nftnl_expr_bitwise *bitwise, + uint32_t flags) { int remain = size, offset = 0, ret; @@ -219,15 +256,25 @@ nftnl_expr_bitwise_snprintf_bool(char *buf, size_t size, bitwise->dreg, bitwise->sreg); SNPRINTF_BUFFER_SIZE(ret, remain, offset); - ret = nftnl_data_reg_snprintf(buf + offset, remain, &bitwise->mask, - NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE); + if (flags & (1 << NFTA_BITWISE_MASK)) + ret = nftnl_data_reg_snprintf(buf + offset, remain, + &bitwise->mask, + NFTNL_OUTPUT_DEFAULT, 0, + DATA_VALUE); + else + ret = snprintf(buf + offset, remain, "reg %u ", bitwise->mreg); SNPRINTF_BUFFER_SIZE(ret, remain, offset); ret = snprintf(buf + offset, remain, ") ^ "); SNPRINTF_BUFFER_SIZE(ret, remain, offset); - ret = nftnl_data_reg_snprintf(buf + offset, remain, &bitwise->xor, - NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE); + if (flags & (1 << NFTA_BITWISE_XOR)) + ret = nftnl_data_reg_snprintf(buf + offset, remain, + &bitwise->xor, + NFTNL_OUTPUT_DEFAULT, 0, + DATA_VALUE); + else + ret = snprintf(buf + offset, remain, "reg %u ", bitwise->xreg); SNPRINTF_BUFFER_SIZE(ret, remain, offset); return offset; @@ -260,7 +307,8 @@ static int nftnl_expr_bitwise_snprintf_default(char *buf, size_t size, switch (bitwise->op) { case NFT_BITWISE_BOOL: - err = nftnl_expr_bitwise_snprintf_bool(buf, size, bitwise); + err = nftnl_expr_bitwise_snprintf_bool(buf, size, bitwise, + e->flags); break; case NFT_BITWISE_LSHIFT: err = nftnl_expr_bitwise_snprintf_shift(buf, size, "<<", bitwise); diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c index f134728..c1d5957 100644 --- a/tests/nft-expr_bitwise-test.c +++ b/tests/nft-expr_bitwise-test.c @@ -28,31 +28,42 @@ 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) + struct nftnl_expr *rule_b, + bool data) { + 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("bool", "Expr BITWISE_DREG mismatches"); + print_err(test_name, "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("bool", "Expr BITWISE_SREG mismatches"); + print_err(test_name, "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("bool", "Expr BITWISE_OP mismatches"); + print_err(test_name, "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("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"); + 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"); + } } static void cmp_nftnl_expr_lshift(struct nftnl_expr *rule_a, @@ -101,8 +112,9 @@ static void cmp_nftnl_expr_rshift(struct nftnl_expr *rule_a, print_err("rshift", "Expr BITWISE_DATA mismatches"); } -static void test_bool(void) +static void test_bool(bool data) { + const char *test_name = data ? "bool data" : "bool reg"; struct nftnl_rule *a, *b = NULL; struct nftnl_expr *ex = NULL; struct nlmsghdr *nlh; @@ -115,17 +127,23 @@ static void test_bool(void) a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) - print_err("bool", "OOM"); + print_err(test_name, "OOM"); ex = nftnl_expr_alloc("bitwise"); if (ex == NULL) - print_err("bool", "OOM"); + print_err(test_name, "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); - nftnl_expr_set(ex, NFTNL_EXPR_BITWISE_MASK, &mask, sizeof(mask)); - nftnl_expr_set(ex, NFTNL_EXPR_BITWISE_XOR, &xor, sizeof(xor)); + 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_rule_add_expr(a, ex); @@ -133,26 +151,26 @@ static void test_bool(void) nftnl_rule_nlmsg_build_payload(nlh, a); if (nftnl_rule_nlmsg_parse(nlh, b) < 0) - print_err("bool", "parsing problems"); + print_err(test_name, "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("bool", "OOM"); + print_err(test_name, "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("bool", "OOM"); + print_err(test_name, "OOM"); if (nftnl_expr_iter_next(iter_a) != NULL || nftnl_expr_iter_next(iter_b) != NULL) - print_err("bool", "More 1 expr."); + print_err(test_name, "More 1 expr."); nftnl_expr_iter_destroy(iter_a); nftnl_expr_iter_destroy(iter_b); - cmp_nftnl_expr_bool(rule_a,rule_b); + cmp_nftnl_expr_bool(rule_a, rule_b, data); nftnl_rule_free(a); nftnl_rule_free(b); @@ -268,7 +286,11 @@ static void test_rshift(void) int main(int argc, char *argv[]) { - test_bool(); + test_bool(true); + if (!test_ok) + exit(EXIT_FAILURE); + + test_bool(false); if (!test_ok) exit(EXIT_FAILURE); |