[PATCH nft] src: fix compile error due to _UNTIL renamed to _MODULUS in libnftnl

[PATCH nft] src: fix compile error due to _UNTIL renamed to _MODULUS in libnftnl

[Liping Zhang]

From: Liping Zhang <liping.zhang@spreadtrum.com>

In the latest libnftnl, NFTNL_EXPR_NG_UNTIL was renamed to
NFTNL_EXPR_NG_MODULUS, so compile error happened:
  netlink_linearize.c: In function ‘netlink_gen_numgen’:
  netlink_linearize.c:184:26: error: ‘NFTNL_EXPR_NG_UNTIL’ undeclared
  (first use in this function)

Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
---
 src/netlink_delinearize.c | 2 +-
 src/netlink_linearize.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 05edb01..6bb27b6 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -554,7 +554,7 @@ static void netlink_parse_numgen(struct netlink_parse_ctx *ctx,
 	struct expr *expr;
 
 	type  = nftnl_expr_get_u32(nle, NFTNL_EXPR_NG_TYPE);
-	until = nftnl_expr_get_u32(nle, NFTNL_EXPR_NG_UNTIL);
+	until = nftnl_expr_get_u32(nle, NFTNL_EXPR_NG_MODULUS);
 
 	expr = numgen_expr_alloc(loc, type, until);
 	dreg = netlink_parse_register(nle, NFTNL_EXPR_NG_DREG);
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index 5204154..558deb2 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -181,7 +181,7 @@ static void netlink_gen_numgen(struct netlink_linearize_ctx *ctx,
 	nle = alloc_nft_expr("numgen");
 	netlink_put_register(nle, NFTNL_EXPR_NG_DREG, dreg);
 	netlink_put_register(nle, NFTNL_EXPR_NG_TYPE, expr->numgen.type);
-	nftnl_expr_set_u32(nle, NFTNL_EXPR_NG_UNTIL, expr->numgen.mod);
+	nftnl_expr_set_u32(nle, NFTNL_EXPR_NG_MODULUS, expr->numgen.mod);
 	nftnl_rule_add_expr(ctx->nlr, nle);
 }
 
-- 
2.5.5

Re: [PATCH nft] src: fix compile error due to _UNTIL renamed to _MODULUS in libnftnl

[Laura Garcia]

On Sun, Sep 11, 2016 at 04:35:57PM +0800, Liping Zhang wrote:
> From: Liping Zhang <liping.zhang@spreadtrum.com>
> 
> In the latest libnftnl, NFTNL_EXPR_NG_UNTIL was renamed to
> NFTNL_EXPR_NG_MODULUS, so compile error happened:
>   netlink_linearize.c: In function ‘netlink_gen_numgen’:
>   netlink_linearize.c:184:26: error: ‘NFTNL_EXPR_NG_UNTIL’ undeclared
>   (first use in this function)
> 

In order to complete the renaming, NFTA_NG_UNTIL should be changed to
NFTA_NG_MODULUS as well.

> Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
> ---
>  src/netlink_delinearize.c | 2 +-
>  src/netlink_linearize.c   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
> index 05edb01..6bb27b6 100644
> --- a/src/netlink_delinearize.c
> +++ b/src/netlink_delinearize.c
> @@ -554,7 +554,7 @@ static void netlink_parse_numgen(struct netlink_parse_ctx *ctx,
>  	struct expr *expr;
>  
>  	type  = nftnl_expr_get_u32(nle, NFTNL_EXPR_NG_TYPE);
> -	until = nftnl_expr_get_u32(nle, NFTNL_EXPR_NG_UNTIL);
> +	until = nftnl_expr_get_u32(nle, NFTNL_EXPR_NG_MODULUS);
>  
>  	expr = numgen_expr_alloc(loc, type, until);
>  	dreg = netlink_parse_register(nle, NFTNL_EXPR_NG_DREG);
> diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
> index 5204154..558deb2 100644
> --- a/src/netlink_linearize.c
> +++ b/src/netlink_linearize.c
> @@ -181,7 +181,7 @@ static void netlink_gen_numgen(struct netlink_linearize_ctx *ctx,
>  	nle = alloc_nft_expr("numgen");
>  	netlink_put_register(nle, NFTNL_EXPR_NG_DREG, dreg);
>  	netlink_put_register(nle, NFTNL_EXPR_NG_TYPE, expr->numgen.type);
> -	nftnl_expr_set_u32(nle, NFTNL_EXPR_NG_UNTIL, expr->numgen.mod);
> +	nftnl_expr_set_u32(nle, NFTNL_EXPR_NG_MODULUS, expr->numgen.mod);
>  	nftnl_rule_add_expr(ctx->nlr, nle);
>  }
>  
> -- 
> 2.5.5
> 
> 
> --
> 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

Re: [PATCH nft] src: fix compile error due to _UNTIL renamed to _MODULUS in libnftnl

[Liping Zhang]

2016-09-12 17:49 GMT+08:00 Laura Garcia <nevola@gmail.com>:
> On Sun, Sep 11, 2016 at 04:35:57PM +0800, Liping Zhang wrote:
>> From: Liping Zhang <liping.zhang@spreadtrum.com>
>>
>> In the latest libnftnl, NFTNL_EXPR_NG_UNTIL was renamed to
>> NFTNL_EXPR_NG_MODULUS, so compile error happened:
>>   netlink_linearize.c: In function ‘netlink_gen_numgen’:
>>   netlink_linearize.c:184:26: error: ‘NFTNL_EXPR_NG_UNTIL’ undeclared
>>   (first use in this function)
>>
>
> In order to complete the renaming, NFTA_NG_UNTIL should be changed to
> NFTA_NG_MODULUS as well.
>

Yes, I missed it. Although NFTA_NG_XXX is not used in nftables, but I think it's
better to do this in one single patch.