[PATCH libnftnl 0/1] Bitwise dump format fix.

[PATCH libnftnl 0/1] Bitwise dump format fix.

[Jeremy Sowden]

The dumping of bitwise operations looks like:

  [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ]

instead of:

  [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ]

which offends my sense of neatness. :) I have a follow-up patch to fix the
payloads of the nft Python tests that this change breaks.  Are there other
things that might be affected?

Jeremy Sowden (1):
  bitwise: improve formatting of registers in bitwise dumps.

 src/expr/bitwise.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.29.2

[PATCH libnftnl 1/1] bitwise: improve formatting of registers in bitwise dumps.

[Jeremy Sowden]

Registers are formatted as 'reg %u' everywhere apart from in bitwise
expressions where they are formatted as 'reg=%u'.  Change bitwise to
match.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 src/expr/bitwise.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 9ea2f662b3e6..ba379a84485e 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -215,7 +215,7 @@ nftnl_expr_bitwise_snprintf_bool(char *buf, size_t size,
 {
 	int remain = size, offset = 0, ret;
 
-	ret = snprintf(buf, remain, "reg %u = (reg=%u & ",
+	ret = snprintf(buf, remain, "reg %u = ( reg %u & ",
 		       bitwise->dreg, bitwise->sreg);
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
-- 
2.29.2

Re: [PATCH libnftnl 1/1] bitwise: improve formatting of registers in bitwise dumps.

[Pablo Neira Ayuso]

On Sat, Nov 14, 2020 at 05:36:05PM +0000, Jeremy Sowden wrote:
> Registers are formatted as 'reg %u' everywhere apart from in bitwise
> expressions where they are formatted as 'reg=%u'.  Change bitwise to
> match.

LGTM.

But this also needs an update for the nftables tests too, right?

Thanks.

> Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
> ---
>  src/expr/bitwise.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
> index 9ea2f662b3e6..ba379a84485e 100644
> --- a/src/expr/bitwise.c
> +++ b/src/expr/bitwise.c
> @@ -215,7 +215,7 @@ nftnl_expr_bitwise_snprintf_bool(char *buf, size_t size,
>  {
>  	int remain = size, offset = 0, ret;
>  
> -	ret = snprintf(buf, remain, "reg %u = (reg=%u & ",
> +	ret = snprintf(buf, remain, "reg %u = ( reg %u & ",
>  		       bitwise->dreg, bitwise->sreg);
>  	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
>  
> -- 
> 2.29.2
> 

Re: [PATCH libnftnl 1/1] bitwise: improve formatting of registers in bitwise dumps.

[Jeremy Sowden]

[-- Attachment #1: Type: text/plain, Size: 1078 bytes --]

On 2020-11-15, at 12:16:54 +0100, Pablo Neira Ayuso wrote:
> On Sat, Nov 14, 2020 at 05:36:05PM +0000, Jeremy Sowden wrote:
> > Registers are formatted as 'reg %u' everywhere apart from in bitwise
> > expressions where they are formatted as 'reg=%u'.  Change bitwise to
> > match.
>
> LGTM.
>
> But this also needs an update for the nftables tests too, right?

Yup, I'll send it now.

J.

> Thanks.
>
> > Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
> > ---
> >  src/expr/bitwise.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
> > index 9ea2f662b3e6..ba379a84485e 100644
> > --- a/src/expr/bitwise.c
> > +++ b/src/expr/bitwise.c
> > @@ -215,7 +215,7 @@ nftnl_expr_bitwise_snprintf_bool(char *buf, size_t size,
> >  {
> >  	int remain = size, offset = 0, ret;
> >
> > -	ret = snprintf(buf, remain, "reg %u = (reg=%u & ",
> > +	ret = snprintf(buf, remain, "reg %u = ( reg %u & ",
> >  		       bitwise->dreg, bitwise->sreg);
> >  	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
> >
> > --
> > 2.29.2
> >
>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]