From patchwork Tue Jun 18 20:58:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arturo Borrero X-Patchwork-Id: 252445 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8CB392C02F5 for ; Wed, 19 Jun 2013 06:59:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756282Ab3FRU7D (ORCPT ); Tue, 18 Jun 2013 16:59:03 -0400 Received: from smtp3.cica.es ([150.214.5.190]:39255 "EHLO smtp.cica.es" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754497Ab3FRU7B (ORCPT ); Tue, 18 Jun 2013 16:59:01 -0400 Received: from localhost (unknown [127.0.0.1]) by smtp.cica.es (Postfix) with ESMTP id A015251ED7C; Tue, 18 Jun 2013 20:58:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at cica.es Received: from smtp.cica.es ([127.0.0.1]) by localhost (mail.cica.es [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vokJGF-+JWD2; Tue, 18 Jun 2013 22:58:58 +0200 (CEST) Received: from nfdev.cica.es (nfdev.cica.es [IPv6:2a00:9ac0:c1ca:31::220]) by smtp.cica.es (Postfix) with ESMTP id 58DF951ED73; Tue, 18 Jun 2013 22:58:58 +0200 (CEST) Subject: [libnftables PATCH] test: add testbench for XML To: netfilter-devel@vger.kernel.org From: Arturo Borrero Gonzalez Cc: pablo@netfilter.org Date: Tue, 18 Jun 2013 22:58:57 +0200 Message-ID: <20130618205857.1600.52812.stgit@nfdev.cica.es> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch add a testbench for XML parsing, which may be extended to also test JSON. To use it: $ cd test/ $ make nft-parsing-test $ ./nft-parsing-test xmlfiles/ Signed-off-by: Arturo Borrero Gonzalez --- test/Makefile.am | 6 ++ test/nft-parsing-test.c | 125 ++++++++++++++++++++++++++++++++++++++ test/xmlfiles/chain1.xml | 11 +++ test/xmlfiles/chain2.xml | 11 +++ test/xmlfiles/chain3.xml | 11 +++ test/xmlfiles/rule_bitwise.xml | 25 ++++++++ test/xmlfiles/rule_byteorder.xml | 13 ++++ test/xmlfiles/rule_cmp.xml | 16 +++++ test/xmlfiles/rule_counter.xml | 10 +++ test/xmlfiles/rule_ct.xml | 11 +++ test/xmlfiles/rule_exthdr.xml | 12 ++++ test/xmlfiles/rule_immediate.xml | 31 +++++++++ test/xmlfiles/rule_limit.xml | 10 +++ test/xmlfiles/rule_log.xml | 12 ++++ test/xmlfiles/rule_lookup.xml | 11 +++ test/xmlfiles/rule_match.xml | 10 +++ test/xmlfiles/rule_meta.xml | 10 +++ test/xmlfiles/rule_nat.xml | 22 +++++++ test/xmlfiles/rule_payload.xml | 12 ++++ test/xmlfiles/rule_target.xml | 10 +++ test/xmlfiles/table1.xml | 6 ++ test/xmlfiles/table2.xml | 6 ++ 22 files changed, 391 insertions(+) create mode 100644 test/Makefile.am create mode 100644 test/nft-parsing-test.c create mode 100644 test/xmlfiles/chain1.xml create mode 100644 test/xmlfiles/chain2.xml create mode 100644 test/xmlfiles/chain3.xml create mode 100644 test/xmlfiles/rule_bitwise.xml create mode 100644 test/xmlfiles/rule_byteorder.xml create mode 100644 test/xmlfiles/rule_cmp.xml create mode 100644 test/xmlfiles/rule_counter.xml create mode 100644 test/xmlfiles/rule_ct.xml create mode 100644 test/xmlfiles/rule_exthdr.xml create mode 100644 test/xmlfiles/rule_immediate.xml create mode 100644 test/xmlfiles/rule_limit.xml create mode 100644 test/xmlfiles/rule_log.xml create mode 100644 test/xmlfiles/rule_lookup.xml create mode 100644 test/xmlfiles/rule_match.xml create mode 100644 test/xmlfiles/rule_meta.xml create mode 100644 test/xmlfiles/rule_nat.xml create mode 100644 test/xmlfiles/rule_payload.xml create mode 100644 test/xmlfiles/rule_target.xml create mode 100644 test/xmlfiles/table1.xml create mode 100644 test/xmlfiles/table2.xml -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Makefile.am b/Makefile.am index 6999f51..e035ea1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,8 @@ include $(top_srcdir)/Make_global.am ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src include examples -DIST_SUBDIRS = src include examples +SUBDIRS = src include examples test +DIST_SUBDIRS = src include examples test pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnftables.pc diff --git a/configure.ac b/configure.ac index 0eec5bd..eaf3bb8 100644 --- a/configure.ac +++ b/configure.ac @@ -38,5 +38,5 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wformat=2 -pipe" AC_SUBST([regular_CPPFLAGS]) AC_SUBST([regular_CFLAGS]) -AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libnftables/Makefile include/linux/Makefile include/linux/netfilter/Makefile examples/Makefile libnftables.pc doxygen.cfg]) +AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libnftables/Makefile include/linux/Makefile include/linux/netfilter/Makefile examples/Makefile test/Makefile libnftables.pc doxygen.cfg]) AC_OUTPUT diff --git a/examples/chain.xml b/examples/chain.xml deleted file mode 100644 index 01ccb85..0000000 --- a/examples/chain.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - filter - filter
- 1 - 0 - 4 - 1 - 10 - - diff --git a/examples/rule.xml b/examples/rule.xml deleted file mode 100644 index b1de25a..0000000 --- a/examples/rule.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - 0 - 127 - 0 - 0 - - 1 - 4 - - - 1 - eq - - - 1 - 0x04000000 - - - - - 1 - 1 - 12 - 4 - - - 1 - eq - - - 1 - 0x96d60496 - - - - - 1 - 1 - 16 - 4 - - - 1 - eq - - - 1 - 0x96d60329 - - - - - 1 - 1 - 9 - 1 - - - 1 - eq - - - 1 - 0x06000000 - - - - - state - 0 - - - - - 123123 - 321321 - - - LOG - 0 - - - - diff --git a/examples/table.xml b/examples/table.xml deleted file mode 100644 index a397d52..0000000 --- a/examples/table.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 2 - 0 - -
diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 0000000..6941c3c --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,6 @@ +include $(top_srcdir)/Make_global.am + +check_PROGRAMS = nft-parsing-test + +nft_parsing_test_SOURCES = nft-parsing-test.c +nft_parsing_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} ${LIBXML_LIBS} diff --git a/test/nft-parsing-test.c b/test/nft-parsing-test.c new file mode 100644 index 0000000..dc0ab85 --- /dev/null +++ b/test/nft-parsing-test.c @@ -0,0 +1,125 @@ +#include +#include +#include +#include + +#include + +#include /*nlmsghdr*/ +#include +#include +#include + +static int test_xml(const char *filename) +{ + int ret = -1; + struct nft_table *t = NULL; + struct nft_chain *c = NULL; + struct nft_rule *r = NULL; + FILE *fp; + mxml_node_t *tree = NULL;; + char *xml = NULL; + + fp = fopen(filename, "r"); + tree = mxmlLoadFile(NULL, fp, MXML_NO_CALLBACK); + fclose(fp); + + xml = mxmlSaveAllocString(tree, MXML_NO_CALLBACK); + if (xml == NULL) + return -1; + + if (tree == NULL) + return -1; + + /* Check what parsing should be done */ + if (strcmp(tree->value.opaque, "table") == 0) { + t = nft_table_alloc(); + if (t != NULL) { + if (nft_table_parse(t, NFT_TABLE_PARSE_XML, xml) == 0) + ret = 0; + + nft_table_free(t); + } + } else if (strcmp(tree->value.opaque, "chain") == 0) { + c = nft_chain_alloc(); + if (c != NULL) { + if (nft_chain_parse(c, NFT_CHAIN_PARSE_XML, xml) == 0) + ret = 0; + + nft_chain_free(c); + } + } else if (strcmp(tree->value.opaque, "rule") == 0) { + r = nft_rule_alloc(); + if (r != NULL) { + if (nft_rule_parse(r, NFT_RULE_PARSE_XML, xml) == 0) + ret = 0; + + nft_rule_free(r); + } + } + + return ret; +} + +static int test_json(const char *filename) +{ + /* XXX parse file JSON file, in case of failure return -1 */ + return -1; +} + +int main(int argc, char *argv[]) +{ + DIR *d; + struct dirent *dent; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(EXIT_FAILURE); + } + + d = opendir(argv[1]); + if (d == NULL) { + perror("opendir"); + exit(EXIT_FAILURE); + } + + char *path = malloc(sizeof(argv[1])); + char *filewpath = malloc(sizeof(path)+4096); + strcpy(path, argv[1]); + + if (path[strlen(path)-1] != '/') + strcat(path, "/"); + + + while ((dent = readdir(d)) != NULL) { + int len = strlen(dent->d_name); + + if (strcmp(dent->d_name, ".") == 0 || + strcmp(dent->d_name, "..") == 0) + continue; + + strcpy(filewpath, path); + strcat(filewpath, dent->d_name); + + if (strcmp(&dent->d_name[len-5], ".json") == 0) { + printf("parsing json file %s ..\t", filewpath); + if (test_json(filewpath) < 0) + printf("FAILED\n"); + else + printf("OK\n"); + } + + if (strcmp(&dent->d_name[len-4], ".xml") == 0) { + printf("parsing xml file %s ..\t", filewpath); + if (test_xml(filewpath) < 0) + printf("FAILED\n"); + else + printf("OK\n"); + } + } + + free(path); + free(filewpath); + closedir(d); + return 0; +} diff --git a/test/xmlfiles/chain1.xml b/test/xmlfiles/chain1.xml new file mode 100644 index 0000000..7b23904 --- /dev/null +++ b/test/xmlfiles/chain1.xml @@ -0,0 +1,11 @@ + + + filter + filter
+ 0 + 0 + 0 + 0 + 2 + + diff --git a/test/xmlfiles/chain2.xml b/test/xmlfiles/chain2.xml new file mode 100644 index 0000000..01ccb85 --- /dev/null +++ b/test/xmlfiles/chain2.xml @@ -0,0 +1,11 @@ + + + filter + filter
+ 1 + 0 + 4 + 1 + 10 + + diff --git a/test/xmlfiles/chain3.xml b/test/xmlfiles/chain3.xml new file mode 100644 index 0000000..31e7142 --- /dev/null +++ b/test/xmlfiles/chain3.xml @@ -0,0 +1,11 @@ + + + foo + nat
+ 123 + 321 + 123 + 123 + 123 + + diff --git a/test/xmlfiles/rule_bitwise.xml b/test/xmlfiles/rule_bitwise.xml new file mode 100644 index 0000000..0501c6c --- /dev/null +++ b/test/xmlfiles/rule_bitwise.xml @@ -0,0 +1,25 @@ + + 0 + 127 + 0 + 0 + + 1 + 12 + + + 1 + 0x04000000 + + + + + 4 + 0xfaceb00c + 0xc1cac1ca + 0xcafecafe + 0xdeadbeef + + + + diff --git a/test/xmlfiles/rule_byteorder.xml b/test/xmlfiles/rule_byteorder.xml new file mode 100644 index 0000000..3b5d64d --- /dev/null +++ b/test/xmlfiles/rule_byteorder.xml @@ -0,0 +1,13 @@ + + 123 + 123 + 123 + 123 + + 123 + 321 + 111 + 15 + 15 + + diff --git a/test/xmlfiles/rule_cmp.xml b/test/xmlfiles/rule_cmp.xml new file mode 100644 index 0000000..582b127 --- /dev/null +++ b/test/xmlfiles/rule_cmp.xml @@ -0,0 +1,16 @@ + + 0 + 127 + 0 + 0 + + 1 + eq + + + 1 + 0x04000000 + + + + diff --git a/test/xmlfiles/rule_counter.xml b/test/xmlfiles/rule_counter.xml new file mode 100644 index 0000000..bb71013 --- /dev/null +++ b/test/xmlfiles/rule_counter.xml @@ -0,0 +1,10 @@ + + 0 + 127 + 0 + 0 + + 123123 + 321321 + + diff --git a/test/xmlfiles/rule_ct.xml b/test/xmlfiles/rule_ct.xml new file mode 100644 index 0000000..c993ae5 --- /dev/null +++ b/test/xmlfiles/rule_ct.xml @@ -0,0 +1,11 @@ + + 0 + 127 + 0 + 0 + + 1555555 + 15 + 15 + + diff --git a/test/xmlfiles/rule_exthdr.xml b/test/xmlfiles/rule_exthdr.xml new file mode 100644 index 0000000..0abeb3c --- /dev/null +++ b/test/xmlfiles/rule_exthdr.xml @@ -0,0 +1,12 @@ + + 0 + 127 + 0 + 0 + + 123 + 15 + 123 + 321 + + diff --git a/test/xmlfiles/rule_immediate.xml b/test/xmlfiles/rule_immediate.xml new file mode 100644 index 0000000..a566ca5 --- /dev/null +++ b/test/xmlfiles/rule_immediate.xml @@ -0,0 +1,31 @@ + + 0 + 127 + 0 + 0 + + 1 + + + 1 + 0xaabbccdd + + + + + 2 + + + 1 + + + + + 3 + + + testchain + + + + diff --git a/test/xmlfiles/rule_limit.xml b/test/xmlfiles/rule_limit.xml new file mode 100644 index 0000000..926aa0e --- /dev/null +++ b/test/xmlfiles/rule_limit.xml @@ -0,0 +1,10 @@ + + 0 + 127 + 0 + 0 + + 123123 + 321321 + + diff --git a/test/xmlfiles/rule_log.xml b/test/xmlfiles/rule_log.xml new file mode 100644 index 0000000..5471fee --- /dev/null +++ b/test/xmlfiles/rule_log.xml @@ -0,0 +1,12 @@ + + 0 + 127 + 0 + 0 + + 123123121 + 4000000 + 1222222 + prefixtest + + diff --git a/test/xmlfiles/rule_lookup.xml b/test/xmlfiles/rule_lookup.xml new file mode 100644 index 0000000..ee47068 --- /dev/null +++ b/test/xmlfiles/rule_lookup.xml @@ -0,0 +1,11 @@ + + 0 + 127 + 0 + 0 + + 123 + 123 + set_name_test + + diff --git a/test/xmlfiles/rule_match.xml b/test/xmlfiles/rule_match.xml new file mode 100644 index 0000000..fdc28f5 --- /dev/null +++ b/test/xmlfiles/rule_match.xml @@ -0,0 +1,10 @@ + + 0 + 127 + 0 + 0 + + state + 0 + + diff --git a/test/xmlfiles/rule_meta.xml b/test/xmlfiles/rule_meta.xml new file mode 100644 index 0000000..3c14bad --- /dev/null +++ b/test/xmlfiles/rule_meta.xml @@ -0,0 +1,10 @@ + + 0 + 127 + 0 + 0 + + 1 + 4 + + diff --git a/test/xmlfiles/rule_nat.xml b/test/xmlfiles/rule_nat.xml new file mode 100644 index 0000000..868be50 --- /dev/null +++ b/test/xmlfiles/rule_nat.xml @@ -0,0 +1,22 @@ + + 0 + 127 + 0 + 0 + + 1 + 1 + 1 + 1 + AF_INET6 + NFT_NAT_DNAT + + + 1 + 1 + 1 + 1 + AF_INET + NFT_NAT_SNAT + + diff --git a/test/xmlfiles/rule_payload.xml b/test/xmlfiles/rule_payload.xml new file mode 100644 index 0000000..bbbc84f --- /dev/null +++ b/test/xmlfiles/rule_payload.xml @@ -0,0 +1,12 @@ + + 0 + 127 + 0 + 0 + + 1 + 1 + 12 + 4 + + diff --git a/test/xmlfiles/rule_target.xml b/test/xmlfiles/rule_target.xml new file mode 100644 index 0000000..a41d794 --- /dev/null +++ b/test/xmlfiles/rule_target.xml @@ -0,0 +1,10 @@ + + 0 + 127 + 0 + 0 + + LOG + 0 + + diff --git a/test/xmlfiles/table1.xml b/test/xmlfiles/table1.xml new file mode 100644 index 0000000..a397d52 --- /dev/null +++ b/test/xmlfiles/table1.xml @@ -0,0 +1,6 @@ + + + 2 + 0 + +
diff --git a/test/xmlfiles/table2.xml b/test/xmlfiles/table2.xml new file mode 100644 index 0000000..de8e570 --- /dev/null +++ b/test/xmlfiles/table2.xml @@ -0,0 +1,6 @@ + + + 10 + 123 + +