diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/nft-expr_bitwise-test.c | 60 | ||||
-rw-r--r-- | tests/nft-expr_byteorder-test.c | 60 | ||||
-rw-r--r-- | tests/nft-expr_cmp-test.c | 48 | ||||
-rw-r--r-- | tests/nft-expr_counter-test.c | 42 | ||||
-rw-r--r-- | tests/nft-expr_ct-test.c | 48 | ||||
-rw-r--r-- | tests/nft-expr_exthdr-test.c | 54 | ||||
-rw-r--r-- | tests/nft-expr_immediate-test.c | 54 | ||||
-rw-r--r-- | tests/nft-expr_limit-test.c | 42 | ||||
-rw-r--r-- | tests/nft-expr_log-test.c | 54 | ||||
-rw-r--r-- | tests/nft-expr_lookup-test.c | 48 | ||||
-rw-r--r-- | tests/nft-expr_masq-test.c | 36 | ||||
-rw-r--r-- | tests/nft-expr_match-test.c | 48 | ||||
-rw-r--r-- | tests/nft-expr_meta-test.c | 42 | ||||
-rw-r--r-- | tests/nft-expr_nat-test.c | 72 | ||||
-rw-r--r-- | tests/nft-expr_payload-test.c | 54 | ||||
-rw-r--r-- | tests/nft-expr_queue-test.c | 44 | ||||
-rw-r--r-- | tests/nft-expr_redir-test.c | 48 | ||||
-rw-r--r-- | tests/nft-expr_reject-test.c | 42 | ||||
-rw-r--r-- | tests/nft-expr_target-test.c | 48 |
19 files changed, 472 insertions, 472 deletions
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); diff --git a/tests/nft-expr_byteorder-test.c b/tests/nft-expr_byteorder-test.c index 5c09e13..5994e5b 100644 --- a/tests/nft-expr_byteorder-test.c +++ b/tests/nft-expr_byteorder-test.c @@ -27,48 +27,48 @@ 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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_DREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_DREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_DREG)) print_err("Expr NFTNL_EXPR_BYTEORDER_DREG mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_SREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_SREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_SREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_SREG)) print_err("Expr NFTNL_EXPR_BYTEORDER_SREG mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_OP) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_OP)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_OP) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_OP)) print_err("Expr NFTNL_EXPR_BYTEORDER_OP mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_LEN) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_LEN)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_LEN) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_LEN)) print_err("Expr NFTNL_EXPR_BYTEORDER_DREG mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_SIZE) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_SIZE)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BYTEORDER_SIZE) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BYTEORDER_SIZE)) print_err("Expr NFTNL_EXPR_BITWISE_SIZE mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("byteorder"); + ex = nftnl_expr_alloc("byteorder"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_SREG, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_DREG, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_OP, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_LEN, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_SIZE, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_SREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_DREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_OP, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_LEN, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BYTEORDER_SIZE, 0x12345678); nftnl_rule_add_expr(a, ex); @@ -78,24 +78,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"); - cmp_nftnl_rule_expr(rule_a,rule_b); + cmp_nftnl_expr(rule_a,rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_cmp-test.c b/tests/nft-expr_cmp-test.c index b9df3c6..23292c9 100644 --- a/tests/nft-expr_cmp-test.c +++ b/tests/nft-expr_cmp-test.c @@ -27,44 +27,44 @@ 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 data_lena, data_lenb; - nftnl_rule_expr_get(rule_a, NFTNL_EXPR_CMP_DATA, &data_lena); - nftnl_rule_expr_get(rule_b, NFTNL_EXPR_CMP_DATA, &data_lenb); + nftnl_expr_get(rule_a, NFTNL_EXPR_CMP_DATA, &data_lena); + nftnl_expr_get(rule_b, NFTNL_EXPR_CMP_DATA, &data_lenb); if (data_lena != data_lenb) print_err("Size of NFTNL_EXPR_CMP_DATA mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_CMP_SREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_CMP_SREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_CMP_SREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_CMP_SREG)) print_err("Expr NFTNL_EXPR_CMP_SREG mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_CMP_OP) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_CMP_OP)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_CMP_OP) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_CMP_OP)) print_err("Expr NFTNL_EXPR_CMP_OP mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; uint32_t data_len = 0x01010101; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("cmp"); + ex = nftnl_expr_alloc("cmp"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set(ex, NFTNL_EXPR_CMP_DATA, &data_len, sizeof(data_len)); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_CMP_SREG, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_CMP_OP, 0x12345678); + nftnl_expr_set(ex, NFTNL_EXPR_CMP_DATA, &data_len, sizeof(data_len)); + nftnl_expr_set_u32(ex, NFTNL_EXPR_CMP_SREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_CMP_OP, 0x12345678); nftnl_rule_add_expr(a, ex); @@ -74,23 +74,23 @@ 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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_counter-test.c b/tests/nft-expr_counter-test.c index 7c28f08..d515952 100644 --- a/tests/nft-expr_counter-test.c +++ b/tests/nft-expr_counter-test.c @@ -27,37 +27,37 @@ 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) { - if (nftnl_rule_expr_get_u64(rule_a, NFTNL_EXPR_CTR_BYTES) != - nftnl_rule_expr_get_u64(rule_b, NFTNL_EXPR_CTR_BYTES)) + if (nftnl_expr_get_u64(rule_a, NFTNL_EXPR_CTR_BYTES) != + nftnl_expr_get_u64(rule_b, NFTNL_EXPR_CTR_BYTES)) print_err("Expr NFTNL_EXPR_CTR_BYTES mismatches"); - if (nftnl_rule_expr_get_u64(rule_a, NFTNL_EXPR_CTR_PACKETS) != - nftnl_rule_expr_get_u64(rule_b, NFTNL_EXPR_CTR_PACKETS)) + if (nftnl_expr_get_u64(rule_a, NFTNL_EXPR_CTR_PACKETS) != + nftnl_expr_get_u64(rule_b, NFTNL_EXPR_CTR_PACKETS)) print_err("Expr NFTNL_EXPR_CTR_PACKETS mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("counter"); + ex = nftnl_expr_alloc("counter"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u64(ex, NFTNL_EXPR_CTR_BYTES, 0x123456789abcdef0); - nftnl_rule_expr_set_u64(ex, NFTNL_EXPR_CTR_PACKETS, 0x123456789abcdef0); + nftnl_expr_set_u64(ex, NFTNL_EXPR_CTR_BYTES, 0x123456789abcdef0); + nftnl_expr_set_u64(ex, NFTNL_EXPR_CTR_PACKETS, 0x123456789abcdef0); nftnl_rule_add_expr(a, ex); nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); @@ -66,23 +66,23 @@ 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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_ct-test.c b/tests/nft-expr_ct-test.c index d84fc5e..af69587 100644 --- a/tests/nft-expr_ct-test.c +++ b/tests/nft-expr_ct-test.c @@ -26,39 +26,39 @@ 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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_CT_KEY) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_CT_KEY)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_CT_KEY) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_CT_KEY)) print_err("Expr CT_KEY mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_CT_DIR) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_CT_DIR)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_CT_DIR) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_CT_DIR)) print_err("Expr CT_DIR mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_CT_DREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_CT_DREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_CT_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_CT_DREG)) print_err("Expr CT_DREG mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("ct"); + ex = nftnl_expr_alloc("ct"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_CT_KEY, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_CT_DIR, 0x12); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_CT_DREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_CT_KEY, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_CT_DIR, 0x12); + nftnl_expr_set_u32(ex, NFTNL_EXPR_CT_DREG, 0x12345678); nftnl_rule_add_expr(a, ex); @@ -68,24 +68,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_exthdr-test.c b/tests/nft-expr_exthdr-test.c index d68286d..622015c 100644 --- a/tests/nft-expr_exthdr-test.c +++ b/tests/nft-expr_exthdr-test.c @@ -27,44 +27,44 @@ 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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_EXTHDR_DREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_EXTHDR_DREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_EXTHDR_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_EXTHDR_DREG)) print_err("Expr NFTNL_EXPR_EXTHDR_DREG mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_EXTHDR_TYPE) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_EXTHDR_TYPE)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_EXTHDR_TYPE) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_EXTHDR_TYPE)) print_err("Expr NFTNL_EXPR_EXTHDR_TYPE mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_EXTHDR_OFFSET) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_EXTHDR_OFFSET)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_EXTHDR_OFFSET) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_EXTHDR_OFFSET)) print_err("Expr NFTNL_EXPR_EXTHDR_OFFSET mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_EXTHDR_LEN) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_EXTHDR_LEN)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_EXTHDR_LEN) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_EXTHDR_LEN)) print_err("Expr NFTNL_EXPR_EXTHDR_LEN mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("exthdr"); + ex = nftnl_expr_alloc("exthdr"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_DREG, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_TYPE, 0x12); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_OFFSET, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_LEN, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_DREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_TYPE, 0x12); + nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_OFFSET, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_LEN, 0x12345678); nftnl_rule_add_expr(a, ex); @@ -73,24 +73,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); if (!test_ok) diff --git a/tests/nft-expr_immediate-test.c b/tests/nft-expr_immediate-test.c index 08145bb..abde2e1 100644 --- a/tests/nft-expr_immediate-test.c +++ b/tests/nft-expr_immediate-test.c @@ -27,21 +27,21 @@ 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 data_a, data_b, chain_a, chain_b; - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_IMM_DREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_IMM_DREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_IMM_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_IMM_DREG)) print_err("Expr NFTNL_EXPR_IMM_DREG mismatches"); - nftnl_rule_expr_get(rule_a, NFTNL_EXPR_IMM_DATA, data_a); - nftnl_rule_expr_get(rule_b, NFTNL_EXPR_IMM_DATA, data_b) - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_IMM_VERDICT) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_IMM_VERDICT)) + nftnl_expr_get(rule_a, NFTNL_EXPR_IMM_DATA, data_a); + nftnl_expr_get(rule_b, NFTNL_EXPR_IMM_DATA, data_b) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_IMM_VERDICT) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_IMM_VERDICT)) print_err("Expr NFTNL_EXPR_IMM_VERDICT mismatches"); - nftnl_rule_expr_get(rule_a, NFTNL_EXPR_IMM_CHAIN, chain_a); - nftnl_rule_expr_get(rule_b, NFTNL_EXPR_IMM_CHAIN, chain_b); + nftnl_expr_get(rule_a, NFTNL_EXPR_IMM_CHAIN, chain_a); + nftnl_expr_get(rule_b, NFTNL_EXPR_IMM_CHAIN, chain_b); if (data_a != data_b) print_err("Expr NFTNL_EXPR_IMM_DATA. Size mismatches"); if (chain_a != chain_b) @@ -51,11 +51,11 @@ static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a, int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; uint32_t chain_t = 0x12345678; uint32_t data_t = 0x12345678; @@ -63,14 +63,14 @@ int main(int argc, char *argv[]) b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("immediate"); + ex = nftnl_expr_alloc("immediate"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_IMM_DREG, 0x1234568); - nftnl_rule_expr_set(ex, NFTNL_EXPR_IMM_DATA, &chain_t, sizeof(chain_t)); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_IMM_VERDICT, 0x12345678); - nftnl_rule_expr_set(ex, NFTNL_EXPR_IMM_CHAIN, &data_t, sizeof(data_t)); + nftnl_expr_set_u32(ex, NFTNL_EXPR_IMM_DREG, 0x1234568); + nftnl_expr_set(ex, NFTNL_EXPR_IMM_DATA, &chain_t, sizeof(chain_t)); + nftnl_expr_set_u32(ex, NFTNL_EXPR_IMM_VERDICT, 0x12345678); + nftnl_expr_set(ex, NFTNL_EXPR_IMM_CHAIN, &data_t, sizeof(data_t)); nftnl_rule_add_expr(a, ex); @@ -80,24 +80,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_limit-test.c b/tests/nft-expr_limit-test.c index a81c7ff..44882f9 100644 --- a/tests/nft-expr_limit-test.c +++ b/tests/nft-expr_limit-test.c @@ -28,36 +28,36 @@ 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) { - if (nftnl_rule_expr_get_u64(rule_a, NFTNL_EXPR_LIMIT_RATE) != - nftnl_rule_expr_get_u64(rule_b, NFTNL_EXPR_LIMIT_RATE)) + if (nftnl_expr_get_u64(rule_a, NFTNL_EXPR_LIMIT_RATE) != + nftnl_expr_get_u64(rule_b, NFTNL_EXPR_LIMIT_RATE)) print_err("Expr CTR_BYTES mismatches"); - if (nftnl_rule_expr_get_u64(rule_a, NFTNL_EXPR_LIMIT_UNIT) != - nftnl_rule_expr_get_u64(rule_b, NFTNL_EXPR_LIMIT_UNIT)) + if (nftnl_expr_get_u64(rule_a, NFTNL_EXPR_LIMIT_UNIT) != + nftnl_expr_get_u64(rule_b, NFTNL_EXPR_LIMIT_UNIT)) print_err("Expr CTR_PACKET mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("limit"); + ex = nftnl_expr_alloc("limit"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u64(ex, NFTNL_EXPR_LIMIT_RATE, 0x123456789abcdef0); - nftnl_rule_expr_set_u64(ex, NFTNL_EXPR_LIMIT_UNIT, 0x123456789abcdef0); + nftnl_expr_set_u64(ex, NFTNL_EXPR_LIMIT_RATE, 0x123456789abcdef0); + nftnl_expr_set_u64(ex, NFTNL_EXPR_LIMIT_UNIT, 0x123456789abcdef0); nftnl_rule_add_expr(a, ex); @@ -67,24 +67,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_log-test.c b/tests/nft-expr_log-test.c index d231d84..3815778 100644 --- a/tests/nft-expr_log-test.c +++ b/tests/nft-expr_log-test.c @@ -27,44 +27,44 @@ static void print_err(const char *msg) test_ok = 0; } -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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_LOG_SNAPLEN) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_LOG_SNAPLEN)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_LOG_SNAPLEN) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_LOG_SNAPLEN)) print_err("Expr NFTNL_EXPR_LOG_SNAPLEN mismatches"); - if (nftnl_rule_expr_get_u16(rule_a, NFTNL_EXPR_LOG_GROUP) != - nftnl_rule_expr_get_u16(rule_b, NFTNL_EXPR_LOG_GROUP)) + if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_LOG_GROUP) != + nftnl_expr_get_u16(rule_b, NFTNL_EXPR_LOG_GROUP)) print_err("Expr NFTNL_EXPR_LOG_GROUP mismatches"); - if (nftnl_rule_expr_get_u16(rule_a, NFTNL_EXPR_LOG_QTHRESHOLD) != - nftnl_rule_expr_get_u16(rule_b, NFTNL_EXPR_LOG_QTHRESHOLD)) + if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_LOG_QTHRESHOLD) != + nftnl_expr_get_u16(rule_b, NFTNL_EXPR_LOG_QTHRESHOLD)) print_err("Expr NFTNL_EXPR_LOG_QTHRESHOLD mismatches"); - if(strcmp(nftnl_rule_expr_get_str(rule_a, NFTNL_EXPR_LOG_PREFIX), - nftnl_rule_expr_get_str(rule_b, NFTNL_EXPR_LOG_PREFIX)) != 0) + if(strcmp(nftnl_expr_get_str(rule_a, NFTNL_EXPR_LOG_PREFIX), + nftnl_expr_get_str(rule_b, NFTNL_EXPR_LOG_PREFIX)) != 0) print_err("Expr NFTNL_EXPR_LOG_PREFIX mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("log"); + ex = nftnl_expr_alloc("log"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_LOG_SNAPLEN, 0x12345678); - nftnl_rule_expr_set_u16(ex, NFTNL_EXPR_LOG_GROUP, 0x1234); - nftnl_rule_expr_set_u16(ex, NFTNL_EXPR_LOG_QTHRESHOLD, 0x1234); - nftnl_rule_expr_set_str(ex, NFTNL_EXPR_LOG_PREFIX, "test"); + nftnl_expr_set_u32(ex, NFTNL_EXPR_LOG_SNAPLEN, 0x12345678); + nftnl_expr_set_u16(ex, NFTNL_EXPR_LOG_GROUP, 0x1234); + nftnl_expr_set_u16(ex, NFTNL_EXPR_LOG_QTHRESHOLD, 0x1234); + nftnl_expr_set_str(ex, NFTNL_EXPR_LOG_PREFIX, "test"); nftnl_rule_add_expr(a, ex); @@ -73,23 +73,23 @@ 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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_lookup-test.c b/tests/nft-expr_lookup-test.c index b9235a1..ad028e9 100644 --- a/tests/nft-expr_lookup-test.c +++ b/tests/nft-expr_lookup-test.c @@ -27,19 +27,19 @@ 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 data_lena, data_lenb; - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_LOOKUP_SREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_LOOPUP_SREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_LOOKUP_SREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_LOOPUP_SREG)) print_err("Expr NFTNL_EXPR_LOOkUP_SREG mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_LOOKUP_DREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_LOOPUP_DREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_LOOKUP_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_LOOPUP_DREG)) print_err("Expr NFTNL_EXPR_LOOkUP_DREG mismatches"); - nftnl_rule_expr_get(rule_a, NFTNL_EXPR_LOOKUP_SET, &data_lena); - nftnl_rule_expr_get(rule_b, NFTNL_EXPR_LOOKUP_SET, &data_lenb); + nftnl_expr_get(rule_a, NFTNL_EXPR_LOOKUP_SET, &data_lena); + nftnl_expr_get(rule_b, NFTNL_EXPR_LOOKUP_SET, &data_lenb); if (data_lena != data_lenb) print_err("Expr NFTNL_EXPR_LOOKUP_SET size mismatches"); } @@ -47,24 +47,24 @@ static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a, int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; uint32_t lookup_set = 0x12345678; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("lookup"); + ex = nftnl_expr_alloc("lookup"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_SREG, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_DREG, 0x12345678); - nftnl_rule_expr_set(ex, NFTNL_EXPR_LOOKUP_SET, &lookup_set, + nftnl_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_SREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_DREG, 0x12345678); + nftnl_expr_set(ex, NFTNL_EXPR_LOOKUP_SET, &lookup_set, sizeof(lookup_set)); nftnl_rule_add_expr(a, ex); @@ -75,23 +75,23 @@ 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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_masq-test.c b/tests/nft-expr_masq-test.c index 0ecdcc2..51d4dc7 100644 --- a/tests/nft-expr_masq-test.c +++ b/tests/nft-expr_masq-test.c @@ -25,32 +25,32 @@ 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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_MASQ_FLAGS) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_MASQ_FLAGS)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_MASQ_FLAGS) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_MASQ_FLAGS)) print_err("Expr NFTNL_EXPR_MASQ_FLAGS mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("nat"); + ex = nftnl_expr_alloc("nat"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_MASQ_FLAGS, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_MASQ_FLAGS, 0x1234568); nftnl_rule_add_expr(a, ex); @@ -60,24 +60,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_match-test.c b/tests/nft-expr_match-test.c index a3e046d..39a49d8 100644 --- a/tests/nft-expr_match-test.c +++ b/tests/nft-expr_match-test.c @@ -34,19 +34,19 @@ static void print_err2(const char *msg, uint32_t a, uint32_t b) printf("\033[31mERROR:\e[0m %s size a: %d b: %d \n", msg, a, b); } -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 lena, lenb; - if (strcmp(nftnl_rule_expr_get_str(rule_a, NFTNL_EXPR_MT_NAME), - nftnl_rule_expr_get_str(rule_b, NFTNL_EXPR_MT_NAME)) != 0) + if (strcmp(nftnl_expr_get_str(rule_a, NFTNL_EXPR_MT_NAME), + nftnl_expr_get_str(rule_b, NFTNL_EXPR_MT_NAME)) != 0) print_err("Expr NFTNL_EXPR_MT_NAME mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_MT_REV) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_MT_REV)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_MT_REV) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_MT_REV)) print_err("Expr NFTNL_EXPR_MT_REV mismatches"); - nftnl_rule_expr_get(rule_a, NFTNL_EXPR_MT_INFO, &lena); - nftnl_rule_expr_get(rule_b, NFTNL_EXPR_MT_INFO, &lenb); + nftnl_expr_get(rule_a, NFTNL_EXPR_MT_INFO, &lena); + nftnl_expr_get(rule_b, NFTNL_EXPR_MT_INFO, &lenb); if (lena != lenb) print_err2("Expr NFTNL_EXPR_MT_INFO size mismatches", lena, lenb); } @@ -54,24 +54,24 @@ static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a, int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; char data[16] = "0123456789abcdef"; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("match"); + ex = nftnl_expr_alloc("match"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_str(ex, NFTNL_EXPR_MT_NAME, "Tests"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_MT_REV, 0x12345678); - nftnl_rule_expr_set(ex, NFTNL_EXPR_MT_INFO, strdup(data), sizeof(data)); + nftnl_expr_set_str(ex, NFTNL_EXPR_MT_NAME, "Tests"); + nftnl_expr_set_u32(ex, NFTNL_EXPR_MT_REV, 0x12345678); + nftnl_expr_set(ex, NFTNL_EXPR_MT_INFO, strdup(data), sizeof(data)); nftnl_rule_add_expr(a, ex); nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); @@ -79,24 +79,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_meta-test.c b/tests/nft-expr_meta-test.c index 411837b..82f8fcf 100644 --- a/tests/nft-expr_meta-test.c +++ b/tests/nft-expr_meta-test.c @@ -27,36 +27,36 @@ 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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_META_KEY) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_META_KEY)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_META_KEY) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_META_KEY)) print_err("Expr NFTNL_EXPR_META_KEY mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_META_DREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_META_DREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_META_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_META_DREG)) print_err("Expr NFTNL_EXPR_META_DREG mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("meta"); + ex = nftnl_expr_alloc("meta"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_META_KEY, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_META_DREG, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_META_KEY, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_META_DREG, 0x12345678); nftnl_rule_add_expr(a, ex); @@ -65,24 +65,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_nat-test.c b/tests/nft-expr_nat-test.c index cef5d08..50b115c 100644 --- a/tests/nft-expr_nat-test.c +++ b/tests/nft-expr_nat-test.c @@ -28,56 +28,56 @@ 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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_NAT_TYPE) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_NAT_TYPE)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_NAT_TYPE) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_NAT_TYPE)) print_err("Expr NFTNL_EXPR_NAT_TYPE mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_NAT_FAMILY) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_NAT_FAMILY)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_NAT_FAMILY) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_NAT_FAMILY)) print_err("Expr NFTNL_EXPR_NAT_FAMILY mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_NAT_REG_ADDR_MIN) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_NAT_REG_ADDR_MIN)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_NAT_REG_ADDR_MIN) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_NAT_REG_ADDR_MIN)) print_err("Expr NFTNL_EXPR_NAT_REG_ADDR_MIN mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_NAT_REG_ADDR_MAX) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_NAT_REG_ADDR_MAX)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_NAT_REG_ADDR_MAX) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_NAT_REG_ADDR_MAX)) print_err("Expr NFTNL_EXPR_NAT_REG_ADDR_MAX mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_NAT_REG_PROTO_MIN) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_NAT_REG_PROTO_MIN)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_NAT_REG_PROTO_MIN) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_NAT_REG_PROTO_MIN)) print_err("Expr NFTNL_EXPR_NAT_REG_PROTO_MIN mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_NAT_REG_PROTO_MAX) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_NAT_REG_PROTO_MAX)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_NAT_REG_PROTO_MAX) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_NAT_REG_PROTO_MAX)) print_err("Expr NFTNL_EXPR_NAT_REG_PROTO_MAX mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_NAT_FLAGS) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_NAT_FLAGS)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_NAT_FLAGS) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_NAT_FLAGS)) print_err("Expr NFTNL_EXPR_NAT_FLAGS mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("nat"); + ex = nftnl_expr_alloc("nat"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_NAT_TYPE, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_NAT_FAMILY, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_NAT_REG_ADDR_MIN, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_NAT_REG_ADDR_MAX, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_NAT_REG_PROTO_MIN, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_NAT_REG_PROTO_MAX, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_NAT_FLAGS, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_NAT_TYPE, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_NAT_FAMILY, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_NAT_REG_ADDR_MIN, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_NAT_REG_ADDR_MAX, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_NAT_REG_PROTO_MIN, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_NAT_REG_PROTO_MAX, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_NAT_FLAGS, 0x1234568); nftnl_rule_add_expr(a, ex); @@ -87,24 +87,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_payload-test.c b/tests/nft-expr_payload-test.c index 4911191..c652195 100644 --- a/tests/nft-expr_payload-test.c +++ b/tests/nft-expr_payload-test.c @@ -28,44 +28,44 @@ 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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_PAYLOAD_DREG) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_PAYLOAD_DREG)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_PAYLOAD_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_PAYLOAD_DREG)) print_err("Expr NFTNL_EXPR_PAYLOAD_DREG mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_PAYLOAD_BASE) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_PAYLOAD_BASE)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_PAYLOAD_BASE) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_PAYLOAD_BASE)) print_err("Expr NFTNL_EXPR_PAYLOAD_BASE mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_PAYLOAD_OFFSET) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_PAYLOAD_OFFSET)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_PAYLOAD_OFFSET) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_PAYLOAD_OFFSET)) print_err("Expr NFTNL_EXPR_PAYLOAD_OFFSET mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_PAYLOAD_LEN) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_PAYLOAD_LEN)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_PAYLOAD_LEN) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_PAYLOAD_LEN)) print_err("Expr NFTNL_EXPR_PAYLOAD_LEN mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("payload"); + ex = nftnl_expr_alloc("payload"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_DREG, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_BASE, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_OFFSET, 0x12345678); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_LEN, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_DREG, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_BASE, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_OFFSET, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_LEN, 0x12345678); nftnl_rule_add_expr(a, ex); @@ -74,24 +74,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_queue-test.c b/tests/nft-expr_queue-test.c index a206146..654e13c 100644 --- a/tests/nft-expr_queue-test.c +++ b/tests/nft-expr_queue-test.c @@ -30,37 +30,37 @@ 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) { - if (nftnl_rule_expr_get_u16(rule_a, NFTNL_EXPR_QUEUE_NUM) != - nftnl_rule_expr_get_u16(rule_b, NFTNL_EXPR_QUEUE_NUM)) + if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_QUEUE_NUM) != + nftnl_expr_get_u16(rule_b, NFTNL_EXPR_QUEUE_NUM)) print_err("Expr NFTNL_EXPR_QUEUE_NUM mismatches"); - if (nftnl_rule_expr_get_u16(rule_a, NFTNL_EXPR_QUEUE_TOTAL) != - nftnl_rule_expr_get_u16(rule_b, NFTNL_EXPR_QUEUE_TOTAL)) + if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_QUEUE_TOTAL) != + nftnl_expr_get_u16(rule_b, NFTNL_EXPR_QUEUE_TOTAL)) print_err("Expr NFTNL_EXPR_QUEUE_TOTAL mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("queue"); + ex = nftnl_expr_alloc("queue"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u16(ex, NFTNL_EXPR_QUEUE_NUM, 0x123); - nftnl_rule_expr_set_u16(ex, NFTNL_EXPR_QUEUE_TOTAL, 0x2); - nftnl_rule_expr_set_u16(ex, NFTNL_EXPR_QUEUE_FLAGS, 0x2); + nftnl_expr_set_u16(ex, NFTNL_EXPR_QUEUE_NUM, 0x123); + nftnl_expr_set_u16(ex, NFTNL_EXPR_QUEUE_TOTAL, 0x2); + nftnl_expr_set_u16(ex, NFTNL_EXPR_QUEUE_FLAGS, 0x2); nftnl_rule_add_expr(a, ex); @@ -70,24 +70,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_redir-test.c b/tests/nft-expr_redir-test.c index a772c8f..978cac6 100644 --- a/tests/nft-expr_redir-test.c +++ b/tests/nft-expr_redir-test.c @@ -25,40 +25,40 @@ 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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_REDIR_REG_PROTO_MIN) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_REDIR_REG_PROTO_MIN)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_REDIR_REG_PROTO_MIN) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_REDIR_REG_PROTO_MIN)) print_err("Expr NFTNL_EXPR_REDIR_REG_PROTO_MIN mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_REDIR_REG_PROTO_MAX) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_REDIR_REG_PROTO_MAX)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_REDIR_REG_PROTO_MAX) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_REDIR_REG_PROTO_MAX)) print_err("Expr NFTNL_EXPR_REDIR_REG_PROTO_MAX mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_REDIR_FLAGS) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_REDIR_FLAGS)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_REDIR_FLAGS) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_REDIR_FLAGS)) print_err("Expr NFTNL_EXPR_REDIR_FLAGS mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("redir"); + ex = nftnl_expr_alloc("redir"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_REDIR_REG_PROTO_MIN, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_REDIR_REG_PROTO_MAX, 0x23456); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_REDIR_FLAGS, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_REDIR_REG_PROTO_MIN, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_REDIR_REG_PROTO_MAX, 0x23456); + nftnl_expr_set_u32(ex, NFTNL_EXPR_REDIR_FLAGS, 0x1234568); nftnl_rule_add_expr(a, ex); @@ -68,24 +68,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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 than 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_reject-test.c b/tests/nft-expr_reject-test.c index 657b32d..5fa4cda 100644 --- a/tests/nft-expr_reject-test.c +++ b/tests/nft-expr_reject-test.c @@ -28,36 +28,36 @@ 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) { - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_REJECT_TYPE) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_REJECT_TYPE)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_REJECT_TYPE) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_REJECT_TYPE)) print_err("Expr NFTNL_EXPR_REJECT_TYPE mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_REJECT_CODE) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_REJECT_CODE)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_REJECT_CODE) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_REJECT_CODE)) print_err("Expr NFTNL_EXPR_REJECT_CODE mismatches"); } int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("reject"); + ex = nftnl_expr_alloc("reject"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_REJECT_TYPE, 0x1234568); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_REJECT_CODE, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_REJECT_TYPE, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_REJECT_CODE, 0x1234568); nftnl_rule_add_expr(a, ex); @@ -67,24 +67,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c index 8b09357..634fc0a 100644 --- a/tests/nft-expr_target-test.c +++ b/tests/nft-expr_target-test.c @@ -33,19 +33,19 @@ static void print_err2(const char *msg, uint32_t a, uint32_t b) printf("\033[31mERROR:\e[0m %s size a: %d b: %d \n",msg, a, b); } -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 lena, lenb; - if (strcmp(nftnl_rule_expr_get_str(rule_a, NFTNL_EXPR_TG_NAME), - nftnl_rule_expr_get_str(rule_b, NFTNL_EXPR_TG_NAME)) != 0) + if (strcmp(nftnl_expr_get_str(rule_a, NFTNL_EXPR_TG_NAME), + nftnl_expr_get_str(rule_b, NFTNL_EXPR_TG_NAME)) != 0) print_err("Expr NFTNL_EXPR_TG_NAME mismatches"); - if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_TG_REV) != - nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_TG_REV)) + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_TG_REV) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_TG_REV)) print_err("Expr NFTNL_EXPR_TG_REV mismatches"); - nftnl_rule_expr_get(rule_a, NFTNL_EXPR_TG_INFO, &lena); - nftnl_rule_expr_get(rule_b, NFTNL_EXPR_TG_INFO, &lenb); + nftnl_expr_get(rule_a, NFTNL_EXPR_TG_INFO, &lena); + nftnl_expr_get(rule_b, NFTNL_EXPR_TG_INFO, &lenb); if (lena != lenb) print_err2("Expr NFTNL_EXPR_TG_INFO size mismatches", lena, lenb); } @@ -53,11 +53,11 @@ static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a, int main(int argc, char *argv[]) { struct nftnl_rule *a, *b; - struct nftnl_rule_expr *ex; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_rule_expr_iter *iter_a, *iter_b; - struct nftnl_rule_expr *rule_a, *rule_b; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; char data[16] = "0123456789abcdef"; a = nftnl_rule_alloc(); @@ -65,13 +65,13 @@ int main(int argc, char *argv[]) if (a == NULL || b == NULL) print_err("OOM"); - ex = nftnl_rule_expr_alloc("target"); + ex = nftnl_expr_alloc("target"); if (ex == NULL) print_err("OOM"); - nftnl_rule_expr_set(ex, NFTNL_EXPR_TG_NAME, "test", strlen("test")); - nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_TG_REV, 0x12345678); - nftnl_rule_expr_set(ex, NFTNL_EXPR_TG_INFO, strdup(data), sizeof(data)); + nftnl_expr_set(ex, NFTNL_EXPR_TG_NAME, "test", strlen("test")); + nftnl_expr_set_u32(ex, NFTNL_EXPR_TG_REV, 0x12345678); + nftnl_expr_set(ex, NFTNL_EXPR_TG_INFO, strdup(data), sizeof(data)); nftnl_rule_add_expr(a, ex); nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); @@ -80,24 +80,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"); - cmp_nftnl_rule_expr(rule_a, rule_b); + cmp_nftnl_expr(rule_a, rule_b); - 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); nftnl_rule_free(a); nftnl_rule_free(b); |