data_reg: fix XML operations
PATCH 1/1 data_reg: fix XML operations
Several fixes:
* Conditional XML code for snprintf_xml.
I don't think that not having XML support breaks XML printing.
* Add generic interface for parsing: nft_data_reg_parse(). Simply missing in previous patches.
* Fix conditional code in XML parsing functions.
All the XML parsing chunk was conditional but the main function. I think is better to do the conditional compilation by function, returning -1 and setting errno = EOPNOTSUPP.
* Delete trailing space in snprintf_xml " >"
--- src/expr/bitwise.c | 4 ++-- src/expr/cmp.c | 2 +- src/expr/data_reg.c | 42 +++++++++++++++++++++++++++++++----------- src/expr/data_reg.h | 8 +++++++- src/expr/immediate.c | 2 +- 5 files changed, 42 insertions(+), 16 deletions(-)
src/expr/bitwise.c +2 -2
@@ -265,7 +265,7 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, char *xml)/* hack for mxmSaveAllocString to print just the current node */ save = node->next; node->next =NULL ; -if (nft_data_reg_xml_parse (&data_regtmp, +if (nft_data_reg_parse (&data_regtmp,NFT_DATA_REG_PARSE_XML ,mxmlSaveAllocString (node,MXML_NO_CALLBACK )) <0 ) {mxmlDelete (tree);return -1 ;
@@ -287,7 +287,7 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, char *xml)/* hack for mxmSaveAllocString to print just the current node */ save = node->next; node->next =NULL ; -if (nft_data_reg_xml_parse (&data_regtmp, +if (nft_data_reg_parse (&data_regtmp,NFT_DATA_REG_PARSE_XML ,mxmlSaveAllocString (node,MXML_NO_CALLBACK )) <0 ) {mxmlDelete (tree);return -1 ;
src/expr/cmp.c +1 -1
@@ -237,7 +237,7 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, char *xml) save = node->next; node->next =NULL ; -if (nft_data_reg_xml_parse (&data_regtmp, +if (nft_data_reg_parse (&data_regtmp,NFT_DATA_REG_PARSE_XML ,mxmlSaveAllocString (node,MXML_NO_CALLBACK )) <0 ) {mxmlDelete (tree);return -1 ;
src/expr/data_reg.c +31 -11
114 lines not on this page · raw message
src/expr/data_reg.h +7 -1
@@ -18,9 +18,15 @@ union nft_data_reg { }; }; +enum nft_data_reg_parse_type { +NFT_DATA_REG_PARSE_NONE =0 , +NFT_DATA_REG_PARSE_XML , +NFT_DATA_REG_PARSE_MAX , +}; +int nft_data_reg_snprintf (char *buf,size_t size,union nft_data_reg *reg,uint32_t output_format,uint32_t flags,int reg_type); -int nft_data_reg_xml_parse (union nft_data_reg *reg,char *xml); +int nft_data_reg_parse (union nft_data_reg *reg,enum nft_data_reg_parse_type type,char *data);int nft_parse_data (union nft_data_reg *data,struct nlattr *attr,int *type);#endif
src/expr/immediate.c +1 -1
@@ -251,7 +251,7 @@ nft_rule_expr_immediate_xml_parse(struct nft_rule_expr *e, char *xml) save = node->next; node->next =NULL ; -if (nft_data_reg_xml_parse (&data_regtmp, +if (nft_data_reg_parse (&data_regtmp,NFT_DATA_REG_PARSE_XML ,mxmlSaveAllocString (node,MXML_NO_CALLBACK )) <0 ) {mxmlDelete (tree);return -1 ;
Pablo Neira Ayuso
maintainerHi Arturo,
Quoted 5 lines · Arturo Borrero
Several fixes:
* Conditional XML code for
snprintf_xml.
I don't think that not having XML support breaks XML printing.
Quoted 8 lines
* Add generic interface for parsing:
nft_data_reg_parse(). Simply missing in previous patches.* Fix conditional code in XML parsing functions.
All the XML parsing chunk was conditional but the main function. I think is better to do the conditional compilation by function, returning -1 and setting errno = EOPNOTSUPP.* Delete trailing space in
snprintf_xml" >"
I cannot take a patch with four fixes. You have to split them, one for each. Sorry.