* [PATCH libnftnl] Fix compilation with JSON and XML parsing enabled
@ 2015-10-09 19:21 Vijay Subramanian
2015-10-09 20:08 ` Aaron Conole
2015-10-12 16:14 ` Pablo Neira Ayuso
0 siblings, 2 replies; 5+ messages in thread
From: Vijay Subramanian @ 2015-10-09 19:21 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo, kaber, Vijay Subramanian
Fix missing/incorrect variables.
Also remove unsed variables to avoid warnings.
Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
---
src/expr/dup.c | 13 +++++--------
src/expr/limit.c | 2 +-
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/expr/dup.c b/src/expr/dup.c
index d0fa35f..217450a 100644
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
@@ -115,18 +115,16 @@ static int nftnl_expr_dup_json_parse(struct nftnl_expr *e, json_t *root,
struct nftnl_parse_err *err)
{
#ifdef JSON_PARSING
- struct nftnl_expr_dup *dup = nftnl_expr_data(e);
uint32_t sreg_addr, sreg_dev;
- int datareg_type;
+ int ret = 0;
- ret = nftnl_jansson_parse_val(root, "sreg_addr", NFT_TYPE_U32, &sreg_addr, err);
+ ret = nftnl_jansson_parse_val(root, "sreg_addr", NFTNL_TYPE_U32, &sreg_addr, err);
if (ret >= 0)
nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_addr);
- ret = nftnl_jansson_parse_val(root, "sreg_dev", NFT_TYPE_U32, &sreg_dev, err);
+ ret = nftnl_jansson_parse_val(root, "sreg_dev", NFTNL_TYPE_U32, &sreg_dev, err);
if (ret >= 0)
nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev);
-
return 0;
#else
errno = EOPNOTSUPP;
@@ -138,14 +136,13 @@ static int nftnl_expr_dup_xml_parse(struct nftnl_expr *e, mxml_node_t *tree,
struct nftnl_parse_err *err)
{
#ifdef XML_PARSING
- struct nftnl_expr_dup *dup = nftnl_expr_data(e);
uint32_t sreg_addr, sreg_dev;
if (nftnl_mxml_reg_parse(tree, "sreg_addr", &sreg_addr, MXML_DESCEND_FIRST,
- NFT_XML_OPT, err) == 0)
+ NFTNL_XML_OPT, err) == 0)
nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_ADDR, sreg_addr);
if (nftnl_mxml_reg_parse(tree, "sreg_dev", &sreg_dev, MXML_DESCEND_FIRST,
- NFT_XML_OPT, err) == 0)
+ NFTNL_XML_OPT, err) == 0)
nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev);
return 0;
diff --git a/src/expr/limit.c b/src/expr/limit.c
index ef7c17f..ab9ceff 100644
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -189,7 +189,7 @@ static int nftnl_expr_limit_xml_parse(struct nftnl_expr *e,
&burst, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0)
nftnl_expr_set_u32(e, NFTNL_EXPR_LIMIT_BURST, burst);
if (nftnl_mxml_num_parse(tree, "type", MXML_DESCEND_FIRST, BASE_DEC,
- &burst, NFT_TYPE_U32, NFTNL_XML_MAND, err) == 0)
+ &type, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0)
nftnl_expr_set_u32(e, NFTNL_EXPR_LIMIT_TYPE, type);
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH libnftnl] Fix compilation with JSON and XML parsing enabled
2015-10-09 19:21 [PATCH libnftnl] Fix compilation with JSON and XML parsing enabled Vijay Subramanian
@ 2015-10-09 20:08 ` Aaron Conole
2015-10-09 20:11 ` Aaron Conole
2015-10-12 16:14 ` Pablo Neira Ayuso
1 sibling, 1 reply; 5+ messages in thread
From: Aaron Conole @ 2015-10-09 20:08 UTC (permalink / raw)
To: Vijay Subramanian; +Cc: netfilter-devel, pablo, kaber
Hi Vijay,
Vijay Subramanian <subramanian.vijay@gmail.com> writes:
> Fix missing/incorrect variables.
> Also remove unsed variables to avoid warnings.
>
> Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
> ---
> src/expr/dup.c | 13 +++++--------
> src/expr/limit.c | 2 +-
> 2 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/src/expr/dup.c b/src/expr/dup.c
> index d0fa35f..217450a 100644
> --- a/src/expr/dup.c
> +++ b/src/expr/dup.c
> @@ -115,18 +115,16 @@ static int nftnl_expr_dup_json_parse(struct nftnl_expr *e, json_t *root,
> struct nftnl_parse_err *err)
> {
> #ifdef JSON_PARSING
> - struct nftnl_expr_dup *dup = nftnl_expr_data(e);
> uint32_t sreg_addr, sreg_dev;
> - int datareg_type;
> + int ret = 0;
>
> - ret = nftnl_jansson_parse_val(root, "sreg_addr", NFT_TYPE_U32, &sreg_addr, err);
> + ret = nftnl_jansson_parse_val(root, "sreg_addr", NFTNL_TYPE_U32, &sreg_addr, err);
> if (ret >= 0)
> nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_addr);
> - ret = nftnl_jansson_parse_val(root, "sreg_dev", NFT_TYPE_U32, &sreg_dev, err);
> + ret = nftnl_jansson_parse_val(root, "sreg_dev", NFTNL_TYPE_U32, &sreg_dev, err);
> if (ret >= 0)
> nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev);
>
> -
> return 0;
> #else
> errno = EOPNOTSUPP;
> @@ -138,14 +136,13 @@ static int nftnl_expr_dup_xml_parse(struct nftnl_expr *e, mxml_node_t *tree,
> struct nftnl_parse_err *err)
> {
> #ifdef XML_PARSING
> - struct nftnl_expr_dup *dup = nftnl_expr_data(e);
> uint32_t sreg_addr, sreg_dev;
>
> if (nftnl_mxml_reg_parse(tree, "sreg_addr", &sreg_addr, MXML_DESCEND_FIRST,
> - NFT_XML_OPT, err) == 0)
> + NFTNL_XML_OPT, err) == 0)
> nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_ADDR, sreg_addr);
> if (nftnl_mxml_reg_parse(tree, "sreg_dev", &sreg_dev, MXML_DESCEND_FIRST,
> - NFT_XML_OPT, err) == 0)
> + NFTNL_XML_OPT, err) == 0)
> nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev);
>
> return 0;
> diff --git a/src/expr/limit.c b/src/expr/limit.c
> index ef7c17f..ab9ceff 100644
> --- a/src/expr/limit.c
> +++ b/src/expr/limit.c
> @@ -189,7 +189,7 @@ static int nftnl_expr_limit_xml_parse(struct nftnl_expr *e,
> &burst, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0)
> nftnl_expr_set_u32(e, NFTNL_EXPR_LIMIT_BURST, burst);
> if (nftnl_mxml_num_parse(tree, "type", MXML_DESCEND_FIRST, BASE_DEC,
> - &burst, NFT_TYPE_U32, NFTNL_XML_MAND, err) == 0)
> + &type, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0)
> nftnl_expr_set_u32(e, NFTNL_EXPR_LIMIT_TYPE, type);
>
> return 0;
I've posted a patch already which fixes the json parsing
(http://www.spinics.net/lists/netfilter-devel/msg38621.html)
I did not configure with XML parsing.
-Aaron
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH libnftnl] Fix compilation with JSON and XML parsing enabled
2015-10-09 20:08 ` Aaron Conole
@ 2015-10-09 20:11 ` Aaron Conole
2015-10-09 22:08 ` Vijay Subramanian
0 siblings, 1 reply; 5+ messages in thread
From: Aaron Conole @ 2015-10-09 20:11 UTC (permalink / raw)
To: Vijay Subramanian; +Cc: netfilter-devel, pablo, kaber
Aaron Conole <aconole@redhat.com> writes:
> Hi Vijay,
>
> Vijay Subramanian <subramanian.vijay@gmail.com> writes:
>
>> Fix missing/incorrect variables.
>> Also remove unsed variables to avoid warnings.
>>
>> Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
>> ---
>> src/expr/dup.c | 13 +++++--------
>> src/expr/limit.c | 2 +-
>> 2 files changed, 6 insertions(+), 9 deletions(-)
>>
>> diff --git a/src/expr/dup.c b/src/expr/dup.c
>> index d0fa35f..217450a 100644
>> --- a/src/expr/dup.c
>> +++ b/src/expr/dup.c
>> @@ -115,18 +115,16 @@ static int nftnl_expr_dup_json_parse(struct nftnl_expr *e, json_t *root,
>> struct nftnl_parse_err *err)
>> {
>> #ifdef JSON_PARSING
>> - struct nftnl_expr_dup *dup = nftnl_expr_data(e);
>> uint32_t sreg_addr, sreg_dev;
>> - int datareg_type;
>> + int ret = 0;
>>
>> - ret = nftnl_jansson_parse_val(root, "sreg_addr", NFT_TYPE_U32, &sreg_addr, err);
>> + ret = nftnl_jansson_parse_val(root, "sreg_addr", NFTNL_TYPE_U32, &sreg_addr, err);
>> if (ret >= 0)
>> nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_addr);
>> - ret = nftnl_jansson_parse_val(root, "sreg_dev", NFT_TYPE_U32, &sreg_dev, err);
>> + ret = nftnl_jansson_parse_val(root, "sreg_dev", NFTNL_TYPE_U32, &sreg_dev, err);
>> if (ret >= 0)
>> nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev);
>>
>> -
>> return 0;
>> #else
>> errno = EOPNOTSUPP;
>> @@ -138,14 +136,13 @@ static int nftnl_expr_dup_xml_parse(struct nftnl_expr *e, mxml_node_t *tree,
>> struct nftnl_parse_err *err)
>> {
>> #ifdef XML_PARSING
>> - struct nftnl_expr_dup *dup = nftnl_expr_data(e);
>> uint32_t sreg_addr, sreg_dev;
>>
>> if (nftnl_mxml_reg_parse(tree, "sreg_addr", &sreg_addr, MXML_DESCEND_FIRST,
>> - NFT_XML_OPT, err) == 0)
>> + NFTNL_XML_OPT, err) == 0)
>> nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_ADDR, sreg_addr);
>> if (nftnl_mxml_reg_parse(tree, "sreg_dev", &sreg_dev, MXML_DESCEND_FIRST,
>> - NFT_XML_OPT, err) == 0)
>> + NFTNL_XML_OPT, err) == 0)
>> nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev);
>>
>> return 0;
>> diff --git a/src/expr/limit.c b/src/expr/limit.c
>> index ef7c17f..ab9ceff 100644
>> --- a/src/expr/limit.c
>> +++ b/src/expr/limit.c
>> @@ -189,7 +189,7 @@ static int nftnl_expr_limit_xml_parse(struct nftnl_expr *e,
>> &burst, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0)
>> nftnl_expr_set_u32(e, NFTNL_EXPR_LIMIT_BURST, burst);
>> if (nftnl_mxml_num_parse(tree, "type", MXML_DESCEND_FIRST, BASE_DEC,
>> - &burst, NFT_TYPE_U32, NFTNL_XML_MAND, err) == 0)
>> + &type, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0)
>> nftnl_expr_set_u32(e, NFTNL_EXPR_LIMIT_TYPE, type);
>>
>> return 0;
>
> I've posted a patch already which fixes the json parsing
> (http://www.spinics.net/lists/netfilter-devel/msg38621.html)
>
> I did not configure with XML parsing.
>
Apologies, I used the wrong link.
http://www.spinics.net/lists/netfilter-devel/msg38849.html
-Aaron
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH libnftnl] Fix compilation with JSON and XML parsing enabled
2015-10-09 20:11 ` Aaron Conole
@ 2015-10-09 22:08 ` Vijay Subramanian
0 siblings, 0 replies; 5+ messages in thread
From: Vijay Subramanian @ 2015-10-09 22:08 UTC (permalink / raw)
To: Aaron Conole, netfilter-devel, Pablo Neira Ayuso, Patrick McHardy
> http://www.spinics.net/lists/netfilter-devel/msg38849.html
>
> -Aaron
Aaron,
Somehow, your patch never made it to my inbox. Sorry I missed it.
Once your patch is applied, I will resend mine with the other changes.
Vijay
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH libnftnl] Fix compilation with JSON and XML parsing enabled
2015-10-09 19:21 [PATCH libnftnl] Fix compilation with JSON and XML parsing enabled Vijay Subramanian
2015-10-09 20:08 ` Aaron Conole
@ 2015-10-12 16:14 ` Pablo Neira Ayuso
1 sibling, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2015-10-12 16:14 UTC (permalink / raw)
To: Vijay Subramanian; +Cc: netfilter-devel, kaber, Aaron Conole
On Fri, Oct 09, 2015 at 12:21:07PM -0700, Vijay Subramanian wrote:
> Fix missing/incorrect variables.
> Also remove unsed variables to avoid warnings.
Applied this with minor nit.
> Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
> ---
> src/expr/dup.c | 13 +++++--------
> src/expr/limit.c | 2 +-
> 2 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/src/expr/dup.c b/src/expr/dup.c
> index d0fa35f..217450a 100644
> --- a/src/expr/dup.c
> +++ b/src/expr/dup.c
> @@ -115,18 +115,16 @@ static int nftnl_expr_dup_json_parse(struct nftnl_expr *e, json_t *root,
> struct nftnl_parse_err *err)
> {
> #ifdef JSON_PARSING
> - struct nftnl_expr_dup *dup = nftnl_expr_data(e);
> uint32_t sreg_addr, sreg_dev;
> - int datareg_type;
> + int ret = 0;
No need to initialize this, it will be override by next function call.
> - ret = nftnl_jansson_parse_val(root, "sreg_addr", NFT_TYPE_U32, &sreg_addr, err);
> + ret = nftnl_jansson_parse_val(root, "sreg_addr", NFTNL_TYPE_U32, &sreg_addr, err);
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-12 16:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-09 19:21 [PATCH libnftnl] Fix compilation with JSON and XML parsing enabled Vijay Subramanian
2015-10-09 20:08 ` Aaron Conole
2015-10-09 20:11 ` Aaron Conole
2015-10-09 22:08 ` Vijay Subramanian
2015-10-12 16:14 ` 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).