diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/parser_bison.y | 14 | ||||
| -rw-r--r-- | src/statement.c | 11 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index 6b87ece5..c25af6ba 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -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 diff --git a/src/statement.c b/src/statement.c index 97b163e8..03c0acf6 100644 --- a/src/statement.c +++ b/src/statement.c @@ -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"); } } |