src: queue: consolidate queue statement syntax
Pablo Neira Ayuso
maintainerPATCH v3 1/1 src: queue: consolidate queue statement syntax
Print queue statement using the 'queue ... to' syntax to consolidate the syntax around Florian's proposal introduced in 6cf0f2c17bfb ("src:
queue: allow use of arbitrary queue expressions").
Retain backward compatibility, 'queue num' syntax is still allowed.
Update and add new tests.
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v3: update tests/shell/testcases/nft-f/dumps/0012different_defines_0.nft
dump file only, leave tests/shell/testcases/nft-f/0012different_defines_0 as is to keep covering of the 'queue num' syntax, requested by Florian.
doc/statements.txt | 4 +- src/parser_bison.y | 14 +++- src/statement.c | 11 +-- tests/py/any/queue.t | 22 ++++-- tests/py/any/queue.t.json | 75 +++++++++++++++++++ tests/py/any/queue.t.payload | 24 ++++++ .../nft-f/dumps/0012different_defines_0.nft | 6 +- 7 files changed, 132 insertions(+), 24 deletions(-)
doc/statements.txt +2 -2
@@ -589,8 +589,8 @@ for details. [verse] ____ -*queue* [*flags* 'QUEUE_FLAGS'] [*num* 'queue_number'] -*queue* [*flags* 'QUEUE_FLAGS'] [*num* 'queue_number_from' - 'queue_number_to'] +*queue* [*flags* 'QUEUE_FLAGS'] [*to* 'queue_number'] +*queue* [*flags* 'QUEUE_FLAGS'] [*to* 'queue_number_from' - 'queue_number_to'] *queue* [*flags* 'QUEUE_FLAGS'] [*to* 'QUEUE_EXPRESSION' ] 'QUEUE_FLAGS' := 'QUEUE_FLAG' [*,* 'QUEUE_FLAGS']
src/parser_bison.y +11 -3
@@ -705,8 +705,8 @@ int nft_lex(void *, void *, void *); %type <stmt> queue_stmt queue_stmt_alloc queue_stmt_compat %destructor { stmt_free($$); } queue_stmt queue_stmt_alloc queue_stmt_compat -%type <expr> queue_stmt_expr_simple queue_stmt_expr reject_with_expr -%destructor { expr_free($$); } queue_stmt_expr_simple queue_stmt_expr reject_with_expr +%type <expr> queue_stmt_expr_simple queue_stmt_expr queue_expr reject_with_expr +%destructor { expr_free($$); } queue_stmt_expr_simple queue_stmt_expr queue_expr reject_with_expr %type <val> queue_stmt_flags queue_stmt_flag %type <stmt> dup_stmt %destructor { stmt_free($$); } dup_stmt
@@ -3790,14 +3790,22 @@ queue_stmt_arg : QUEUENUM queue_stmt_expr_simple } ; +queue_expr : variable_expr + | integer_expr + ; + queue_stmt_expr_simple : integer_expr - | range_rhs_expr | variable_expr + | queue_expr DASH queue_expr + { + $$ = range_expr_alloc(&@$, $1, $3); + } ; queue_stmt_expr : numgen_expr | hash_expr | map_expr + | queue_stmt_expr_simple ; queue_stmt_flags : queue_stmt_flag
src/statement.c +3 -8
@@ -507,15 +507,10 @@ static void queue_stmt_print(const struct stmt *stmt, struct output_ctx *octx)nft_print (octx,"%sfanout" , delim);if (e) { -if (e->etype ==EXPR_VALUE || e->etype ==EXPR_RANGE ) { -nft_print (octx," num " ); -expr_print (stmt->queue.queue, octx); - }else { -nft_print (octx," to " ); -expr_print (stmt->queue.queue, octx); - } +nft_print (octx," to " ); +expr_print (stmt->queue.queue, octx); }else { -nft_print (octx," num 0" ); +nft_print (octx," to 0" ); } }
tests/py/any/queue.t +14 -8
@@ -6,15 +6,15 @@ *arp;test-arp;output *bridge;test-bridge;output -queue;ok;queue num 0 -queue num 2;ok -queue num 65535;ok +queue;ok;queue to 0 +queue num 2;ok;queue to 2 +queue num 65535;ok;queue to 65535 queue num 65536;fail -queue num 2-3;ok -queue num 1-65535;ok -queue num 4-5 fanout bypass;ok;queue flags bypass,fanout num 4-5 -queue num 4-5 fanout;ok;queue flags fanout num 4-5 -queue num 4-5 bypass;ok;queue flags bypass num 4-5 +queue num 2-3;ok;queue to 2-3 +queue num 1-65535;ok;queue to 1-65535 +queue num 4-5 fanout bypass;ok;queue flags bypass,fanout to 4-5 +queue num 4-5 fanout;ok;queue flags fanout to 4-5 +queue num 4-5 bypass;ok;queue flags bypass to 4-5 queue to symhash mod 2 offset 65536;fail queue num symhash mod 65536;fail
@@ -23,6 +23,12 @@ queue flags fanout to symhash mod 65536;fail queue flags bypass,fanout to symhash mod 65536;fail queue flags bypass to numgen inc mod 65536;ok queue to jhash oif . meta mark mod 32;ok +queue to 2;ok +queue to 65535;ok +queue flags bypass to 65535;ok +queue flags bypass to 1-65535;ok +queue flags bypass,fanout to 1-65535;ok +queue to 1-65535;ok queue to oif;fail queue num oif;fail queue flags bypass to oifname map { "eth0" : 0, "ppp0" : 2, "eth1" : 2 };ok
tests/py/any/queue.t.json +75 -0
78 lines not on this page · raw message
tests/py/any/queue.t.payload +24 -0
@@ -55,3 +55,27 @@ ip [ meta load oifname => reg 1 ] [ lookup reg 1 set __map%d dreg 1 ] [ queue sreg_qnum 1 bypass ] + +# queue to 2 +ip + [ queue num 2 ] + +# queue to 65535 +ip + [ queue num 65535 ] + +# queue flags bypass to 65535 +ip + [ queue num 65535 bypass ] + +# queue flags bypass to 1-65535 +ip + [ queue num 1-65535 bypass ] + +# queue flags bypass,fanout to 1-65535 +ip + [ queue num 1-65535 bypass fanout ] + +# queue to 1-65535 +ip + [ queue num 1-65535 ]
tests/shell/testcases/nft-f/dumps/0012different_defines_0.nft +3 -3
@@ -12,9 +12,9 @@ table inet t { ip daddr . iif vmap { 10.0.0.0 . "lo" : accept } tcp dport 100-222 udp dport vmap { 100-222 : accept } - tcp sport 1 tcp dport 1 oifname "foobar" queue flags bypass num 0 - tcp sport 1 tcp dport 1 oifname "foobar" queue num 1-42 - tcp sport 1 tcp dport 1 oifname "foobar" queue flags bypass,fanout num 1-42 + tcp sport 1 tcp dport 1 oifname "foobar" queue flags bypass to 0 + tcp sport 1 tcp dport 1 oifname "foobar" queue to 1-42 + tcp sport 1 tcp dport 1 oifname "foobar" queue flags bypass,fanout to 1-42 tcp sport 1 tcp dport 1 oifname "foobar" queue to symhash mod 2 tcp sport 1 tcp dport 1 oifname "foobar" queue flags bypass to jhash tcp dport . tcp sport mod 4 }
Signature · 1 line
2.20.1