* [libnftables PATCH] data_reg: Add generic interface for parsing: nft_data_reg_parse().
@ 2013-05-28 15:06 Arturo Borrero
2013-05-29 12:16 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Arturo Borrero @ 2013-05-28 15:06 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo
This was missing in previous patches, but was the original intention.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
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(-)
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 9ebe3dc..1c7198b 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -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;
diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 673f3e0..bf285d5 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -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;
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index be2b47a..5ebc1de 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -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)
diff --git a/src/expr/data_reg.h b/src/expr/data_reg.h
index 1552c1e..0a290a8 100644
--- a/src/expr/data_reg.h
+++ b/src/expr/data_reg.h
@@ -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
diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index 7cfb4bf..f10a785 100644
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -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;
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [libnftables PATCH] data_reg: Add generic interface for parsing: nft_data_reg_parse().
2013-05-28 15:06 [libnftables PATCH] data_reg: Add generic interface for parsing: nft_data_reg_parse() Arturo Borrero
@ 2013-05-29 12:16 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2013-05-29 12:16 UTC (permalink / raw)
To: Arturo Borrero; +Cc: netfilter-devel
On Tue, May 28, 2013 at 05:06:40PM +0200, Arturo Borrero wrote:
> 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.
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
> ---
> 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(-)
>
> diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
> index 9ebe3dc..1c7198b 100644
> --- a/src/expr/bitwise.c
> +++ b/src/expr/bitwise.c
> @@ -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;
> diff --git a/src/expr/cmp.c b/src/expr/cmp.c
> index 673f3e0..bf285d5 100644
> --- a/src/expr/cmp.c
> +++ b/src/expr/cmp.c
> @@ -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;
> diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
> index be2b47a..5ebc1de 100644
> --- a/src/expr/data_reg.c
> +++ b/src/expr/data_reg.c
> @@ -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)
> diff --git a/src/expr/data_reg.h b/src/expr/data_reg.h
> index 1552c1e..0a290a8 100644
> --- a/src/expr/data_reg.h
> +++ b/src/expr/data_reg.h
> @@ -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
> diff --git a/src/expr/immediate.c b/src/expr/immediate.c
> index 7cfb4bf..f10a785 100644
> --- a/src/expr/immediate.c
> +++ b/src/expr/immediate.c
> @@ -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;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-29 12:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-28 15:06 [libnftables PATCH] data_reg: Add generic interface for parsing: nft_data_reg_parse() Arturo Borrero
2013-05-29 12:16 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).