[PATCH nft] ct: direction should be integer, not bitmask

[PATCH nft] ct: direction should be integer, not bitmask

[Florian Westphal]

should always generate cmp op (its enum 0, 1 in kernel).

Note: 'original,reply' will no longer work after this patch.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 src/ct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ct.c b/src/ct.c
index f893df9..79d4666 100644
--- a/src/ct.c
+++ b/src/ct.c
@@ -61,7 +61,7 @@ static const struct datatype ct_dir_type = {
 	.desc		= "conntrack direction",
 	.byteorder	= BYTEORDER_INVALID,
 	.size		= BITS_PER_BYTE,
-	.basetype	= &bitmask_type,
+	.basetype	= &integer_type,
 	.sym_tbl	= &ct_dir_tbl,
 };
 
-- 
1.8.1.5

Re: [PATCH nft] ct: direction should be integer, not bitmask

[Pablo Neira Ayuso]

On Mon, Feb 17, 2014 at 10:05:07PM +0100, Florian Westphal wrote:
> should always generate cmp op (its enum 0, 1 in kernel).
> 
> Note: 'original,reply' will no longer work after this patch.

This is also fixing the bytecode that is generated for:

nft add rule ip filter output ct direction reply counter

ip filter output 54 53
  [ ct load direction => reg 1 ]
  [ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
  [ cmp neq reg 1 0x00000000 ]
  [ counter pkts 0 bytes 0 ]

and the output:

ct direction & reply != original counter packets 0 bytes 0

which doesn't obviously work.

To this:

ip filter output 57 56
  [ ct load direction => reg 1 ]
  [ cmp eq reg 1 0x00000001 ]
  [ counter pkts 0 bytes 0 ]

Feel free to push it. Thanks!

Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>

Re: [PATCH nft] ct: direction should be integer, not bitmask

[Patrick McHardy]

On Mon, Feb 17, 2014 at 10:05:07PM +0100, Florian Westphal wrote:
> should always generate cmp op (its enum 0, 1 in kernel).
> 
> Note: 'original,reply' will no longer work after this patch.

I agree.

> 
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
>  src/ct.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/ct.c b/src/ct.c
> index f893df9..79d4666 100644
> --- a/src/ct.c
> +++ b/src/ct.c
> @@ -61,7 +61,7 @@ static const struct datatype ct_dir_type = {
>  	.desc		= "conntrack direction",
>  	.byteorder	= BYTEORDER_INVALID,
>  	.size		= BITS_PER_BYTE,
> -	.basetype	= &bitmask_type,
> +	.basetype	= &integer_type,
>  	.sym_tbl	= &ct_dir_tbl,
>  };
>  
> -- 
> 1.8.1.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