ct: allow numeric conntrack labels
Florian Westphal
maintainerPATCH 1/2 ct: allow numeric conntrack labels
When dumping labels in rule list we try to print a symbolic name. If we don't find one, we print the bit number instead.
This changes nft to also allow use of the number instead of a name when adding ct label rules so that such dumps can also be restored again.
This is similar to other cases, e.g. skuid root vs skuid 0 which are both valid.
--- src/ct.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)
src/ct.c +22 -8
@@ -13,13 +13,14 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> +#include <inttypes.h> #include <string.h> #include <linux/netfilter/nf_tables.h> #include <linux/netfilter/nf_conntrack_common.h> #include <linux/netfilter/nf_conntrack_tuple_common.h> +#include <errno.h> #include <erec.h> #include <expression.h> #include <datatype.h>
@@ -121,6 +122,7 @@ static struct error_record *ct_label_type_parse(const struct expr *sym,const struct symbolic_constant *s;const struct datatype *dtype;uint8_t data[CT_LABEL_BIT_SIZE ]; +uint64_t bit;mpz_t value;for (s = ct_label_tbl->symbols; s->identifier !=NULL ; s++) {
@@ -129,16 +131,28 @@ static struct error_record *ct_label_type_parse(const struct expr *sym, } dtype = sym->dtype; -if (s->identifier ==NULL ) -return error (&sym->location,"%s: could not parse %s \"%s\"" , -CONNLABEL_CONF , dtype->desc, sym->identifier); +if (s->identifier ==NULL ) { +char *ptr; + + errno =0 ; + bit =strtoull (sym->identifier, &ptr,0 ); +if (*ptr) +return error (&sym->location,"%s: could not parse %s \"%s\"" , +CONNLABEL_CONF , dtype->desc, sym->identifier); +if (errno) +return error (&sym->location,"%s: could not parse %s \"%s\": %s" , +CONNLABEL_CONF , dtype->desc, sym->identifier,strerror (errno)); + + }else { + bit = s->value; + } -if (s->value >=CT_LABEL_BIT_SIZE ) -return error (&sym->location,"%s: out of range (%u max)" , - s->identifier, s->value,CT_LABEL_BIT_SIZE ); +if (bit >=CT_LABEL_BIT_SIZE ) +return error (&sym->location,"%s: bit %" PRIu64" out of range (%u max)" , + sym->identifier, bit,CT_LABEL_BIT_SIZE );mpz_init2 (value, dtype->size); -mpz_setbit (value, s->value); +mpz_setbit (value, bit);mpz_export_data (data, value,BYTEORDER_HOST_ENDIAN ,sizeof (data)); *res = constant_expr_alloc(&sym->location, dtype,
Signature · 1 line
2.7.3
Florian Westphal
maintainerPATCH 2/2 ct: display bit number instead of raw value
... and add test cases for ct label.
Currently this dumped 'label 0x2', now 'label 1' would be shown.
This makes add/list behave the same.
--- src/ct.c | 2 +- tests/py/any/ct.t | 4 ++++ tests/py/any/ct.t.payload | 11 +++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-)
src/ct.c +1 -1
@@ -113,7 +113,7 @@ static void ct_label_type_print(const struct expr *expr)return ; }/* can happen when connlabel.conf is altered after rules were added */ -gmp_printf ("0x%Zx" , expr->value); +printf ("%ld\n" , (long )mpz_scan1 (expr->value,0 )); } static struct error_record *ct_label_type_parse(const struct expr *sym,
tests/py/any/ct.t +4 -0
@@ -92,3 +92,7 @@ ct saddr 1.2.3.4;fail ct original mark 42;fail # swapped key and direction ct mark original;fail + +ct label 127;ok +ct label set 127;ok +ct label 128;fail
tests/py/any/ct.t.payload +11 -0
@@ -332,3 +332,14 @@ ip test-ip4 output [ bitwise reg 1 = (reg=1 & 0x00000020 ) ^ 0x00000000 ] [ cmp neq reg 1 0x00000000 ] +# ct label 127 +ip test-ip4 output + [ ct load label => reg 1 ] + [ bitwise reg 1 = (reg=1 & 0x00000000 0x00000000 0x00000000 0x80000000 ) ^ 0x00000000 0x00000000 0x00000000 0x00000000 ] + [ cmp neq reg 1 0x00000000 0x00000000 0x00000000 0x00000000 ] + +# ct label set 127 +ip test-ip4 output + [ immediate reg 1 0x00000000 0x00000000 0x00000000 0x80000000 ] + [ ct set label with reg 1 ] +
Signature · 1 line
2.7.3
Re: [PATCH nft 2/2] ct: display bit number instead of raw value
Quoted 6 lines · Florian Westphal
... and add test cases for ct label.
Currently this dumped 'label0x2', now 'label 1' would be shown.This makes add/list behave the same.
Signed-off-by Florian Westphal <[email protected]>
Quoted 11 lines · Florian Westphal
When dumping labels in rule list we try to print a symbolic name. If we don't find one, we print the bit number instead.
This changes nft to also allow use of the number instead of a name when adding ct label rules so that such dumps can also be restored again.
This is similar to other cases, e.g. skuid root vs skuid 0 which are both valid.
Signed-off-by Florian Westphal <[email protected]>