allow base integer type in concatenation
Florian Westphal
maintainercover allow base integer type in concatenation
Now that we have typeof support for set keys there is no longer a technical reason to reject use of datatypes with a zero size provided that the set key concatenation can be used to retrieve a size instead.
This allows to use e.g. "ipsec in reqid" in a concatenated set key.
Florian Westphal (2):
src: allow use of base integer types as set keys in concatenations
tests: add concat test case with integer base type subkey
src/evaluate.c | 24 +++++++++++++------ .../testcases/maps/dumps/typeof_maps_0.nft | 6 +++++ tests/shell/testcases/maps/typeof_maps_0 | 6 +++++ .../testcases/sets/dumps/typeof_sets_0.nft | 9 +++++++ tests/shell/testcases/sets/typeof_sets_0 | 9 +++++++ 5 files changed, 47 insertions(+), 7 deletions(-)
Signature · 1 line
2.35.1
Florian Westphal
maintainerPATCH 1/2 src: allow use of base integer types as set keys in concatenations
"typeof ip saddr . ipsec in reqid" won't work because reqid uses integer type, i.e. dtype->size is 0.
With "typeof", the size can be derived from the expression length, via set->key.
This computes the concat length based either on dtype->size or expression length.
It also updates concat evaluation to permit a zero datatype size if the subkey expression has nonzero length (i.e., typeof was used).
--- src/evaluate.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
src/evaluate.c +17 -7
@@ -1270,7 +1270,8 @@ static int expr_evaluate_concat(struct eval_ctx *ctx, struct expr **expr) }list_for_each_entry_safe (i, next, &(*expr)->expressions, list) { -unsigned dsize_bytes; +enum byteorder bo =BYTEORDER_INVALID ; +unsigned dsize_bytes, dsize =0 ; if (i->etype == EXPR_CT && (i->ct.key == NFT_CT_SRC ||
@@ -1286,14 +1287,18 @@ static int expr_evaluate_concat(struct eval_ctx *ctx, struct expr **expr)if (key) { tmp = key->dtype; + dsize = key->len; + bo = key->byteorder; off--; }else if (dtype ==NULL ) { tmp =datatype_lookup (TYPE_INVALID ); }else { tmp =concat_subtype_lookup (type, --off); + dsize = tmp->size; + bo = tmp->byteorder; } -expr_set_context (&ctx->ectx, tmp, tmp->size); +__expr_set_context (&ctx->ectx, tmp, bo, dsize,0 );if (list_member_evaluate (ctx, &i) <0 )return -1 ;
@@ -1315,12 +1320,14 @@ static int expr_evaluate_concat(struct eval_ctx *ctx, struct expr **expr)"data types (%s) in concat " "expressions" , i->dtype->name); +if (dsize ==0 )/* reload after evaluation or clone above */ + dsize = i->dtype->size; ntype =concat_subtype_add (ntype, i->dtype->type); - dsize_bytes =div_round_up (i->dtype->size,BITS_PER_BYTE ); + dsize_bytes =div_round_up (dsize,BITS_PER_BYTE ); (*expr)->field_len[(*expr)->field_count++] = dsize_bytes; - size +=netlink_padded_len (i->dtype->size); + size +=netlink_padded_len (dsize);if (key) key =list_next_entry (key, list); }
@@ -4046,20 +4053,23 @@ static int set_expr_evaluate_concat(struct eval_ctx *ctx, struct expr **expr) i->dtype = dtype; } -if (i->dtype->size ==0 ) +if (i->dtype->size ==0 && i->len ==0 )return expr_binary_error (ctx->msgs, i, *expr,"can not use variable sized " "data types (%s) in concat " "expressions" , i->dtype->name); +if (i->dtype->size) +assert (i->len == i->dtype->size); + flags &= i->flags; ntype =concat_subtype_add (ntype, i->dtype->type); - dsize_bytes =div_round_up (i->dtype->size,BITS_PER_BYTE ); + dsize_bytes =div_round_up (i->len,BITS_PER_BYTE ); (*expr)->field_len[(*expr)->field_count++] = dsize_bytes; - size +=netlink_padded_len (i->dtype->size); + size +=netlink_padded_len (i->len); } (*expr)->flags |= flags;
Signature · 1 line
2.35.1
Florian Westphal
maintainerPATCH 2/2 tests: add concat test case with integer base type subkey
In reply to Florian Westphal--- tests/shell/testcases/maps/dumps/typeof_maps_0.nft | 6 ++++++ tests/shell/testcases/maps/typeof_maps_0 | 6 ++++++ tests/shell/testcases/sets/dumps/typeof_sets_0.nft | 9 +++++++++ tests/shell/testcases/sets/typeof_sets_0 | 9 +++++++++ 4 files changed, 30 insertions(+)
tests/shell/testcases/maps/dumps/typeof_maps_0.nft +6 -0
@@ -20,11 +20,17 @@ table inet t { elements = { "eth0" . tcp . 22 : accept } } + map m5 { + typeof ipsec in reqid . iifname : verdict + elements = { 23 . "eth0" : accept } + } + chain c { ct mark set osf name map @m1 meta mark set vlan id map @m2 meta mark set ip saddr . ip daddr map @m3 iifname . ip protocol . th dport vmap @m4 iifname . ip protocol . th dport vmap { "eth0" . tcp . 22 : accept, "eth1" . udp . 67 : drop } + ipsec in reqid . iifname vmap @m5 } }
tests/shell/testcases/maps/typeof_maps_0 +6 -0
@@ -27,12 +27,18 @@ EXPECTED="table inet t { elements = { eth0 . tcp . 22 : accept } } + map m5 { + typeof ipsec in reqid . meta iifname : verdict + elements = { 23 . eth0 : accept } + } + chain c { ct mark set osf name map @m1 ether type vlan meta mark set vlan id map @m2 meta mark set ip saddr . ip daddr map @m3 iifname . ip protocol . th dport vmap @m4 iifname . ip protocol . th dport vmap { \"eth0\" . tcp . 22 : accept, \"eth1\" . udp . 67 : drop } + ipsec in reqid . meta iifname vmap @m5 } }"
tests/shell/testcases/sets/dumps/typeof_sets_0.nft +9 -0
@@ -45,6 +45,11 @@ table inet t { 15 } } + set s10 { + typeof iifname . ip saddr . ipsec in reqid + elements = { "eth0" . 10.1.1.2 . 42 } + } + chain c1 { osf name @s1 accept }
@@ -76,4 +81,8 @@ table inet t { chain c9 { ip hdrlength @s9 accept } + + chain c10 { + iifname . ip saddr . ipsec in reqid @s10 accept + } }
tests/shell/testcases/sets/typeof_sets_0 +9 -0
@@ -50,6 +50,11 @@ EXPECTED="table inet t { elements = { 0, 1, 2, 3, 4, 15 } } + set s10 { + typeof meta iifname . ip saddr . ipsec in reqid + elements = { \"eth0\" . 10.1.1.2 . 42 } + } + chain c1 { osf name @s1 accept }
@@ -81,6 +86,10 @@ EXPECTED="table inet t { chain c9 { ip hdrlength @s9 accept } + + chain c10 { + meta iifname . ip saddr . ipsec in reqid @s10 accept + } }" set -e
Signature · 1 line
2.35.1