diff options
| author | Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> | 2013-08-06 10:40:33 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-06 11:44:20 +0200 |
| commit | b58cf8947422ba695df80fe3b012b383fff22f7a (patch) | |
| tree | ed5708d68972c225492771b57397c52bfef1fc4d /tests/xmlfiles/54-rule-real.xml | |
| parent | ec75831c439ebd3475e0ba6766188d963538129a (diff) | |
src: xml: use nodes instead of attributes
When working with XML, it's desirable to work with nodes better than
attributes.
Table/chain/rules had attributes in their XML representation, and
this patch transform those to nodes, ie:
Before:
<table name="filter">
<family>ip</family>
<table_flags>0</table_flags>
</table>
After:
<table>
<name>filter</name>
<family>ip</family>
<table_flags>0</table_flags>
</table>
While at it:
* There was a lot of redundant code that is now collapsed with the
new nft_mxml_family_parse() helper function.
* I've added a small fix: additional validation for the name of
the current XML object, and also replace raw strtol calls to nft_strtoi.
* Also, all XML testfiles are updated to keep passing the parsing tests and
mantain the repo in consisten state.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/xmlfiles/54-rule-real.xml')
| -rw-r--r-- | tests/xmlfiles/54-rule-real.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/xmlfiles/54-rule-real.xml b/tests/xmlfiles/54-rule-real.xml index bcb81b7..caf9ebe 100644 --- a/tests/xmlfiles/54-rule-real.xml +++ b/tests/xmlfiles/54-rule-real.xml @@ -1,4 +1,8 @@ -<rule family="ip" table="filter" chain="output" handle="16"> +<rule> + <family>ip</family> + <table>filter</table> + <chain>output</chain> + <handle>16</handle> <rule_flags>0</rule_flags> <expr type="ct"> <dreg>1</dreg> |