chain: xml: optional attributes
PATCH 1/1 chain: xml: optional attributes
This patch makes optional print/parse of some attributes of chain objects in XML.
In order to pass nft-parsing-test, some XML nodes are reordered.
Signed-off-by Arturo Borrero Gonzalez <[email protected]>
--- tests/xmlfiles/10-chain.xml | 2 +- tests/xmlfiles/11-chain.xml | 2 +- tests/xmlfiles/12-chain.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
src/chain.c +43 -47
@@ -616,16 +616,6 @@ static int nft_chain_xml_parse(struct nft_chain *c, const char *xml) c->flags |= (1 <<NFT_CHAIN_ATTR_PACKETS ); - type =nft_mxml_str_parse (tree,"type" ,MXML_DESCEND_FIRST ); -if (type ==NULL ) - goto err; - -if (c->type) -xfree (c->type); - - c->type =strdup (type); - c->flags |= (1 <<NFT_CHAIN_ATTR_TYPE ); - table =nft_mxml_str_parse (tree,"table" ,MXML_DESCEND_FIRST );if (table ==NULL ) goto err;
@@ -636,40 +626,50 @@ static int nft_chain_xml_parse(struct nft_chain *c, const char *xml) c->table =strdup (table); c->flags |= (1 <<NFT_CHAIN_ATTR_TABLE ); -if (nft_mxml_num_parse (tree,"prio" ,MXML_DESCEND ,BASE_DEC , &c->prio, -NFT_TYPE_S32 ) !=0 ) + family =nft_mxml_family_parse (tree,"family" ,MXML_DESCEND_FIRST ); +if (family <0 ) goto err; - c->flags |= (1 <<NFT_CHAIN_ATTR_PRIO ); + c->family = family; + c->flags |= (1 <<NFT_CHAIN_ATTR_FAMILY ); hooknum_str =nft_mxml_str_parse (tree,"hooknum" ,MXML_DESCEND_FIRST ); -if (hooknum_str ==NULL ) - goto err; +if (hooknum_str !=NULL ) { + hooknum =nft_str2hooknum (hooknum_str); +if (hooknum <0 ) + goto err; - hooknum =nft_str2hooknum (hooknum_str); -if (hooknum <0 ) - goto err; + c->hooknum = hooknum; + c->flags |= (1 <<NFT_CHAIN_ATTR_HOOKNUM ); - c->hooknum = hooknum; - c->flags |= (1 <<NFT_CHAIN_ATTR_HOOKNUM ); + type =nft_mxml_str_parse (tree,"type" ,MXML_DESCEND_FIRST ); +if (type ==NULL ) + goto err; - policy_str =nft_mxml_str_parse (tree,"policy" ,MXML_DESCEND ); -if (policy_str ==NULL ) - goto err; +if (c->type) +xfree (c->type); - policy =nft_str2verdict (policy_str); -if (policy ==-1 ) - goto err; + c->type =strdup (type); + c->flags |= (1 <<NFT_CHAIN_ATTR_TYPE ); - c->policy = policy; - c->flags |= (1 <<NFT_CHAIN_ATTR_POLICY ); - family =nft_mxml_family_parse (tree,"family" ,MXML_DESCEND_FIRST ); -if (family <0 ) - goto err; +if (nft_mxml_num_parse (tree,"prio" ,MXML_DESCEND ,BASE_DEC , + &c->prio,NFT_TYPE_S32 ) !=0 ) + goto err; - c->family = family; - c->flags |= (1 <<NFT_CHAIN_ATTR_FAMILY ); + c->flags |= (1 <<NFT_CHAIN_ATTR_PRIO ); + + policy_str =nft_mxml_str_parse (tree,"policy" ,MXML_DESCEND ); +if (policy_str ==NULL ) + goto err; + + policy =nft_str2verdict (policy_str); +if (policy ==-1 ) + goto err; + + c->policy = policy; + c->flags |= (1 <<NFT_CHAIN_ATTR_POLICY ); + }mxmlDelete (tree);return 0 ;
@@ -747,22 +747,18 @@ static int nft_chain_snprintf_xml(char *buf, size_t size, struct nft_chain *c) ret =snprintf (buf, size,"<chain><name>%s</name>" "<handle>%" PRIu64"</handle><bytes>%" PRIu64"</bytes>" -"<packets>%" PRIu64"</packets><type>%s</type>" -"<table>%s</table><prio>%d</prio>" -"<hooknum>%s</hooknum>" , - c->name, c->handle, c->bytes, c->packets, - c->type, c->table, - c->prio, hooknum2str_array[c->hooknum]); +"<packets>%" PRIu64"</packets><table>%s</table>" , + c->name, c->handle, c->bytes, c->packets, c->table);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -/* The parsing will fail both if there are something different -* than {accept|drop} or if the <policy> node is missing. -*/ -if (c->policy ==NF_ACCEPT ) { - ret =snprintf (buf+offset, size,"<policy>accept</policy>" ); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - }else if (c->policy ==NF_DROP ) { - ret =snprintf (buf+offset, size,"<policy>drop</policy>" ); +if (c->flags & (1 <<NFT_CHAIN_ATTR_HOOKNUM )) { + ret =snprintf (buf+offset, size, +"<type>%s</type>" +"<hooknum>%s</hooknum>" +"<prio>%d</prio>" +"<policy>%s</policy>" , + c->type, hooknum2str_array[c->hooknum], c->prio, +nft_verdict2str (c->policy));SNPRINTF_BUFFER_SIZE (ret, size, len, offset); }
tests/xmlfiles/10-chain.xml +1 -1
@@ -1 +1 @@ -<chain><name>test</name><handle>0</handle><bytes>0</bytes><packets>0</packets><type>filter</type><table>filter</table><prio>0</prio><hooknum>NF_INET_LOCAL_IN</hooknum><policy>accept</policy><family>ip</family></chain> +<chain><name>test</name><handle>0</handle><bytes>0</bytes><packets>0</packets><table>filter</table><type>filter</type><hooknum>NF_INET_LOCAL_IN</hooknum><prio>0</prio><policy>accept</policy><family>ip</family></chain>
tests/xmlfiles/11-chain.xml +1 -1
@@ -1 +1 @@ -<chain><name>test</name><handle>0</handle><bytes>59</bytes><packets>1</packets><type>filter</type><table>filter</table><prio>0</prio><hooknum>NF_INET_FORWARD</hooknum><policy>drop</policy><family>ip6</family></chain> +<chain><name>test</name><handle>0</handle><bytes>59</bytes><packets>1</packets><table>filter</table><type>filter</type><hooknum>NF_INET_FORWARD</hooknum><prio>0</prio><policy>drop</policy><family>ip6</family></chain>
tests/xmlfiles/12-chain.xml +1 -1
@@ -1 +1 @@ -<chain><name>foo</name><handle>100</handle><bytes>59264154979</bytes><packets>2548796325</packets><type>nat</type><table>nat</table><prio>0</prio><hooknum>NF_INET_POST_ROUTING</hooknum><policy>accept</policy><family>ip</family></chain> +<chain><name>foo</name><handle>100</handle><bytes>59264154979</bytes><packets>2548796325</packets><table>nat</table><type>nat</type><hooknum>NF_INET_POST_ROUTING</hooknum><prio>0</prio><policy>accept</policy><family>ip</family></chain>
Pablo Neira Ayuso
maintainerQuoted 4 lines · Arturo Borrero Gonzalez
This patch makes optional print/parse of some attributes of chain objects in XML.
In order to pass nft-parsing-test, some XML nodes are reordered.
Ok, let's put this in the tree, but I want a follow up patch to add a flag to the XML helper parser function. That flag should indicate if an element is optional or not.