From 0758d102627744847d0bd2e4744d27695edb9a14 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Date: Thu, 22 Sep 2016 16:58:13 +0200 Subject: src: remove libmxml support This patch removes the libmxml integration in libnftnl, since we have JSON in place and there is no need to support two at the same time. The JSON support is much better, for example libjansson has a better parsing error reporting. Moreover, libmxml 2.10 breaks the integration with libnftnl somehow, as reported in Debian bug #83870 [0]. Also, the XML support inside libnftnl has never been in good shape, with several tiny inconsitencies. [0] https://bugs.debian.org/838370 Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- tests/Makefile.am | 5 ++- tests/nft-parsing-test.c | 62 ++-------------------------------- tests/test-script.sh | 1 - tests/xmlfiles/01-table.xml | 1 - tests/xmlfiles/02-table.xml | 1 - tests/xmlfiles/10-chain.xml | 1 - tests/xmlfiles/11-chain.xml | 1 - tests/xmlfiles/12-chain.xml | 1 - tests/xmlfiles/20-rule-bitwise.xml | 1 - tests/xmlfiles/21-rule-byteorder.xml | 1 - tests/xmlfiles/22-rule-cmp.xml | 1 - tests/xmlfiles/23-rule-counter.xml | 1 - tests/xmlfiles/24-rule-ct.xml | 1 - tests/xmlfiles/25-rule-exthdr.xml | 1 - tests/xmlfiles/26-rule-immediate.xml | 1 - tests/xmlfiles/27-rule-limit.xml | 1 - tests/xmlfiles/28-rule-log.xml | 1 - tests/xmlfiles/29-rule-lookup.xml | 1 - tests/xmlfiles/30-rule-match.xml | 1 - tests/xmlfiles/31-rule-meta.xml | 1 - tests/xmlfiles/32-rule-nat6.xml | 1 - tests/xmlfiles/33-rule-nat4.xml | 1 - tests/xmlfiles/34-rule-payload.xml | 1 - tests/xmlfiles/35-rule-target.xml | 1 - tests/xmlfiles/36-rule-real.xml | 1 - tests/xmlfiles/37-rule-real.xml | 1 - tests/xmlfiles/38-rule-real.xml | 1 - tests/xmlfiles/39-rule-real.xml | 1 - tests/xmlfiles/40-rule-real.xml | 1 - tests/xmlfiles/41-rule-real.xml | 1 - tests/xmlfiles/42-rule-real.xml | 1 - tests/xmlfiles/43-rule-real.xml | 1 - tests/xmlfiles/44-rule-real.xml | 1 - tests/xmlfiles/45-rule-real.xml | 1 - tests/xmlfiles/46-rule-real.xml | 1 - tests/xmlfiles/47-rule-real.xml | 1 - tests/xmlfiles/48-rule-real.xml | 1 - tests/xmlfiles/49-rule-real.xml | 1 - tests/xmlfiles/50-rule-real.xml | 1 - tests/xmlfiles/51-rule-real.xml | 1 - tests/xmlfiles/52-rule-real.xml | 1 - tests/xmlfiles/53-rule-real.xml | 1 - tests/xmlfiles/54-rule-real.xml | 1 - tests/xmlfiles/55-rule-real.xml | 1 - tests/xmlfiles/56-rule-real.xml | 1 - tests/xmlfiles/57-rule-real.xml | 1 - tests/xmlfiles/58-rule-real.xml | 1 - tests/xmlfiles/59-rule-real.xml | 1 - tests/xmlfiles/60-rule-real.xml | 1 - tests/xmlfiles/61-rule-real.xml | 1 - tests/xmlfiles/62-rule-real.xml | 1 - tests/xmlfiles/63-rule-real.xml | 1 - tests/xmlfiles/64-rule-real.xml | 1 - tests/xmlfiles/65-rule-real.xml | 1 - tests/xmlfiles/66-rule-real.xml | 1 - tests/xmlfiles/67-rule-real.xml | 1 - tests/xmlfiles/68-rule-real.xml | 1 - tests/xmlfiles/69-rule-real.xml | 1 - tests/xmlfiles/70-rule-real.xml | 1 - tests/xmlfiles/71-rule-real.xml | 1 - tests/xmlfiles/72-rule-real.xml | 1 - tests/xmlfiles/73-set.xml | 1 - tests/xmlfiles/74-set.xml | 1 - tests/xmlfiles/75-ruleset.xml | 1 - tests/xmlfiles/76-rule-meta_target.xml | 1 - tests/xmlfiles/77-rule-queue.xml | 1 - tests/xmlfiles/78-rule-queue.xml | 2 -- tests/xmlfiles/79-rule-masq.xml | 1 - tests/xmlfiles/80-rule-redir.xml | 1 - tests/xmlfiles/81-rule-real.xml | 1 - 70 files changed, 4 insertions(+), 132 deletions(-) delete mode 100644 tests/xmlfiles/01-table.xml delete mode 100644 tests/xmlfiles/02-table.xml delete mode 100644 tests/xmlfiles/10-chain.xml delete mode 100644 tests/xmlfiles/11-chain.xml delete mode 100644 tests/xmlfiles/12-chain.xml delete mode 100644 tests/xmlfiles/20-rule-bitwise.xml delete mode 100644 tests/xmlfiles/21-rule-byteorder.xml delete mode 100644 tests/xmlfiles/22-rule-cmp.xml delete mode 100644 tests/xmlfiles/23-rule-counter.xml delete mode 100644 tests/xmlfiles/24-rule-ct.xml delete mode 100644 tests/xmlfiles/25-rule-exthdr.xml delete mode 100644 tests/xmlfiles/26-rule-immediate.xml delete mode 100644 tests/xmlfiles/27-rule-limit.xml delete mode 100644 tests/xmlfiles/28-rule-log.xml delete mode 100644 tests/xmlfiles/29-rule-lookup.xml delete mode 100644 tests/xmlfiles/30-rule-match.xml delete mode 100644 tests/xmlfiles/31-rule-meta.xml delete mode 100644 tests/xmlfiles/32-rule-nat6.xml delete mode 100644 tests/xmlfiles/33-rule-nat4.xml delete mode 100644 tests/xmlfiles/34-rule-payload.xml delete mode 100644 tests/xmlfiles/35-rule-target.xml delete mode 100644 tests/xmlfiles/36-rule-real.xml delete mode 100644 tests/xmlfiles/37-rule-real.xml delete mode 100644 tests/xmlfiles/38-rule-real.xml delete mode 100644 tests/xmlfiles/39-rule-real.xml delete mode 100644 tests/xmlfiles/40-rule-real.xml delete mode 100644 tests/xmlfiles/41-rule-real.xml delete mode 100644 tests/xmlfiles/42-rule-real.xml delete mode 100644 tests/xmlfiles/43-rule-real.xml delete mode 100644 tests/xmlfiles/44-rule-real.xml delete mode 100644 tests/xmlfiles/45-rule-real.xml delete mode 100644 tests/xmlfiles/46-rule-real.xml delete mode 100644 tests/xmlfiles/47-rule-real.xml delete mode 100644 tests/xmlfiles/48-rule-real.xml delete mode 100644 tests/xmlfiles/49-rule-real.xml delete mode 100644 tests/xmlfiles/50-rule-real.xml delete mode 100644 tests/xmlfiles/51-rule-real.xml delete mode 100644 tests/xmlfiles/52-rule-real.xml delete mode 100644 tests/xmlfiles/53-rule-real.xml delete mode 100644 tests/xmlfiles/54-rule-real.xml delete mode 100644 tests/xmlfiles/55-rule-real.xml delete mode 100644 tests/xmlfiles/56-rule-real.xml delete mode 100644 tests/xmlfiles/57-rule-real.xml delete mode 100644 tests/xmlfiles/58-rule-real.xml delete mode 100644 tests/xmlfiles/59-rule-real.xml delete mode 100644 tests/xmlfiles/60-rule-real.xml delete mode 100644 tests/xmlfiles/61-rule-real.xml delete mode 100644 tests/xmlfiles/62-rule-real.xml delete mode 100644 tests/xmlfiles/63-rule-real.xml delete mode 100644 tests/xmlfiles/64-rule-real.xml delete mode 100644 tests/xmlfiles/65-rule-real.xml delete mode 100644 tests/xmlfiles/66-rule-real.xml delete mode 100644 tests/xmlfiles/67-rule-real.xml delete mode 100644 tests/xmlfiles/68-rule-real.xml delete mode 100644 tests/xmlfiles/69-rule-real.xml delete mode 100644 tests/xmlfiles/70-rule-real.xml delete mode 100644 tests/xmlfiles/71-rule-real.xml delete mode 100644 tests/xmlfiles/72-rule-real.xml delete mode 100644 tests/xmlfiles/73-set.xml delete mode 100644 tests/xmlfiles/74-set.xml delete mode 100644 tests/xmlfiles/75-ruleset.xml delete mode 100644 tests/xmlfiles/76-rule-meta_target.xml delete mode 100644 tests/xmlfiles/77-rule-queue.xml delete mode 100644 tests/xmlfiles/78-rule-queue.xml delete mode 100644 tests/xmlfiles/79-rule-masq.xml delete mode 100644 tests/xmlfiles/80-rule-redir.xml delete mode 100644 tests/xmlfiles/81-rule-real.xml (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index e5588c9..99d2974 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,8 +1,7 @@ include $(top_srcdir)/Make_global.am EXTRA_DIST = test-script.sh \ - jsonfiles \ - xmlfiles + jsonfiles check_PROGRAMS = nft-parsing-test \ nft-table-test \ @@ -35,7 +34,7 @@ check_PROGRAMS = nft-parsing-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} +nft_parsing_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} ${LIBJSON_LIBS} nft_table_test_SOURCES = nft-table-test.c nft_table_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} diff --git a/tests/nft-parsing-test.c b/tests/nft-parsing-test.c index ce3dc4d..d25a73e 100644 --- a/tests/nft-parsing-test.c +++ b/tests/nft-parsing-test.c @@ -144,43 +144,6 @@ failparsing: return -1; } -static int test_xml(const char *filename, struct nftnl_parse_err *err) -{ - int ret = -1; - struct nftnl_ruleset *rs; - FILE *fp; - - fp = fopen(filename, "r"); - if (fp == NULL) { - printf("unable to open file %s: %s\n", filename, - strerror(errno)); - return -1; - } - - rs = nftnl_ruleset_alloc(); - if (rs == NULL) { - perror("nftnl_ruleset_alloc"); - return -1; - } - - if (nftnl_ruleset_parse_file(rs, NFTNL_PARSE_XML, fp, err) == 0) - ret = compare_test(TEST_XML_RULESET, rs, filename, fp); - else - goto failparsing; - - nftnl_ruleset_free(rs); - fclose(fp); - - return ret; - -failparsing: - fclose(fp); - printf("parsing %s: ", filename); - printf("\033[31mFAILED\e[0m (%s)\n", strerror(errno)); - nftnl_parse_perror("Reason", err); - return -1; -} - static int execute_test(const char *dir_name) { DIR *d; @@ -210,16 +173,6 @@ static int execute_test(const char *dir_name) snprintf(path, sizeof(path), "%s/%s", dir_name, dent->d_name); - if (strcmp(&dent->d_name[len-4], ".xml") == 0) { - if ((ret = test_xml(path, err)) == 0) { - if (!update) { - printf("parsing and validating %s: ", - path); - printf("\033[32mOK\e[0m\n"); - } - } - exit_code += ret; - } if (strcmp(&dent->d_name[len-5], ".json") == 0) { if ((ret = test_json(path, err)) == 0) { if (!update) { @@ -244,8 +197,8 @@ static int execute_test(const char *dir_name) static int execute_test_file(const char *filename) { char path[PATH_MAX]; - int ret = 0; struct nftnl_parse_err *err; + int ret = 0, len; err = nftnl_parse_err_alloc(); if (err == NULL) { @@ -255,18 +208,7 @@ static int execute_test_file(const char *filename) snprintf(path, sizeof(path), "%s", filename); - int len = strlen(filename); - if (strcmp(&filename[len-4], ".xml") == 0) { - if ((ret = test_xml(path, err)) == 0) { - if (!update) { - printf("parsing and validating %s: ", - path); - printf("\033[32mOK\e[0m\n"); - } - } - nftnl_parse_err_free(err); - exit(EXIT_FAILURE); - } + len = strlen(filename); if (strcmp(&filename[len-5], ".json") == 0) { if ((ret = test_json(path, err)) == 0) { if (!update) { diff --git a/tests/test-script.sh b/tests/test-script.sh index dcd9080..1c93e93 100755 --- a/tests/test-script.sh +++ b/tests/test-script.sh @@ -26,5 +26,4 @@ ./nft-rule-test ./nft-set-test ./nft-table-test -./nft-parsing-test -d xmlfiles ./nft-parsing-test -d jsonfiles diff --git a/tests/xmlfiles/01-table.xml b/tests/xmlfiles/01-table.xml deleted file mode 100644 index c83c4e2..0000000 --- a/tests/xmlfiles/01-table.xml +++ /dev/null @@ -1 +0,0 @@ -filterip00
diff --git a/tests/xmlfiles/02-table.xml b/tests/xmlfiles/02-table.xml deleted file mode 100644 index 99dc6df..0000000 --- a/tests/xmlfiles/02-table.xml +++ /dev/null @@ -1 +0,0 @@ -natip600
diff --git a/tests/xmlfiles/10-chain.xml b/tests/xmlfiles/10-chain.xml deleted file mode 100644 index 8ae807b..0000000 --- a/tests/xmlfiles/10-chain.xml +++ /dev/null @@ -1 +0,0 @@ -test000filter
ipfilterinput0accept
diff --git a/tests/xmlfiles/11-chain.xml b/tests/xmlfiles/11-chain.xml deleted file mode 100644 index d48fa40..0000000 --- a/tests/xmlfiles/11-chain.xml +++ /dev/null @@ -1 +0,0 @@ -test0591filter
ip6filterforward0drop
diff --git a/tests/xmlfiles/12-chain.xml b/tests/xmlfiles/12-chain.xml deleted file mode 100644 index 448feb2..0000000 --- a/tests/xmlfiles/12-chain.xml +++ /dev/null @@ -1 +0,0 @@ -foo100592641549792548796325nat
ipnatpostrouting0accept
diff --git a/tests/xmlfiles/20-rule-bitwise.xml b/tests/xmlfiles/20-rule-bitwise.xml deleted file mode 100644 index 69ff702..0000000 --- a/tests/xmlfiles/20-rule-bitwise.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
INPUT10011440x0000000a40x00000000
diff --git a/tests/xmlfiles/21-rule-byteorder.xml b/tests/xmlfiles/21-rule-byteorder.xml deleted file mode 100644 index 2c30ad7..0000000 --- a/tests/xmlfiles/21-rule-byteorder.xml +++ /dev/null @@ -1 +0,0 @@ -iptest
test100034hton44
diff --git a/tests/xmlfiles/22-rule-cmp.xml b/tests/xmlfiles/22-rule-cmp.xml deleted file mode 100644 index 103b7da..0000000 --- a/tests/xmlfiles/22-rule-cmp.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
test361eq160x000000000x6e6f62000x2e3031640x00393331
diff --git a/tests/xmlfiles/23-rule-counter.xml b/tests/xmlfiles/23-rule-counter.xml deleted file mode 100644 index c6708c6..0000000 --- a/tests/xmlfiles/23-rule-counter.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
test393177
diff --git a/tests/xmlfiles/24-rule-ct.xml b/tests/xmlfiles/24-rule-ct.xml deleted file mode 100644 index 832ae2f..0000000 --- a/tests/xmlfiles/24-rule-ct.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
INPUT1001stateoriginal
diff --git a/tests/xmlfiles/25-rule-exthdr.xml b/tests/xmlfiles/25-rule-exthdr.xml deleted file mode 100644 index 483d269..0000000 --- a/tests/xmlfiles/25-rule-exthdr.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
INPUT1001mh216
diff --git a/tests/xmlfiles/26-rule-immediate.xml b/tests/xmlfiles/26-rule-immediate.xml deleted file mode 100644 index fa5b3e7..0000000 --- a/tests/xmlfiles/26-rule-immediate.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
input320accept
diff --git a/tests/xmlfiles/27-rule-limit.xml b/tests/xmlfiles/27-rule-limit.xml deleted file mode 100644 index e186204..0000000 --- a/tests/xmlfiles/27-rule-limit.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
INPUT100123123321321
diff --git a/tests/xmlfiles/28-rule-log.xml b/tests/xmlfiles/28-rule-log.xml deleted file mode 100644 index 9a11bbb..0000000 --- a/tests/xmlfiles/28-rule-log.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
test96test_chain1
diff --git a/tests/xmlfiles/29-rule-lookup.xml b/tests/xmlfiles/29-rule-lookup.xml deleted file mode 100644 index 2074908..0000000 --- a/tests/xmlfiles/29-rule-lookup.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
test37set010
diff --git a/tests/xmlfiles/30-rule-match.xml b/tests/xmlfiles/30-rule-match.xml deleted file mode 100644 index 094f913..0000000 --- a/tests/xmlfiles/30-rule-match.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
INPUT100state
diff --git a/tests/xmlfiles/31-rule-meta.xml b/tests/xmlfiles/31-rule-meta.xml deleted file mode 100644 index 1b9e1fa..0000000 --- a/tests/xmlfiles/31-rule-meta.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
test361iifname
diff --git a/tests/xmlfiles/32-rule-nat6.xml b/tests/xmlfiles/32-rule-nat6.xml deleted file mode 100644 index 5a71148..0000000 --- a/tests/xmlfiles/32-rule-nat6.xml +++ /dev/null @@ -1 +0,0 @@ -ip6nat
OUTPUT100snatip61234
diff --git a/tests/xmlfiles/33-rule-nat4.xml b/tests/xmlfiles/33-rule-nat4.xml deleted file mode 100644 index c55618b..0000000 --- a/tests/xmlfiles/33-rule-nat4.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
INPUT100dnatip123412
diff --git a/tests/xmlfiles/34-rule-payload.xml b/tests/xmlfiles/34-rule-payload.xml deleted file mode 100644 index 34084d0..0000000 --- a/tests/xmlfiles/34-rule-payload.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
test34122transport
diff --git a/tests/xmlfiles/35-rule-target.xml b/tests/xmlfiles/35-rule-target.xml deleted file mode 100644 index 8bcfeb0..0000000 --- a/tests/xmlfiles/35-rule-target.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
INPUT100LOG
diff --git a/tests/xmlfiles/36-rule-real.xml b/tests/xmlfiles/36-rule-real.xml deleted file mode 100644 index 54db02b..0000000 --- a/tests/xmlfiles/36-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output221128network1eq80x0100a8c00x6400a8c000
diff --git a/tests/xmlfiles/37-rule-real.xml b/tests/xmlfiles/37-rule-real.xml deleted file mode 100644 index 97882b9..0000000 --- a/tests/xmlfiles/37-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
INPUT251iifname1eq160x000000000x000000000x650000000x00306874191network1eq10x00000006122transport1eq20x000016001stateoriginal11440x0000000a40x000000001neq40x0000000000testprefix1
diff --git a/tests/xmlfiles/38-rule-real.xml b/tests/xmlfiles/38-rule-real.xml deleted file mode 100644 index 49ab7b5..0000000 --- a/tests/xmlfiles/38-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
INPUT301164networkset310191network1eq10x00000006122transport1eq20x0000bb01000accept
diff --git a/tests/xmlfiles/39-rule-real.xml b/tests/xmlfiles/39-rule-real.xml deleted file mode 100644 index fa63b28..0000000 --- a/tests/xmlfiles/39-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
test311iifname1eq160x000000000x000000000x6f6200000x0030646e1oifname1eq160x000000000x620000000x31646e6f0x0037322e1816network1eq160xc09a002a0x2700cac10x000000000x50010000161network1eq10x00000011122transport1eq20x000035001statusoriginal1eq40x0000000100dns_drop20drop
diff --git a/tests/xmlfiles/40-rule-real.xml b/tests/xmlfiles/40-rule-real.xml deleted file mode 100644 index 55f195b..0000000 --- a/tests/xmlfiles/40-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output21164network1eq40x0100a8c0
diff --git a/tests/xmlfiles/41-rule-real.xml b/tests/xmlfiles/41-rule-real.xml deleted file mode 100644 index 87dc713..0000000 --- a/tests/xmlfiles/41-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output31164network1gte40x0100a8c01lte40xfa00a8c0
diff --git a/tests/xmlfiles/42-rule-real.xml b/tests/xmlfiles/42-rule-real.xml deleted file mode 100644 index 7f66ab8..0000000 --- a/tests/xmlfiles/42-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output41164network1eq40x0100a8c000
diff --git a/tests/xmlfiles/43-rule-real.xml b/tests/xmlfiles/43-rule-real.xml deleted file mode 100644 index fd9ac33..0000000 --- a/tests/xmlfiles/43-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output51164network1eq40x0100a8c0000drop
diff --git a/tests/xmlfiles/44-rule-real.xml b/tests/xmlfiles/44-rule-real.xml deleted file mode 100644 index ce026d0..0000000 --- a/tests/xmlfiles/44-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output61164network1eq40x0100a8c000
diff --git a/tests/xmlfiles/45-rule-real.xml b/tests/xmlfiles/45-rule-real.xml deleted file mode 100644 index 0448be6..0000000 --- a/tests/xmlfiles/45-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output7191network1eq10x00000006122transport1eq20x0000160000
diff --git a/tests/xmlfiles/46-rule-real.xml b/tests/xmlfiles/46-rule-real.xml deleted file mode 100644 index 973df55..0000000 --- a/tests/xmlfiles/46-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output8191network1eq10x00000006104transport1eq40x1600000400
diff --git a/tests/xmlfiles/47-rule-real.xml b/tests/xmlfiles/47-rule-real.xml deleted file mode 100644 index 0d35fd9..0000000 --- a/tests/xmlfiles/47-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output91128network1eq80x0100a8c00x6400a8c000
diff --git a/tests/xmlfiles/48-rule-real.xml b/tests/xmlfiles/48-rule-real.xml deleted file mode 100644 index ebcd219..0000000 --- a/tests/xmlfiles/48-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output10191network1eq10x00000006108transport1eq80x160000040x00000000
diff --git a/tests/xmlfiles/49-rule-real.xml b/tests/xmlfiles/49-rule-real.xml deleted file mode 100644 index 5fdf0d8..0000000 --- a/tests/xmlfiles/49-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output11191network1eq10x00000006108transport1eq80x160000040x00000000
diff --git a/tests/xmlfiles/50-rule-real.xml b/tests/xmlfiles/50-rule-real.xml deleted file mode 100644 index 0ac1ac0..0000000 --- a/tests/xmlfiles/50-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output121stateoriginal11440x0000000a40x000000001neq40x000000005511407
diff --git a/tests/xmlfiles/51-rule-real.xml b/tests/xmlfiles/51-rule-real.xml deleted file mode 100644 index 3976636..0000000 --- a/tests/xmlfiles/51-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output131directionoriginal1eq10x000000005160
diff --git a/tests/xmlfiles/52-rule-real.xml b/tests/xmlfiles/52-rule-real.xml deleted file mode 100644 index 889415a..0000000 --- a/tests/xmlfiles/52-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output141directionoriginal1eq10x000000015011247
diff --git a/tests/xmlfiles/53-rule-real.xml b/tests/xmlfiles/53-rule-real.xml deleted file mode 100644 index a484270..0000000 --- a/tests/xmlfiles/53-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output151statusoriginal1eq40x0000000100
diff --git a/tests/xmlfiles/54-rule-real.xml b/tests/xmlfiles/54-rule-real.xml deleted file mode 100644 index 6859ac2..0000000 --- a/tests/xmlfiles/54-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output161markoriginal1eq40x0000006400
diff --git a/tests/xmlfiles/55-rule-real.xml b/tests/xmlfiles/55-rule-real.xml deleted file mode 100644 index 8ee83e4..0000000 --- a/tests/xmlfiles/55-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output171secmarkoriginal1eq40x000000005511407
diff --git a/tests/xmlfiles/56-rule-real.xml b/tests/xmlfiles/56-rule-real.xml deleted file mode 100644 index be0b868..0000000 --- a/tests/xmlfiles/56-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output181expirationoriginal1eq40x0000001e00
diff --git a/tests/xmlfiles/57-rule-real.xml b/tests/xmlfiles/57-rule-real.xml deleted file mode 100644 index 7a1d68f..0000000 --- a/tests/xmlfiles/57-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output191helperoriginal1eq40x0070746600
diff --git a/tests/xmlfiles/58-rule-real.xml b/tests/xmlfiles/58-rule-real.xml deleted file mode 100644 index d32ed8f..0000000 --- a/tests/xmlfiles/58-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output201len1eq40x000003e800
diff --git a/tests/xmlfiles/59-rule-real.xml b/tests/xmlfiles/59-rule-real.xml deleted file mode 100644 index dc86dfb..0000000 --- a/tests/xmlfiles/59-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output211protocol1eq20x000000085511407
diff --git a/tests/xmlfiles/60-rule-real.xml b/tests/xmlfiles/60-rule-real.xml deleted file mode 100644 index e5938e3..0000000 --- a/tests/xmlfiles/60-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output221mark1eq40x000000005511407
diff --git a/tests/xmlfiles/61-rule-real.xml b/tests/xmlfiles/61-rule-real.xml deleted file mode 100644 index 0c097b9..0000000 --- a/tests/xmlfiles/61-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output231iif1eq40x0000000100
diff --git a/tests/xmlfiles/62-rule-real.xml b/tests/xmlfiles/62-rule-real.xml deleted file mode 100644 index 387a4f1..0000000 --- a/tests/xmlfiles/62-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output241iifname1eq160x000000000x000000000x650000000x0030687400
diff --git a/tests/xmlfiles/63-rule-real.xml b/tests/xmlfiles/63-rule-real.xml deleted file mode 100644 index 1f6aa92..0000000 --- a/tests/xmlfiles/63-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output251oif1eq40x0000000100
diff --git a/tests/xmlfiles/64-rule-real.xml b/tests/xmlfiles/64-rule-real.xml deleted file mode 100644 index 68f9d8a..0000000 --- a/tests/xmlfiles/64-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output261oifname1eq160x000000000x000000000x650000000x0030687400
diff --git a/tests/xmlfiles/65-rule-real.xml b/tests/xmlfiles/65-rule-real.xml deleted file mode 100644 index 6eeb3d0..0000000 --- a/tests/xmlfiles/65-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output271skuid1eq40x000003e800
diff --git a/tests/xmlfiles/66-rule-real.xml b/tests/xmlfiles/66-rule-real.xml deleted file mode 100644 index 1294a85..0000000 --- a/tests/xmlfiles/66-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output281skgid1eq40x000003e800
diff --git a/tests/xmlfiles/67-rule-real.xml b/tests/xmlfiles/67-rule-real.xml deleted file mode 100644 index 162d084..0000000 --- a/tests/xmlfiles/67-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output291secmark1eq40x000000005511407
diff --git a/tests/xmlfiles/68-rule-real.xml b/tests/xmlfiles/68-rule-real.xml deleted file mode 100644 index 08371f9..0000000 --- a/tests/xmlfiles/68-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output32191network1eq10x00000006122transportset01000
diff --git a/tests/xmlfiles/69-rule-real.xml b/tests/xmlfiles/69-rule-real.xml deleted file mode 100644 index 62119cd..0000000 --- a/tests/xmlfiles/69-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output331164networkset110
diff --git a/tests/xmlfiles/70-rule-real.xml b/tests/xmlfiles/70-rule-real.xml deleted file mode 100644 index 436c517..0000000 --- a/tests/xmlfiles/70-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output34191network1eq10x00000006122transportmap010
diff --git a/tests/xmlfiles/71-rule-real.xml b/tests/xmlfiles/71-rule-real.xml deleted file mode 100644 index bb50afd..0000000 --- a/tests/xmlfiles/71-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output35191network1eq10x00000006122transportmap110
diff --git a/tests/xmlfiles/72-rule-real.xml b/tests/xmlfiles/72-rule-real.xml deleted file mode 100644 index 85ce226..0000000 --- a/tests/xmlfiles/72-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
output361164networkmap210
diff --git a/tests/xmlfiles/73-set.xml b/tests/xmlfiles/73-set.xml deleted file mode 100644 index 17b5995..0000000 --- a/tests/xmlfiles/73-set.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
set0000040x0300a8c040x0200a8c040x0100a8c0
diff --git a/tests/xmlfiles/74-set.xml b/tests/xmlfiles/74-set.xml deleted file mode 100644 index bf39c46..0000000 --- a/tests/xmlfiles/74-set.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
set00000160xc09a002a0x2700cac10x000000000x70010000160xc09a002a0x2700cac10x000000000x50010000
diff --git a/tests/xmlfiles/75-ruleset.xml b/tests/xmlfiles/75-ruleset.xml deleted file mode 100644 index 9c63686..0000000 --- a/tests/xmlfiles/75-ruleset.xml +++ /dev/null @@ -1 +0,0 @@ -filterip00
filterip600
input100filter
ip
output200filter
ip
forward100filter
ip6
ip6filter
set031220020x0000430020x00003500
ipfilter
map01112242949670401620x00005000drop20x00001600accept
ipfilter
input8000accept
ipfilter
output9191network1eq10x00000006122transportmap010
ip6filter
forward2161network1eq10x00000011122transportset010000accept
diff --git a/tests/xmlfiles/76-rule-meta_target.xml b/tests/xmlfiles/76-rule-meta_target.xml deleted file mode 100644 index beac9f3..0000000 --- a/tests/xmlfiles/76-rule-meta_target.xml +++ /dev/null @@ -1 +0,0 @@ -ip6filter
test129mark1
diff --git a/tests/xmlfiles/77-rule-queue.xml b/tests/xmlfiles/77-rule-queue.xml deleted file mode 100644 index b9e9628..0000000 --- a/tests/xmlfiles/77-rule-queue.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
input43420
diff --git a/tests/xmlfiles/78-rule-queue.xml b/tests/xmlfiles/78-rule-queue.xml deleted file mode 100644 index d192d7d..0000000 --- a/tests/xmlfiles/78-rule-queue.xml +++ /dev/null @@ -1,2 +0,0 @@ -ipfilter
input4443423
- diff --git a/tests/xmlfiles/79-rule-masq.xml b/tests/xmlfiles/79-rule-masq.xml deleted file mode 100644 index 59f9c53..0000000 --- a/tests/xmlfiles/79-rule-masq.xml +++ /dev/null @@ -1 +0,0 @@ -ip6nat
postrouting412
diff --git a/tests/xmlfiles/80-rule-redir.xml b/tests/xmlfiles/80-rule-redir.xml deleted file mode 100644 index 00abc58..0000000 --- a/tests/xmlfiles/80-rule-redir.xml +++ /dev/null @@ -1 +0,0 @@ -ip6nat
prerouting4
diff --git a/tests/xmlfiles/81-rule-real.xml b/tests/xmlfiles/81-rule-real.xml deleted file mode 100644 index 11a860e..0000000 --- a/tests/xmlfiles/81-rule-real.xml +++ /dev/null @@ -1 +0,0 @@ -ipfilter
input5191network1eq10x00000006122transport1eq20x00001700
-- cgit v1.2.3