diff mbox

[libnftnl] Fix compilation with JSON and XML parsing enabled

Message ID 1444418467-18610-1-git-send-email-subramanian.vijay@gmail.com
State Accepted
Delegated to: Pablo Neira
Headers show

Commit Message

Vijay Subramanian Oct. 9, 2015, 7:21 p.m. UTC 
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(-)

Comments

Aaron Conole Oct. 9, 2015, 8:08 p.m. UTC | #1 
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
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Aaron Conole Oct. 9, 2015, 8:11 p.m. UTC | #2 
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
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Vijay Subramanian Oct. 9, 2015, 10:08 p.m. UTC | #3 
> 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
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso Oct. 12, 2015, 4:14 p.m. UTC | #4 
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);

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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;