From 663bbeba68f8abc5a33892535984a318aa258dd6 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 10 Aug 2013 12:52:12 +0200 Subject: tests: xml: remove \t and \n from all the files These XML files are intented to be used for automated tests. Thus, it's important to have exactly the same output that was generated by the library. The beautified output does not match the real output that the library provides and it just makes things harder for us to provide a more advanced automated testing. If you want to make any of those file human readable, please use: xmllint --format file.xml or open the xml file and any browser, eg. firefox. Signed-off-by: Pablo Neira Ayuso --- tests/xmlfiles/01-table.xml | 6 +- tests/xmlfiles/02-table.xml | 6 +- tests/xmlfiles/10-chain.xml | 14 +--- tests/xmlfiles/11-chain.xml | 14 +--- tests/xmlfiles/12-chain.xml | 14 +--- tests/xmlfiles/20-rule-bitwise.xml | 25 +------ tests/xmlfiles/21-rule-byteorder.xml | 15 +---- tests/xmlfiles/22-rule-cmp.xml | 21 +----- tests/xmlfiles/23-rule-counter.xml | 12 +--- tests/xmlfiles/24-rule-ct.xml | 13 +--- tests/xmlfiles/25-rule-exthdr.xml | 14 +--- tests/xmlfiles/26-rule-immediate.xml | 16 +---- tests/xmlfiles/27-rule-limit.xml | 12 +--- tests/xmlfiles/28-rule-log.xml | 14 +--- tests/xmlfiles/29-rule-lookup.xml | 13 +--- tests/xmlfiles/30-rule-match.xml | 11 +-- tests/xmlfiles/31-rule-meta.xml | 12 +--- tests/xmlfiles/32-rule-nat6.xml | 16 +---- tests/xmlfiles/33-rule-nat4.xml | 16 +---- tests/xmlfiles/34-rule-payload.xml | 14 +--- tests/xmlfiles/35-rule-target.xml | 11 +-- tests/xmlfiles/36-rule-real.xml | 29 +------- tests/xmlfiles/37-rule-real.xml | 99 +-------------------------- tests/xmlfiles/38-rule-real.xml | 63 +----------------- tests/xmlfiles/39-rule-real.xml | 126 +---------------------------------- tests/xmlfiles/40-rule-real.xml | 24 +------ tests/xmlfiles/41-rule-real.xml | 34 +--------- tests/xmlfiles/42-rule-real.xml | 28 +------- tests/xmlfiles/43-rule-real.xml | 36 +--------- tests/xmlfiles/44-rule-real.xml | 34 +--------- tests/xmlfiles/45-rule-real.xml | 44 +----------- tests/xmlfiles/46-rule-real.xml | 44 +----------- tests/xmlfiles/47-rule-real.xml | 29 +------- tests/xmlfiles/48-rule-real.xml | 41 +----------- tests/xmlfiles/49-rule-real.xml | 41 +----------- tests/xmlfiles/50-rule-real.xml | 44 +----------- tests/xmlfiles/51-rule-real.xml | 27 +------- tests/xmlfiles/52-rule-real.xml | 27 +------- tests/xmlfiles/53-rule-real.xml | 27 +------- tests/xmlfiles/54-rule-real.xml | 27 +------- tests/xmlfiles/55-rule-real.xml | 27 +------- tests/xmlfiles/56-rule-real.xml | 27 +------- tests/xmlfiles/57-rule-real.xml | 27 +------- tests/xmlfiles/58-rule-real.xml | 26 +------- tests/xmlfiles/59-rule-real.xml | 26 +------- tests/xmlfiles/60-rule-real.xml | 26 +------- tests/xmlfiles/61-rule-real.xml | 26 +------- tests/xmlfiles/62-rule-real.xml | 29 +------- tests/xmlfiles/63-rule-real.xml | 26 +------- tests/xmlfiles/64-rule-real.xml | 29 +------- tests/xmlfiles/65-rule-real.xml | 26 +------- tests/xmlfiles/66-rule-real.xml | 26 +------- tests/xmlfiles/67-rule-real.xml | 26 +------- tests/xmlfiles/68-rule-real.xml | 39 +---------- tests/xmlfiles/69-rule-real.xml | 19 +----- tests/xmlfiles/70-rule-real.xml | 35 +--------- tests/xmlfiles/71-rule-real.xml | 35 +--------- tests/xmlfiles/72-rule-real.xml | 19 +----- tests/xmlfiles/73-set.xml | 38 +---------- tests/xmlfiles/74-set.xml | 35 +--------- 60 files changed, 60 insertions(+), 1620 deletions(-) (limited to 'tests/xmlfiles') diff --git a/tests/xmlfiles/01-table.xml b/tests/xmlfiles/01-table.xml index b15ce6b..fefcf67 100644 --- a/tests/xmlfiles/01-table.xml +++ b/tests/xmlfiles/01-table.xml @@ -1,5 +1 @@ - - filter - ip - 0 -
+filterip0
diff --git a/tests/xmlfiles/02-table.xml b/tests/xmlfiles/02-table.xml index c58a0fb..d0873ca 100644 --- a/tests/xmlfiles/02-table.xml +++ b/tests/xmlfiles/02-table.xml @@ -1,5 +1 @@ - - nat - ip6 - 0 -
+natip60
diff --git a/tests/xmlfiles/10-chain.xml b/tests/xmlfiles/10-chain.xml index 014a915..347626c 100644 --- a/tests/xmlfiles/10-chain.xml +++ b/tests/xmlfiles/10-chain.xml @@ -1,13 +1 @@ - - test - 0 - 0 - 0 - filter - filter
- 0 - 1 - NF_INET_LOCAL_IN - accept - ip -
+test000filterfilter
01NF_INET_LOCAL_INacceptip
diff --git a/tests/xmlfiles/11-chain.xml b/tests/xmlfiles/11-chain.xml index ea6aa19..beec5ee 100644 --- a/tests/xmlfiles/11-chain.xml +++ b/tests/xmlfiles/11-chain.xml @@ -1,13 +1 @@ - - test - 0 - 59 - 1 - filter - filter
- 0 - 1 - NF_INET_FORWARD - drop - ip6 -
+test0591filterfilter
01NF_INET_FORWARDdropip6
diff --git a/tests/xmlfiles/12-chain.xml b/tests/xmlfiles/12-chain.xml index 7f03ace..9036fa1 100644 --- a/tests/xmlfiles/12-chain.xml +++ b/tests/xmlfiles/12-chain.xml @@ -1,13 +1 @@ - - foo - 100 - 59264154979 - 2548796325 - nat - nat
- 0 - 1 - NF_INET_POST_ROUTING - accept - ip -
+foo100592641549792548796325natnat
01NF_INET_POST_ROUTINGacceptip
diff --git a/tests/xmlfiles/20-rule-bitwise.xml b/tests/xmlfiles/20-rule-bitwise.xml index 9ce65bf..afe9671 100644 --- a/tests/xmlfiles/20-rule-bitwise.xml +++ b/tests/xmlfiles/20-rule-bitwise.xml @@ -1,25 +1,2 @@ - - ip - filter
- INPUT - 100 - 0 - - 1 - 1 - 4 - - - 4 - 0x0000000a - - - - - 4 - 0x00000000 - - - -
+ipfilter
INPUT100011440x0000000a40x00000000
diff --git a/tests/xmlfiles/21-rule-byteorder.xml b/tests/xmlfiles/21-rule-byteorder.xml index b9aa97e..6c6faff 100644 --- a/tests/xmlfiles/21-rule-byteorder.xml +++ b/tests/xmlfiles/21-rule-byteorder.xml @@ -1,14 +1 @@ - - ip - test
- test - 1000 - 0 - - 3 - 4 - hton - 4 - 4 - -
+iptest
test1000034hton44
diff --git a/tests/xmlfiles/22-rule-cmp.xml b/tests/xmlfiles/22-rule-cmp.xml index 77c8f81..3fe6b27 100644 --- a/tests/xmlfiles/22-rule-cmp.xml +++ b/tests/xmlfiles/22-rule-cmp.xml @@ -1,21 +1,2 @@ - - ip6 - filter
- test - 36 - 0 - - 1 - eq - - - 16 - 0x00000000 - 0x6e6f6200 - 0x2e303164 - 0x00393331 - - - -
+ip6filter
test3601eq160x000000000x6e6f62000x2e3031640x00393331
diff --git a/tests/xmlfiles/23-rule-counter.xml b/tests/xmlfiles/23-rule-counter.xml index 870f9fe..a8d0937 100644 --- a/tests/xmlfiles/23-rule-counter.xml +++ b/tests/xmlfiles/23-rule-counter.xml @@ -1,12 +1,2 @@ - - ip6 - filter
- test - 39 - 0 - - 3 - 177 - -
+ip6filter
test3903177
diff --git a/tests/xmlfiles/24-rule-ct.xml b/tests/xmlfiles/24-rule-ct.xml index 38edb4d..78c963f 100644 --- a/tests/xmlfiles/24-rule-ct.xml +++ b/tests/xmlfiles/24-rule-ct.xml @@ -1,13 +1,2 @@ - - ip - filter
- INPUT - 100 - 0 - - 1 - state - 0 - -
+ipfilter
INPUT10001state0
diff --git a/tests/xmlfiles/25-rule-exthdr.xml b/tests/xmlfiles/25-rule-exthdr.xml index ff42d62..2c1c5e4 100644 --- a/tests/xmlfiles/25-rule-exthdr.xml +++ b/tests/xmlfiles/25-rule-exthdr.xml @@ -1,13 +1 @@ - - ip6 - filter
- INPUT - 100 - 0 - - 1 - mh - 2 - 16 - -
+ip6filter
INPUT10001mh216
diff --git a/tests/xmlfiles/26-rule-immediate.xml b/tests/xmlfiles/26-rule-immediate.xml index 8fd5308..2054b9f 100644 --- a/tests/xmlfiles/26-rule-immediate.xml +++ b/tests/xmlfiles/26-rule-immediate.xml @@ -1,16 +1,2 @@ - - ip - filter
- input - 32 - 0 - - 0 - - - accept - - - -
+ipfilter
input3200accept
diff --git a/tests/xmlfiles/27-rule-limit.xml b/tests/xmlfiles/27-rule-limit.xml index aa6d607..aa81b4e 100644 --- a/tests/xmlfiles/27-rule-limit.xml +++ b/tests/xmlfiles/27-rule-limit.xml @@ -1,11 +1 @@ - - ip - filter
- INPUT - 100 - 0 - - 123123 - 321321 - -
+ipfilter
INPUT1000123123321321
diff --git a/tests/xmlfiles/28-rule-log.xml b/tests/xmlfiles/28-rule-log.xml index eed61a6..e97edc7 100644 --- a/tests/xmlfiles/28-rule-log.xml +++ b/tests/xmlfiles/28-rule-log.xml @@ -1,14 +1,2 @@ - - ip6 - filter
- test - 96 - 0 - - test_chain - 1 - 0 - 0 - -
+ip6filter
test960test_chain100
diff --git a/tests/xmlfiles/29-rule-lookup.xml b/tests/xmlfiles/29-rule-lookup.xml index 89928e3..1618fd8 100644 --- a/tests/xmlfiles/29-rule-lookup.xml +++ b/tests/xmlfiles/29-rule-lookup.xml @@ -1,13 +1,2 @@ - - ip6 - filter
- test - 37 - 0 - - set0 - 1 - 0 - -
+ip6filter
test370set010
diff --git a/tests/xmlfiles/30-rule-match.xml b/tests/xmlfiles/30-rule-match.xml index 3346976..7ea9c73 100644 --- a/tests/xmlfiles/30-rule-match.xml +++ b/tests/xmlfiles/30-rule-match.xml @@ -1,10 +1 @@ - - ip - filter
- INPUT - 100 - 0 - - state - -
+ipfilter
INPUT1000state
diff --git a/tests/xmlfiles/31-rule-meta.xml b/tests/xmlfiles/31-rule-meta.xml index 0227e78..00ebe74 100644 --- a/tests/xmlfiles/31-rule-meta.xml +++ b/tests/xmlfiles/31-rule-meta.xml @@ -1,12 +1,2 @@ - - ip6 - filter
- test - 36 - 0 - - 1 - iifname - -
+ip6filter
test3601iifname
diff --git a/tests/xmlfiles/32-rule-nat6.xml b/tests/xmlfiles/32-rule-nat6.xml index 5d38ac5..1834bff 100644 --- a/tests/xmlfiles/32-rule-nat6.xml +++ b/tests/xmlfiles/32-rule-nat6.xml @@ -1,15 +1 @@ - - ip6 - nat
- OUTPUT - 100 - 0 - - ip6 - snat - 1 - 2 - 3 - 4 - -
+ip6nat
OUTPUT1000ip6snat1234
diff --git a/tests/xmlfiles/33-rule-nat4.xml b/tests/xmlfiles/33-rule-nat4.xml index 6200ece..ac4d7d2 100644 --- a/tests/xmlfiles/33-rule-nat4.xml +++ b/tests/xmlfiles/33-rule-nat4.xml @@ -1,15 +1 @@ - - ip - filter
- INPUT - 100 - 0 - - 1 - 2 - 3 - 4 - ip - dnat - -
+ipfilter
INPUT10001234ipdnat
diff --git a/tests/xmlfiles/34-rule-payload.xml b/tests/xmlfiles/34-rule-payload.xml index 9e48822..8a37e8c 100644 --- a/tests/xmlfiles/34-rule-payload.xml +++ b/tests/xmlfiles/34-rule-payload.xml @@ -1,14 +1,2 @@ - - ip6 - filter
- test - 34 - 0 - - 1 - 2 - 2 - transport - -
+ip6filter
test340122transport
diff --git a/tests/xmlfiles/35-rule-target.xml b/tests/xmlfiles/35-rule-target.xml index 3c84538..d0bba15 100644 --- a/tests/xmlfiles/35-rule-target.xml +++ b/tests/xmlfiles/35-rule-target.xml @@ -1,10 +1 @@ - - ip - filter
- INPUT - 100 - 0 - - LOG - -
+ipfilter
INPUT1000LOG
diff --git a/tests/xmlfiles/36-rule-real.xml b/tests/xmlfiles/36-rule-real.xml index 9178e2a..7b43dff 100644 --- a/tests/xmlfiles/36-rule-real.xml +++ b/tests/xmlfiles/36-rule-real.xml @@ -1,29 +1,2 @@ - - ip - filter
- output - 22 - 0 - - 1 - 12 - 8 - network - - - 1 - eq - - - 8 - 0x0100a8c0 - 0x6400a8c0 - - - - - 0 - 0 - -
+ipfilter
output2201128network1eq80x0100a8c00x6400a8c000
diff --git a/tests/xmlfiles/37-rule-real.xml b/tests/xmlfiles/37-rule-real.xml index ff7283b..327bc09 100644 --- a/tests/xmlfiles/37-rule-real.xml +++ b/tests/xmlfiles/37-rule-real.xml @@ -1,99 +1,2 @@ - - ip - filter
- INPUT - 25 - 0 - - 1 - iifname - - - 1 - eq - - - 16 - 0x00000000 - 0x00000000 - 0x65000000 - 0x00306874 - - - - - 1 - 9 - 1 - network - - - 1 - eq - - - 1 - 0x00000006 - - - - - 1 - 2 - 2 - transport - - - 1 - eq - - - 2 - 0x00001600 - - - - - 1 - state - 0 - - - 1 - 1 - 4 - - - 4 - 0x0000000a - - - - - 4 - 0x00000000 - - - - - 1 - neq - - - 4 - 0x00000000 - - - - - 0 - 0 - - - testprefix - 1 - 0 - 0 - -
+ipfilter
INPUT2501iifname1eq160x000000000x000000000x650000000x00306874191network1eq10x00000006122transport1eq20x000016001state011440x0000000a40x000000001neq40x0000000000testprefix100
diff --git a/tests/xmlfiles/38-rule-real.xml b/tests/xmlfiles/38-rule-real.xml index 18c349c..4b0402c 100644 --- a/tests/xmlfiles/38-rule-real.xml +++ b/tests/xmlfiles/38-rule-real.xml @@ -1,63 +1,2 @@ - - ip - filter
- INPUT - 30 - 0 - - 1 - 16 - 4 - network - - - set3 - 1 - 0 - - - 1 - 9 - 1 - network - - - 1 - eq - - - 1 - 0x00000006 - - - - - 1 - 2 - 2 - transport - - - 1 - eq - - - 2 - 0x0000bb01 - - - - - 0 - 0 - - - 0 - - - accept - - - -
+ipfilter
INPUT3001164networkset310191network1eq10x00000006122transport1eq20x0000bb01000accept
diff --git a/tests/xmlfiles/39-rule-real.xml b/tests/xmlfiles/39-rule-real.xml index f69ef62..3f7f2ab 100644 --- a/tests/xmlfiles/39-rule-real.xml +++ b/tests/xmlfiles/39-rule-real.xml @@ -1,126 +1,2 @@ - - ip6 - filter
- test - 31 - 0 - - 1 - iifname - - - 1 - eq - - - 16 - 0x00000000 - 0x00000000 - 0x6f620000 - 0x0030646e - - - - - 1 - oifname - - - 1 - eq - - - 16 - 0x00000000 - 0x62000000 - 0x31646e6f - 0x0037322e - - - - - 1 - 8 - 16 - network - - - 1 - eq - - - 16 - 0xc09a002a - 0x2700cac1 - 0x00000000 - 0x50010000 - - - - - 1 - 6 - 1 - network - - - 1 - eq - - - 1 - 0x00000011 - - - - - 1 - 2 - 2 - transport - - - 1 - eq - - - 2 - 0x00003500 - - - - - 1 - status - 0 - - - 1 - eq - - - 4 - 0x00000001 - - - - - 0 - 0 - - - dns_drop - 2 - 0 - 0 - - - 0 - - - drop - - - -
+ip6filter
test3101iifname1eq160x000000000x000000000x6f6200000x0030646e1oifname1eq160x000000000x620000000x31646e6f0x0037322e1816network1eq160xc09a002a0x2700cac10x000000000x50010000161network1eq10x00000011122transport1eq20x000035001status01eq40x0000000100dns_drop2000drop
diff --git a/tests/xmlfiles/40-rule-real.xml b/tests/xmlfiles/40-rule-real.xml index 2630023..253008c 100644 --- a/tests/xmlfiles/40-rule-real.xml +++ b/tests/xmlfiles/40-rule-real.xml @@ -1,24 +1,2 @@ - - ip - filter
- output - 2 - 0 - - 1 - 16 - 4 - network - - - 1 - eq - - - 4 - 0x0100a8c0 - - - -
+ipfilter
output201164network1eq40x0100a8c0
diff --git a/tests/xmlfiles/41-rule-real.xml b/tests/xmlfiles/41-rule-real.xml index 762a7d9..4b3498e 100644 --- a/tests/xmlfiles/41-rule-real.xml +++ b/tests/xmlfiles/41-rule-real.xml @@ -1,34 +1,2 @@ - - ip - filter
- output - 3 - 0 - - 1 - 16 - 4 - network - - - 1 - gte - - - 4 - 0x0100a8c0 - - - - - 1 - lte - - - 4 - 0xfa00a8c0 - - - -
+ipfilter
output301164network1gte40x0100a8c01lte40xfa00a8c0
diff --git a/tests/xmlfiles/42-rule-real.xml b/tests/xmlfiles/42-rule-real.xml index 4bd9c6a..29f7ad9 100644 --- a/tests/xmlfiles/42-rule-real.xml +++ b/tests/xmlfiles/42-rule-real.xml @@ -1,28 +1,2 @@ - - ip - filter
- output - 4 - 0 - - 1 - 16 - 4 - network - - - 1 - eq - - - 4 - 0x0100a8c0 - - - - - 0 - 0 - -
+ipfilter
output401164network1eq40x0100a8c000
diff --git a/tests/xmlfiles/43-rule-real.xml b/tests/xmlfiles/43-rule-real.xml index eda5938..7dc1fdf 100644 --- a/tests/xmlfiles/43-rule-real.xml +++ b/tests/xmlfiles/43-rule-real.xml @@ -1,36 +1,2 @@ - - ip - filter
- output - 5 - 0 - - 1 - 16 - 4 - network - - - 1 - eq - - - 4 - 0x0100a8c0 - - - - - 0 - 0 - - - 0 - - - drop - - - -
+ipfilter
output501164network1eq40x0100a8c0000drop
diff --git a/tests/xmlfiles/44-rule-real.xml b/tests/xmlfiles/44-rule-real.xml index e66098a..feefb47 100644 --- a/tests/xmlfiles/44-rule-real.xml +++ b/tests/xmlfiles/44-rule-real.xml @@ -1,34 +1,2 @@ - - ip - filter
- output - 6 - 0 - - 1 - 16 - 4 - network - - - 1 - eq - - - 4 - 0x0100a8c0 - - - - - 0 - 0 - - - (null) - 0 - 0 - 0 - -
+ipfilter
output601164network1eq40x0100a8c000(null)000
diff --git a/tests/xmlfiles/45-rule-real.xml b/tests/xmlfiles/45-rule-real.xml index 1684eb3..d3ef55e 100644 --- a/tests/xmlfiles/45-rule-real.xml +++ b/tests/xmlfiles/45-rule-real.xml @@ -1,44 +1,2 @@ - - ip - filter
- output - 7 - 0 - - 1 - 9 - 1 - network - - - 1 - eq - - - 1 - 0x00000006 - - - - - 1 - 2 - 2 - transport - - - 1 - eq - - - 2 - 0x00001600 - - - - - 0 - 0 - -
+ipfilter
output70191network1eq10x00000006122transport1eq20x0000160000
diff --git a/tests/xmlfiles/46-rule-real.xml b/tests/xmlfiles/46-rule-real.xml index 00db686..33a6195 100644 --- a/tests/xmlfiles/46-rule-real.xml +++ b/tests/xmlfiles/46-rule-real.xml @@ -1,44 +1,2 @@ - - ip - filter
- output - 8 - 0 - - 1 - 9 - 1 - network - - - 1 - eq - - - 1 - 0x00000006 - - - - - 1 - 0 - 4 - transport - - - 1 - eq - - - 4 - 0x16000004 - - - - - 0 - 0 - -
+ipfilter
output80191network1eq10x00000006104transport1eq40x1600000400
diff --git a/tests/xmlfiles/47-rule-real.xml b/tests/xmlfiles/47-rule-real.xml index caa247c..e2c9901 100644 --- a/tests/xmlfiles/47-rule-real.xml +++ b/tests/xmlfiles/47-rule-real.xml @@ -1,29 +1,2 @@ - - ip - filter
- output - 9 - 0 - - 1 - 12 - 8 - network - - - 1 - eq - - - 8 - 0x0100a8c0 - 0x6400a8c0 - - - - - 0 - 0 - -
+ipfilter
output901128network1eq80x0100a8c00x6400a8c000
diff --git a/tests/xmlfiles/48-rule-real.xml b/tests/xmlfiles/48-rule-real.xml index 1870646..0db61a7 100644 --- a/tests/xmlfiles/48-rule-real.xml +++ b/tests/xmlfiles/48-rule-real.xml @@ -1,41 +1,2 @@ - - ip - filter
- output - 10 - 0 - - 1 - 9 - 1 - network - - - 1 - eq - - - 1 - 0x00000006 - - - - - 1 - 0 - 8 - transport - - - 1 - eq - - - 8 - 0x16000004 - 0x00000000 - - - -
+ipfilter
output100191network1eq10x00000006108transport1eq80x160000040x00000000
diff --git a/tests/xmlfiles/49-rule-real.xml b/tests/xmlfiles/49-rule-real.xml index 021e461..d8c987d 100644 --- a/tests/xmlfiles/49-rule-real.xml +++ b/tests/xmlfiles/49-rule-real.xml @@ -1,41 +1,2 @@ - - ip - filter
- output - 11 - 0 - - 1 - 9 - 1 - network - - - 1 - eq - - - 1 - 0x00000006 - - - - - 1 - 0 - 8 - transport - - - 1 - eq - - - 8 - 0x16000004 - 0x00000000 - - - -
+ipfilter
output110191network1eq10x00000006108transport1eq80x160000040x00000000
diff --git a/tests/xmlfiles/50-rule-real.xml b/tests/xmlfiles/50-rule-real.xml index 2ffa58a..71df769 100644 --- a/tests/xmlfiles/50-rule-real.xml +++ b/tests/xmlfiles/50-rule-real.xml @@ -1,44 +1,2 @@ - - ip - filter
- output - 12 - 0 - - 1 - state - 0 - - - 1 - 1 - 4 - - - 4 - 0x0000000a - - - - - 4 - 0x00000000 - - - - - 1 - neq - - - 4 - 0x00000000 - - - - - 55 - 11407 - -
+ipfilter
output1201state011440x0000000a40x000000001neq40x000000005511407
diff --git a/tests/xmlfiles/51-rule-real.xml b/tests/xmlfiles/51-rule-real.xml index 153b10f..4a0a067 100644 --- a/tests/xmlfiles/51-rule-real.xml +++ b/tests/xmlfiles/51-rule-real.xml @@ -1,27 +1,2 @@ - - ip - filter
- output - 13 - 0 - - 1 - direction - 0 - - - 1 - eq - - - 1 - 0x00000000 - - - - - 5 - 160 - -
+ipfilter
output1301direction01eq10x000000005160
diff --git a/tests/xmlfiles/52-rule-real.xml b/tests/xmlfiles/52-rule-real.xml index 2c876b8..727bae7 100644 --- a/tests/xmlfiles/52-rule-real.xml +++ b/tests/xmlfiles/52-rule-real.xml @@ -1,27 +1,2 @@ - - ip - filter
- output - 14 - 0 - - 1 - direction - 0 - - - 1 - eq - - - 1 - 0x00000001 - - - - - 50 - 11247 - -
+ipfilter
output1401direction01eq10x000000015011247
diff --git a/tests/xmlfiles/53-rule-real.xml b/tests/xmlfiles/53-rule-real.xml index 4740d24..04a1ef2 100644 --- a/tests/xmlfiles/53-rule-real.xml +++ b/tests/xmlfiles/53-rule-real.xml @@ -1,27 +1,2 @@ - - ip - filter
- output - 15 - 0 - - 1 - status - 0 - - - 1 - eq - - - 4 - 0x00000001 - - - - - 0 - 0 - -
+ipfilter
output1501status01eq40x0000000100
diff --git a/tests/xmlfiles/54-rule-real.xml b/tests/xmlfiles/54-rule-real.xml index 0e1616a..3096117 100644 --- a/tests/xmlfiles/54-rule-real.xml +++ b/tests/xmlfiles/54-rule-real.xml @@ -1,27 +1,2 @@ - - ip - filter
- output - 16 - 0 - - 1 - mark - 0 - - - 1 - eq - - - 4 - 0x00000064 - - - - - 0 - 0 - -
+ipfilter
output1601mark01eq40x0000006400
diff --git a/tests/xmlfiles/55-rule-real.xml b/tests/xmlfiles/55-rule-real.xml index 3e0e308..afd0d64 100644 --- a/tests/xmlfiles/55-rule-real.xml +++ b/tests/xmlfiles/55-rule-real.xml @@ -1,27 +1,2 @@ - - ip - filter
- output - 17 - 0 - - 1 - secmark - 0 - - - 1 - eq - - - 4 - 0x00000000 - - - - - 55 - 11407 - -
+ipfilter
output1701secmark01eq40x000000005511407
diff --git a/tests/xmlfiles/56-rule-real.xml b/tests/xmlfiles/56-rule-real.xml index 6bd41a1..a974ee7 100644 --- a/tests/xmlfiles/56-rule-real.xml +++ b/tests/xmlfiles/56-rule-real.xml @@ -1,27 +1,2 @@ - - ip - filter
- output - 18 - 0 - - 1 - expiration - 0 - - - 1 - eq - - - 4 - 0x0000001e - - - - - 0 - 0 - -
+ipfilter
output1801expiration01eq40x0000001e00
diff --git a/tests/xmlfiles/57-rule-real.xml b/tests/xmlfiles/57-rule-real.xml index da71196..2ade569 100644 --- a/tests/xmlfiles/57-rule-real.xml +++ b/tests/xmlfiles/57-rule-real.xml @@ -1,27 +1,2 @@ - - ip - filter
- output - 19 - 0 - - 1 - helper - 0 - - - 1 - eq - - - 4 - 0x00707466 - - - - - 0 - 0 - -
+ipfilter
output1901helper01eq40x0070746600
diff --git a/tests/xmlfiles/58-rule-real.xml b/tests/xmlfiles/58-rule-real.xml index 4590d94..a776eed 100644 --- a/tests/xmlfiles/58-rule-real.xml +++ b/tests/xmlfiles/58-rule-real.xml @@ -1,26 +1,2 @@ - - ip - filter
- output - 20 - 0 - - 1 - len - - - 1 - eq - - - 4 - 0x000003e8 - - - - - 0 - 0 - -
+ipfilter
output2001len1eq40x000003e800
diff --git a/tests/xmlfiles/59-rule-real.xml b/tests/xmlfiles/59-rule-real.xml index be6a32d..616acef 100644 --- a/tests/xmlfiles/59-rule-real.xml +++ b/tests/xmlfiles/59-rule-real.xml @@ -1,26 +1,2 @@ - - ip - filter
- output - 21 - 0 - - 1 - protocol - - - 1 - eq - - - 2 - 0x00000008 - - - - - 55 - 11407 - -
+ipfilter
output2101protocol1eq20x000000085511407
diff --git a/tests/xmlfiles/60-rule-real.xml b/tests/xmlfiles/60-rule-real.xml index d653f3a..3e2f0c4 100644 --- a/tests/xmlfiles/60-rule-real.xml +++ b/tests/xmlfiles/60-rule-real.xml @@ -1,26 +1,2 @@ - - ip - filter
- output - 22 - 0 - - 1 - mark - - - 1 - eq - - - 4 - 0x00000000 - - - - - 55 - 11407 - -
+ipfilter
output2201mark1eq40x000000005511407
diff --git a/tests/xmlfiles/61-rule-real.xml b/tests/xmlfiles/61-rule-real.xml index 3a215de..489b138 100644 --- a/tests/xmlfiles/61-rule-real.xml +++ b/tests/xmlfiles/61-rule-real.xml @@ -1,26 +1,2 @@ - - ip - filter
- output - 23 - 0 - - 1 - iif - - - 1 - eq - - - 4 - 0x00000001 - - - - - 0 - 0 - -
+ipfilter
output2301iif1eq40x0000000100
diff --git a/tests/xmlfiles/62-rule-real.xml b/tests/xmlfiles/62-rule-real.xml index 115a938..53484fe 100644 --- a/tests/xmlfiles/62-rule-real.xml +++ b/tests/xmlfiles/62-rule-real.xml @@ -1,29 +1,2 @@ - - ip - filter
- output - 24 - 0 - - 1 - iifname - - - 1 - eq - - - 16 - 0x00000000 - 0x00000000 - 0x65000000 - 0x00306874 - - - - - 0 - 0 - -
+ipfilter
output2401iifname1eq160x000000000x000000000x650000000x0030687400
diff --git a/tests/xmlfiles/63-rule-real.xml b/tests/xmlfiles/63-rule-real.xml index 1ebc450..d0158b5 100644 --- a/tests/xmlfiles/63-rule-real.xml +++ b/tests/xmlfiles/63-rule-real.xml @@ -1,26 +1,2 @@ - - ip - filter
- output - 25 - 0 - - 1 - oif - - - 1 - eq - - - 4 - 0x00000001 - - - - - 0 - 0 - -
+ipfilter
output2501oif1eq40x0000000100
diff --git a/tests/xmlfiles/64-rule-real.xml b/tests/xmlfiles/64-rule-real.xml index f6ac959..d07c767 100644 --- a/tests/xmlfiles/64-rule-real.xml +++ b/tests/xmlfiles/64-rule-real.xml @@ -1,29 +1,2 @@ - - ip - filter
- output - 26 - 0 - - 1 - oifname - - - 1 - eq - - - 16 - 0x00000000 - 0x00000000 - 0x65000000 - 0x00306874 - - - - - 0 - 0 - -
+ipfilter
output2601oifname1eq160x000000000x000000000x650000000x0030687400
diff --git a/tests/xmlfiles/65-rule-real.xml b/tests/xmlfiles/65-rule-real.xml index e1b4624..3cf3059 100644 --- a/tests/xmlfiles/65-rule-real.xml +++ b/tests/xmlfiles/65-rule-real.xml @@ -1,26 +1,2 @@ - - ip - filter
- output - 27 - 0 - - 1 - skuid - - - 1 - eq - - - 4 - 0x000003e8 - - - - - 0 - 0 - -
+ipfilter
output2701skuid1eq40x000003e800
diff --git a/tests/xmlfiles/66-rule-real.xml b/tests/xmlfiles/66-rule-real.xml index 562a5e3..137c257 100644 --- a/tests/xmlfiles/66-rule-real.xml +++ b/tests/xmlfiles/66-rule-real.xml @@ -1,26 +1,2 @@ - - ip - filter
- output - 28 - 0 - - 1 - skgid - - - 1 - eq - - - 4 - 0x000003e8 - - - - - 0 - 0 - -
+ipfilter
output2801skgid1eq40x000003e800
diff --git a/tests/xmlfiles/67-rule-real.xml b/tests/xmlfiles/67-rule-real.xml index 2134627..ca3d790 100644 --- a/tests/xmlfiles/67-rule-real.xml +++ b/tests/xmlfiles/67-rule-real.xml @@ -1,26 +1,2 @@ - - ip - filter
- output - 29 - 0 - - 1 - secmark - - - 1 - eq - - - 4 - 0x00000000 - - - - - 55 - 11407 - -
+ipfilter
output2901secmark1eq40x000000005511407
diff --git a/tests/xmlfiles/68-rule-real.xml b/tests/xmlfiles/68-rule-real.xml index bc52f34..0c27fcf 100644 --- a/tests/xmlfiles/68-rule-real.xml +++ b/tests/xmlfiles/68-rule-real.xml @@ -1,39 +1,2 @@ - - ip - filter
- output - 32 - 0 - - 1 - 9 - 1 - network - - - 1 - eq - - - 1 - 0x00000006 - - - - - 1 - 2 - 2 - transport - - - set0 - 1 - 0 - - - 0 - 0 - -
+ipfilter
output320191network1eq10x00000006122transportset01000
diff --git a/tests/xmlfiles/69-rule-real.xml b/tests/xmlfiles/69-rule-real.xml index fa11b60..a1a6467 100644 --- a/tests/xmlfiles/69-rule-real.xml +++ b/tests/xmlfiles/69-rule-real.xml @@ -1,19 +1,2 @@ - - ip - filter
- output - 33 - 0 - - 1 - 16 - 4 - network - - - set1 - 1 - 0 - -
+ipfilter
output3301164networkset110
diff --git a/tests/xmlfiles/70-rule-real.xml b/tests/xmlfiles/70-rule-real.xml index 490ab67..3f39542 100644 --- a/tests/xmlfiles/70-rule-real.xml +++ b/tests/xmlfiles/70-rule-real.xml @@ -1,35 +1,2 @@ - - ip - filter
- output - 34 - 0 - - 1 - 9 - 1 - network - - - 1 - eq - - - 1 - 0x00000006 - - - - - 1 - 2 - 2 - transport - - - map0 - 1 - 0 - -
+ipfilter
output340191network1eq10x00000006122transportmap010
diff --git a/tests/xmlfiles/71-rule-real.xml b/tests/xmlfiles/71-rule-real.xml index 721e1ea..f1c9fd7 100644 --- a/tests/xmlfiles/71-rule-real.xml +++ b/tests/xmlfiles/71-rule-real.xml @@ -1,35 +1,2 @@ - - ip - filter
- output - 35 - 0 - - 1 - 9 - 1 - network - - - 1 - eq - - - 1 - 0x00000006 - - - - - 1 - 2 - 2 - transport - - - map1 - 1 - 0 - -
+ipfilter
output350191network1eq10x00000006122transportmap110
diff --git a/tests/xmlfiles/72-rule-real.xml b/tests/xmlfiles/72-rule-real.xml index ddcc8be..255d567 100644 --- a/tests/xmlfiles/72-rule-real.xml +++ b/tests/xmlfiles/72-rule-real.xml @@ -1,19 +1,2 @@ - - ip - filter
- output - 36 - 0 - - 1 - 16 - 4 - network - - - map2 - 1 - 0 - -
+ipfilter
output3601164networkmap210
diff --git a/tests/xmlfiles/73-set.xml b/tests/xmlfiles/73-set.xml index e783dfa..2cf1c03 100644 --- a/tests/xmlfiles/73-set.xml +++ b/tests/xmlfiles/73-set.xml @@ -1,38 +1,2 @@ - - set0 - filter
- ip - 0 - 0 - 0 - 0 - 0 - - 0 - - - 4 - 0x0300a8c0 - - - - - 0 - - - 4 - 0x0200a8c0 - - - - - 0 - - - 4 - 0x0100a8c0 - - - -
+set0filter
ip00000040x0300a8c0040x0200a8c0040x0100a8c0
diff --git a/tests/xmlfiles/74-set.xml b/tests/xmlfiles/74-set.xml index 3ac19a3..eaf9b7d 100644 --- a/tests/xmlfiles/74-set.xml +++ b/tests/xmlfiles/74-set.xml @@ -1,35 +1,2 @@ - - set0 - filter
- ip6 - 0 - 0 - 0 - 0 - 0 - - 0 - - - 16 - 0xc09a002a - 0x2700cac1 - 0x00000000 - 0x70010000 - - - - - 0 - - - 16 - 0xc09a002a - 0x2700cac1 - 0x00000000 - 0x50010000 - - - -
+set0filter
ip6000000160xc09a002a0x2700cac10x000000000x700100000160xc09a002a0x2700cac10x000000000x50010000
-- cgit v1.2.3