summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorArturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>2013-08-05 14:01:28 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-08-05 14:29:14 +0200
commitb3e73fda10db2b1aa2ef26690bf285839e4ea22a (patch)
tree698e12091152ab0e59047566e50233c63cb0fbf6 /tests
parentd7d29351d57864c2d71a5d83f9d7aae092e2b9e4 (diff)
src: xml: table/chain delete properties
This patch deletes the <properties> node in chain and table XML objects. For this to work, the first tree search with MXML_DESCEND_FIRST flag is moved to the next node. Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/xmlfiles/01-table.xml6
-rw-r--r--tests/xmlfiles/02-table.xml6
-rw-r--r--tests/xmlfiles/10-chain.xml16
-rw-r--r--tests/xmlfiles/11-chain.xml16
-rw-r--r--tests/xmlfiles/12-chain.xml16
5 files changed, 25 insertions, 35 deletions
diff --git a/tests/xmlfiles/01-table.xml b/tests/xmlfiles/01-table.xml
index 133041d..2e33354 100644
--- a/tests/xmlfiles/01-table.xml
+++ b/tests/xmlfiles/01-table.xml
@@ -1,6 +1,4 @@
<table name="filter">
- <properties>
- <family>ip</family>
- <table_flags>0</table_flags>
- </properties>
+ <family>ip</family>
+ <table_flags>0</table_flags>
</table>
diff --git a/tests/xmlfiles/02-table.xml b/tests/xmlfiles/02-table.xml
index 0aef342..27d0208 100644
--- a/tests/xmlfiles/02-table.xml
+++ b/tests/xmlfiles/02-table.xml
@@ -1,6 +1,4 @@
<table name="nat">
- <properties>
- <family>ip6</family>
- <table_flags>0</table_flags>
- </properties>
+ <family>ip6</family>
+ <table_flags>0</table_flags>
</table>
diff --git a/tests/xmlfiles/10-chain.xml b/tests/xmlfiles/10-chain.xml
index 4de1020..6d1875e 100644
--- a/tests/xmlfiles/10-chain.xml
+++ b/tests/xmlfiles/10-chain.xml
@@ -1,11 +1,9 @@
<chain name="test" handle="0" bytes="0" packets="0">
- <properties>
- <type>filter</type>
- <table>filter</table>
- <prio>0</prio>
- <use>1</use>
- <hooknum>NF_INET_LOCAL_IN</hooknum>
- <policy>accept</policy>
- <family>ip</family>
- </properties>
+ <type>filter</type>
+ <table>filter</table>
+ <prio>0</prio>
+ <use>1</use>
+ <hooknum>NF_INET_LOCAL_IN</hooknum>
+ <policy>accept</policy>
+ <family>ip</family>
</chain>
diff --git a/tests/xmlfiles/11-chain.xml b/tests/xmlfiles/11-chain.xml
index 310aeaa..986cd81 100644
--- a/tests/xmlfiles/11-chain.xml
+++ b/tests/xmlfiles/11-chain.xml
@@ -1,11 +1,9 @@
<chain name="test" handle="0" bytes="59" packets="1">
- <properties>
- <type>filter</type>
- <table>filter</table>
- <prio>0</prio>
- <use>1</use>
- <hooknum>NF_INET_FORWARD</hooknum>
- <policy>drop</policy>
- <family>ip6</family>
- </properties>
+ <type>filter</type>
+ <table>filter</table>
+ <prio>0</prio>
+ <use>1</use>
+ <hooknum>NF_INET_FORWARD</hooknum>
+ <policy>drop</policy>
+ <family>ip6</family>
</chain>
diff --git a/tests/xmlfiles/12-chain.xml b/tests/xmlfiles/12-chain.xml
index 20ee2a8..23fef8c 100644
--- a/tests/xmlfiles/12-chain.xml
+++ b/tests/xmlfiles/12-chain.xml
@@ -1,11 +1,9 @@
<chain name="foo" handle="100" bytes="59264154979" packets="2548796325">
- <properties>
- <type>nat</type>
- <table>nat</table>
- <prio>0</prio>
- <use>1</use>
- <hooknum>NF_INET_POST_ROUTING</hooknum>
- <policy>accept</policy>
- <family>ip</family>
- </properties>
+ <type>nat</type>
+ <table>nat</table>
+ <prio>0</prio>
+ <use>1</use>
+ <hooknum>NF_INET_POST_ROUTING</hooknum>
+ <policy>accept</policy>
+ <family>ip</family>
</chain>