From 02295f3d01d13adba9fefeb7b9a40ea379aded1b Mon Sep 17 00:00:00 2001
From: Arturo Borrero <arturo.borrero.glez@gmail.com>
Date: Thu, 25 Jul 2013 22:44:40 +0200
Subject: tests: xml: add realistic XML tests files

This patch refresh current XML testfiles with some realworld
expressions extracted from rules. The nft instruction itself is added
as a comment for future references.

All XMl files are now indented with tabs instead of spaces. Also, a
bunch of new realworld rules with mixed expressions are added.

I used this command to get the XML formatted with tabs:

$ export XMLLINT_INDENT=$'\t'
$ xmllint --format file.xml

The xmllint tool is included in the libxml2-utils package (at least on
debian systems).

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/xmlfiles/20-rule-bitwise.xml | 43 +++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

(limited to 'tests/xmlfiles/20-rule-bitwise.xml')

diff --git a/tests/xmlfiles/20-rule-bitwise.xml b/tests/xmlfiles/20-rule-bitwise.xml
index ce2d851..a61f4fb 100644
--- a/tests/xmlfiles/20-rule-bitwise.xml
+++ b/tests/xmlfiles/20-rule-bitwise.xml
@@ -1,26 +1,21 @@
 <rule family="ip" table="filter" chain="INPUT" handle="100" version="0">
-  <rule_flags>0</rule_flags>
-  <expr type="bitwise">
-    <sreg>2</sreg>
-    <dreg>2</dreg>
-    <len>16</len>
-    <mask>
-      <data_reg type="value">
-        <len>16</len>
-        <data0>0xffffffff</data0>
-        <data1>0xffffffff</data1>
-        <data2>0xffffffff</data2>
-        <data3>0x000000ff</data3>
-      </data_reg>
-    </mask>
-    <xor>
-      <data_reg type="value">
-        <len>16</len>
-        <data0>0xfaceb00c</data0>
-        <data1>0xc1cac1ca</data1>
-        <data2>0xcafecafe</data2>
-        <data3>0xdeadbeef</data3>
-      </data_reg>
-    </xor>
-  </expr>
+	<rule_flags>0</rule_flags>
+	<expr type="bitwise">
+		<sreg>1</sreg>
+		<dreg>1</dreg>
+		<len>4</len>
+		<mask>
+			<data_reg type="value">
+				<len>4</len>
+				<data0>0x0000000a</data0>
+			</data_reg>
+		</mask>
+		<xor>
+			<data_reg type="value">
+				<len>4</len>
+				<data0>0x00000000</data0>
+			</data_reg>
+		</xor>
+	</expr>
 </rule>
+<!-- nft add rule filter input ct state new,established accept -->
-- 
cgit v1.2.3