Skip to contentSkip to conversation

tests: tests for libnftables

PATCH Superseded Ana Rey 3 participants 3 messages Nov 10, 2013 netfilter

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Ana Rey

author
#0 lore raw

PATCH 1/1 tests: tests for libnftables

Makefile and tests files to check libnftable.

---
 tests/Makefile.am               |  82 ++++++++++++++++++++++++++++-
 tests/nft-chain-test.c          | 105 +++++++++++++++++++++++++++++++++++++
 tests/nft-expr_bitwise-test.c   | 104 +++++++++++++++++++++++++++++++++++++
 tests/nft-expr_byteorder-test.c |  92 +++++++++++++++++++++++++++++++++
 tests/nft-expr_cmp-test.c       |  87 +++++++++++++++++++++++++++++++
 tests/nft-expr_counter-test.c   |  79 ++++++++++++++++++++++++++++
 tests/nft-expr_ct-test.c        |  83 +++++++++++++++++++++++++++++
 tests/nft-expr_exthdr-test.c    |  87 +++++++++++++++++++++++++++++++
 tests/nft-expr_immediate-test.c |  98 +++++++++++++++++++++++++++++++++++
 tests/nft-expr_limit-test.c     |  81 +++++++++++++++++++++++++++++
 tests/nft-expr_log-test.c       |  87 +++++++++++++++++++++++++++++++
 tests/nft-expr_lookup-test.c    |  90 ++++++++++++++++++++++++++++++++
 tests/nft-expr_match-test.c     | 105 +++++++++++++++++++++++++++++++++++++
 tests/nft-expr_meta-test.c      |  79 ++++++++++++++++++++++++++++
 tests/nft-expr_nat-test.c       |  97 ++++++++++++++++++++++++++++++++++
 tests/nft-expr_payload-test.c   |  88 +++++++++++++++++++++++++++++++
 tests/nft-expr_reject-test.c    |  81 +++++++++++++++++++++++++++++
 tests/nft-expr_target-test.c    | 112 ++++++++++++++++++++++++++++++++++++++++
 tests/nft-rule-test.c           |  76 +++++++++++++++++++++++++++
 tests/nft-set-test.c            |  74 ++++++++++++++++++++++++++
 tests/nft-table-test.c          |  62 ++++++++++++++++++++++
 tests/test-script.sh            |  20 +++++++
 22 files changed, 1868 insertions(+), 1 deletion(-)
 create mode 100644 tests/nft-chain-test.c
 create mode 100644 tests/nft-expr_bitwise-test.c
 create mode 100644 tests/nft-expr_byteorder-test.c
 create mode 100644 tests/nft-expr_cmp-test.c
 create mode 100644 tests/nft-expr_counter-test.c
 create mode 100644 tests/nft-expr_ct-test.c
 create mode 100644 tests/nft-expr_exthdr-test.c
 create mode 100644 tests/nft-expr_immediate-test.c
 create mode 100644 tests/nft-expr_limit-test.c
 create mode 100644 tests/nft-expr_log-test.c
 create mode 100644 tests/nft-expr_lookup-test.c
 create mode 100644 tests/nft-expr_match-test.c
 create mode 100644 tests/nft-expr_meta-test.c
 create mode 100644 tests/nft-expr_nat-test.c
 create mode 100644 tests/nft-expr_payload-test.c
 create mode 100644 tests/nft-expr_reject-test.c
 create mode 100644 tests/nft-expr_target-test.c
 create mode 100644 tests/nft-rule-test.c
 create mode 100644 tests/nft-set-test.c
 create mode 100644 tests/nft-table-test.c
 create mode 100755 tests/test-script.sh
tests/Makefile.am +81 -1
index cfa4e8e..362eeac 100644
@@ -1,6 +1,86 @@
 include $(top_srcdir)/Make_global.am
 
-check_PROGRAMS = nft-parsing-test
+check_PROGRAMS = 	nft-parsing-test		\
+			nft-table-test			\
+			nft-chain-test			\
+			nft-rule-test			\
+			nft-set-test			\
+			nft-expr_bitwise-test		\
+			nft-expr_byteorder-test		\
+			nft-expr_counter-test		\
+			nft-expr_cmp-test		\
+			nft-expr_ct-test		\
+			nft-expr_exthdr-test		\
+			nft-expr_immediate-test		\
+			nft-expr_limit-test		\
+			nft-expr_lookup-test		\
+			nft-expr_log-test		\
+			nft-expr_match-test		\
+			nft-expr_meta-test		\
+			nft-expr_nat-test		\
+			nft-expr_payload-test		\
+			nft-expr_reject-test		\
+			nft-expr_target-test
 
 nft_parsing_test_SOURCES = nft-parsing-test.c
 nft_parsing_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS}
+
+nft_table_test_SOURCES = nft-table-test.c
+nft_table_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_chain_test_SOURCES = nft-chain-test.c
+nft_chain_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_rule_test_SOURCES = nft-rule-test.c
+nft_rule_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_set_test_SOURCES = nft-set-test.c
+nft_set_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_bitwise_test_SOURCES = nft-expr_bitwise-test.c
+nft_expr_bitwise_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_byteorder_test_SOURCES = nft-expr_byteorder-test.c
+nft_expr_byteorder_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_cmp_test_SOURCES = nft-expr_cmp-test.c
+nft_expr_cmp_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_counter_test_SOURCES = nft-expr_counter-test.c
+nft_expr_counter_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_exthdr_test_SOURCES = nft-expr_exthdr-test.c
+nft_expr_exthdr_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_ct_test_SOURCES = nft-expr_ct-test.c
+nft_expr_ct_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_immediate_test_SOURCES = nft-expr_counter-test.c
+nft_expr_immediate_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_limit_test_SOURCES = nft-expr_limit-test.c
+nft_expr_limit_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_lookup_test_SOURCES = nft-expr_limit-test.c
+nft_expr_lookup_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_log_test_SOURCES = nft-expr_log-test.c
+nft_expr_log_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_match_test_SOURCES = nft-expr_match-test.c
+nft_expr_match_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_meta_test_SOURCES = nft-expr_meta-test.c
+nft_expr_meta_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_nat_test_SOURCES = nft-expr_nat-test.c
+nft_expr_nat_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_payload_test_SOURCES = nft-expr_payload-test.c
+nft_expr_payload_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_reject_test_SOURCES = nft-expr_reject-test.c
+nft_expr_reject_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
+
+nft_expr_target_test_SOURCES = nft-expr_target-test.c
+nft_expr_target_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS}
tests/nft-chain-test.c new file +105 -0

105 lines not on this page · raw message

tests/nft-expr_bitwise-test.c new file +104 -0

104 lines not on this page · raw message

tests/nft-expr_byteorder-test.c new file +92 -0

92 lines not on this page · raw message

tests/nft-expr_cmp-test.c new file +87 -0

87 lines not on this page · raw message

tests/nft-expr_counter-test.c new file +79 -0

79 lines not on this page · raw message

tests/nft-expr_ct-test.c new file +83 -0

83 lines not on this page · raw message

tests/nft-expr_exthdr-test.c new file +87 -0

87 lines not on this page · raw message

tests/nft-expr_immediate-test.c new file +98 -0

98 lines not on this page · raw message

tests/nft-expr_limit-test.c new file +81 -0

81 lines not on this page · raw message

tests/nft-expr_log-test.c new file +87 -0

87 lines not on this page · raw message

tests/nft-expr_lookup-test.c new file +90 -0

90 lines not on this page · raw message

tests/nft-expr_match-test.c new file +105 -0

105 lines not on this page · raw message

tests/nft-expr_meta-test.c new file +79 -0

79 lines not on this page · raw message

tests/nft-expr_nat-test.c new file +97 -0

97 lines not on this page · raw message

tests/nft-expr_payload-test.c new file +88 -0

88 lines not on this page · raw message

tests/nft-expr_reject-test.c new file +81 -0

81 lines not on this page · raw message

tests/nft-expr_target-test.c new file +112 -0

112 lines not on this page · raw message

tests/nft-rule-test.c new file +76 -0

76 lines not on this page · raw message

tests/nft-set-test.c new file +74 -0

74 lines not on this page · raw message

tests/nft-table-test.c new file +62 -0

62 lines not on this page · raw message

tests/test-script.sh new file +20 -0
new file mode 100755
index 0000000..5c475d5
@@ -0,0 +1,20 @@
+./nft-chain-test
+./nft-expr_bitwise-test
+./nft-expr_byteorder-test
+./nft-expr_cmp-test
+./nft-expr_counter-test
+./nft-expr_ct-test
+./nft-expr_exthdr-test
+./nft-expr_immediate-test
+./nft-expr_limit-test
+./nft-expr_log-test
+./nft-expr_lookup-test
+./nft-expr_match-test
+./nft-expr_meta-test
+./nft-expr_nat-test
+./nft-expr_payload-test
+./nft-expr_target-test
+./nft-rule-test
+./nft-ruleset-test
+./nft-set-test
+./nft-table-test
Signature · 6 lines
1.8.4.rc3

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw

Review

Quoted 1 line · Ana Rey
(quoted diff) +1 -0
+		die("Expr BITWISE_DREG mismathes");

s/mismathes/mismatches/ - repeated numerous times in the series.

Phil

#2 lore raw
In reply to Ana Rey

On 10 November 2013 18:37, Ana Rey <[email protected]> wrote:

Hi Ana, What a nice work. Two small comments below.

Quoted 21 lines
tests/nft-table-test.c new file +15 -0
new file mode 100644
index 0000000..ae7e2ac
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netinet/in.h>
+
+#include <linux/netfilter/nf_tables.h>
+#include <libnftables/table.h>
+
+static void die(const char *msg)
+{
+       printf("\033[31mERROR:\e[0m %s\n", msg);
+       exit(EXIT_FAILURE);
+}
+
+static void cmp_nft_table(struct nft_table *a, struct nft_table *b)

tests/nft-table-test.c line 25

Quoted 10 lines
tests/nft-table-test.c new file +10 -0
+{
+       if (strcmp(nft_table_attr_get_str(a, NFT_TABLE_ATTR_NAME),
+                  nft_table_attr_get_str(b, NFT_TABLE_ATTR_NAME)) != 0)
+               die("table name mismatches");
+       if (nft_table_attr_get_u32(a, NFT_TABLE_ATTR_FLAGS) !=
+           nft_table_attr_get_u32(b, NFT_TABLE_ATTR_FLAGS))
+               die("table flags mismatches");
+               /*TODO nft_table_attr_get_u8
+                * nft_table_atrr_set
+                * ## NFT_TABLE_ATTR_FAMILY is uint8_t */

I think multiline comment format is:
/* xxx
* xxx
*/

Quoted 14 lines
tests/test-script.sh new file +8 -0
new file mode 100755
index 0000000..5c475d5
@@ -0,0 +1,20 @@
+./nft-chain-test
+./nft-expr_bitwise-test
+./nft-expr_byteorder-test
+./nft-expr_cmp-test
+./nft-expr_counter-test
+./nft-expr_ct-test
+./nft-expr_exthdr-test
+./nft-expr_immediate-test

tests/test-script.sh line 18

Quoted 10 lines
tests/test-script.sh new file +10 -0
+./nft-expr_limit-test
+./nft-expr_log-test
+./nft-expr_lookup-test
+./nft-expr_match-test
+./nft-expr_meta-test
+./nft-expr_nat-test
+./nft-expr_payload-test
+./nft-expr_target-test
+./nft-rule-test
+./nft-ruleset-test

I think the file 'nft-ruleset-test' is not included in this patch.

Also, new files doesn't seem to include a copyrigth notice. @pablo, I don't know if those tests files should have one in place.

Thanks for your work. Best regards.

Signature · 5 lines
Arturo Borrero González
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html