data_reg: Add generic interface for parsing: nft_data_reg_parse().
PATCH 1/1 data_reg: Add generic interface for parsing: nft_data_reg_parse().
This was missing in previous patches, but was the original intention.
Signed-off-by Arturo Borrero Gonzalez <[email protected]>
--- src/expr/bitwise.c | 4 ++-- src/expr/cmp.c | 2 +- src/expr/data_reg.c | 18 +++++++++++++++++- src/expr/data_reg.h | 10 +++++++++- src/expr/immediate.c | 2 +- 5 files changed, 30 insertions(+), 6 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 +17 -1
@@ -225,7 +225,7 @@ static int nft_data_reg_value_xml_parse(union nft_data_reg *reg, char *xml)#endif } -int nft_data_reg_xml_parse (union nft_data_reg *reg,char *xml) +static int nft_data_reg_xml_parse (union nft_data_reg *reg,char *xml) {#ifdef XML_PARSING mxml_node_t *node =NULL ;
@@ -267,6 +267,22 @@ int nft_data_reg_xml_parse(union nft_data_reg *reg, char *xml)#endif } +int nft_data_reg_parse (union nft_data_reg *reg, +enum nft_data_reg_parse_type type,char *data) { +int ret; + +switch (type) { +case NFT_DATA_REG_PARSE_XML : + ret =nft_data_reg_xml_parse (reg, data); +break ; +default : + errno =EOPNOTSUPP ; + ret =-1 ; + } + +return ret; +} +static int nft_data_reg_value_snprintf_xml (char *buf,size_t size,union nft_data_reg *reg,uint32_t flags)
src/expr/data_reg.h +9 -1
@@ -20,7 +20,15 @@ union nft_data_reg {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); + +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_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
maintainerQuoted 1 line · Arturo Borrero
This was missing in previous patches, but was the original intention.
Not sure what we get with this patch.
nft_rule_expr_bitwise_xml_parse can be used internally from libnftables. So unless I'm missing anything, the current code looks good to me.
Quoted 115 lines
Signed-off-by Arturo Borrero Gonzalez <[email protected]>--- src/expr/bitwise.c | 4 ++-- src/expr/cmp.c | 2 +- src/expr/data_reg.c | 18 +++++++++++++++++- src/expr/data_reg.h | 10 +++++++++- src/expr/immediate.c | 2 +- 5 files changed, 30 insertions(+), 6 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 +17
-1@@ -225,7 +225,7 @@ static int nft_data_reg_value_xml_parse(union nft_data_reg *reg, char *xml)#endif } -int nft_data_reg_xml_parse (union nft_data_reg *reg,char *xml) +static int nft_data_reg_xml_parse (union nft_data_reg *reg,char *xml) {#ifdef XML_PARSING mxml_node_t *node =NULL ;@@ -267,6 +267,22 @@ int nft_data_reg_xml_parse(union nft_data_reg *reg, char *xml)#endif } +int nft_data_reg_parse (union nft_data_reg *reg, +enum nft_data_reg_parse_type type,char *data) { +int ret; + +switch (type) { +case NFT_DATA_REG_PARSE_XML : + ret =nft_data_reg_xml_parse (reg, data); +break ; +default : + errno =EOPNOTSUPP ; + ret =-1 ; + } + +return ret; +} +static int nft_data_reg_value_snprintf_xml (char *buf,size_t size,union nft_data_reg *reg,uint32_t flags)src/expr/data_reg.h +9
-1@@ -20,7 +20,15 @@ union nft_data_reg {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); + +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_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 ;