From 48a71a20420e307d0a1d8a89ac9fc7b46ec5a1ca Mon Sep 17 00:00:00 2001 From: Laura Garcia Liebana Date: Sat, 13 Aug 2016 01:02:03 +0200 Subject: expr: add hash expression Support for the nft hash expression in libnftnl. Signed-off-by: Laura Garcia Liebana Signed-off-by: Pablo Neira Ayuso --- tests/Makefile.am | 6 ++- tests/nft-expr_hash-test.c | 102 +++++++++++++++++++++++++++++++++++++++++++++ tests/test-script.sh | 1 + 3 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 tests/nft-expr_hash-test.c (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 0377081..86766f3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,7 +29,8 @@ check_PROGRAMS = nft-parsing-test \ nft-expr_queue-test \ nft-expr_redir-test \ nft-expr_reject-test \ - nft-expr_target-test + nft-expr_target-test \ + nft-expr_hash-test nft_parsing_test_SOURCES = nft-parsing-test.c nft_parsing_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS} @@ -108,3 +109,6 @@ nft_expr_redir_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_target_test_SOURCES = nft-expr_target-test.c nft_expr_target_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} + +nft_expr_hash_test_SOURCES = nft-expr_hash-test.c +nft_expr_hash_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} diff --git a/tests/nft-expr_hash-test.c b/tests/nft-expr_hash-test.c new file mode 100644 index 0000000..699197c --- /dev/null +++ b/tests/nft-expr_hash-test.c @@ -0,0 +1,102 @@ +/* + * (C) 2016 by Laura Garcia + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +static int test_ok = 1; + +static void print_err(const char *msg) +{ + test_ok = 0; + printf("\033[31mERROR:\e[0m %s\n", msg); +} + +static void cmp_nftnl_expr(struct nftnl_expr *rule_a, + struct nftnl_expr *rule_b) +{ + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_HASH_SREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_HASH_SREG)) + print_err("Expr NFTNL_EXPR_HASH_SREG mismatches"); + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_HASH_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_HASH_DREG)) + print_err("Expr NFTNL_EXPR_HASH_DREG mismatches"); + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_HASH_MODULUS) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_HASH_MODULUS)) + print_err("Expr NFTNL_EXPR_HASH_MODULUS mismatches"); + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_HASH_SEED) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_HASH_SEED)) + print_err("Expr NFTNL_EXPR_HASH_SEED mismatches"); +} + +int main(int argc, char *argv[]) +{ + struct nftnl_rule *a, *b; + struct nftnl_expr *ex; + struct nlmsghdr *nlh; + char buf[4096]; + 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_expr_alloc("hash"); + if (ex == NULL) + print_err("OOM"); + + nftnl_expr_set_u32(ex, NFTNL_EXPR_HASH_SREG, 0x1234568); + nftnl_expr_set_u32(ex, NFTNL_EXPR_HASH_DREG, 0x78123456); + nftnl_expr_set_u32(ex, NFTNL_EXPR_HASH_MODULUS, 0x78123456); + nftnl_expr_set_u32(ex, NFTNL_EXPR_HASH_SEED, 0x78123456); + + 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("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("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("OOM"); + + cmp_nftnl_expr(rule_a, rule_b); + + if (nftnl_expr_iter_next(iter_a) != NULL || + nftnl_expr_iter_next(iter_b) != NULL) + print_err("More 1 expr."); + + nftnl_expr_iter_destroy(iter_a); + nftnl_expr_iter_destroy(iter_b); + nftnl_rule_free(a); + nftnl_rule_free(b); + + if (!test_ok) + exit(EXIT_FAILURE); + + printf("%s: \033[32mOK\e[0m\n", argv[0]); + return EXIT_SUCCESS; +} diff --git a/tests/test-script.sh b/tests/test-script.sh index ba13571..48f002f 100755 --- a/tests/test-script.sh +++ b/tests/test-script.sh @@ -20,6 +20,7 @@ ./nft-expr_payload-test ./nft-expr_reject-test ./nft-expr_target-test +./nft-expr_hash-test ./nft-rule-test ./nft-set-test ./nft-table-test -- cgit v1.2.3