diff options
| author | Florian Westphal <fw@strlen.de> | 2021-03-11 14:23:10 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2021-03-16 23:59:44 +0100 |
| commit | eae252568525225102ccc2ad856e4e9d33e1b8ca (patch) | |
| tree | 8ae82b524bfc58a91028046961e9bff57624620a /src/parser_bison.y | |
| parent | b775b928fdbd97053465e4f9eae5c4d653bdb8c3 (diff) | |
scanner: limit: move to own scope
Moves rate and burst out of INITIAL.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/parser_bison.y')
| -rw-r--r-- | src/parser_bison.y | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index a6ce506b..67afc32a 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -870,6 +870,7 @@ close_scope_ip : { scanner_pop_start_cond(nft->scanner, PARSER_SC_IP); }; close_scope_ip6 : { scanner_pop_start_cond(nft->scanner, PARSER_SC_IP6); }; close_scope_vlan : { scanner_pop_start_cond(nft->scanner, PARSER_SC_VLAN); }; close_scope_ipsec : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_IPSEC); }; +close_scope_limit : { scanner_pop_start_cond(nft->scanner, PARSER_SC_LIMIT); }; close_scope_numgen : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_NUMGEN); }; close_scope_queue : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_QUEUE); }; close_scope_rt : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_RT); }; @@ -1057,11 +1058,11 @@ add_cmd : TABLE table_spec { $$ = cmd_alloc_obj_ct(CMD_ADD, NFT_OBJECT_CT_EXPECT, &$3, &@$, $4); } - | LIMIT obj_spec limit_obj limit_config + | LIMIT obj_spec limit_obj limit_config close_scope_limit { $$ = cmd_alloc(CMD_ADD, CMD_OBJ_LIMIT, &$2, &@$, $3); } - | LIMIT obj_spec limit_obj '{' limit_block '}' + | LIMIT obj_spec limit_obj '{' limit_block '}' close_scope_limit { $$ = cmd_alloc(CMD_ADD, CMD_OBJ_LIMIT, &$2, &@$, $3); } @@ -1166,7 +1167,7 @@ create_cmd : TABLE table_spec { $$ = cmd_alloc_obj_ct(CMD_CREATE, NFT_OBJECT_CT_EXPECT, &$3, &@$, $4); } - | LIMIT obj_spec limit_obj limit_config + | LIMIT obj_spec limit_obj limit_config close_scope_limit { $$ = cmd_alloc(CMD_CREATE, CMD_OBJ_LIMIT, &$2, &@$, $3); } @@ -1253,7 +1254,7 @@ delete_cmd : TABLE table_or_id_spec { $$ = cmd_alloc_obj_ct(CMD_DELETE, $2, &$3, &@$, $4); } - | LIMIT obj_or_id_spec + | LIMIT obj_or_id_spec close_scope_limit { $$ = cmd_alloc(CMD_DELETE, CMD_OBJ_LIMIT, &$2, &@$, NULL); } @@ -1333,7 +1334,7 @@ list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_LIMITS, &$3, &@$, NULL); } - | LIMIT obj_spec + | LIMIT obj_spec close_scope_limit { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_LIMIT, &$2, &@$, NULL); } @@ -1667,7 +1668,7 @@ table_block : /* empty */ { $$ = $<table>-1; } } | table_block LIMIT obj_identifier obj_block_alloc '{' limit_block '}' - stmt_separator + stmt_separator close_scope_limit { $4->location = @3; $4->type = NFT_OBJECT_LIMIT; @@ -1880,7 +1881,7 @@ map_block_alloc : /* empty */ map_block_obj_type : COUNTER { $$ = NFT_OBJECT_COUNTER; } | QUOTA { $$ = NFT_OBJECT_QUOTA; } - | LIMIT { $$ = NFT_OBJECT_LIMIT; } + | LIMIT close_scope_limit { $$ = NFT_OBJECT_LIMIT; } | SECMARK { $$ = NFT_OBJECT_SECMARK; } ; @@ -3045,7 +3046,7 @@ log_flag_tcp : SEQUENCE } ; -limit_stmt : LIMIT RATE limit_mode NUM SLASH time_unit limit_burst_pkts +limit_stmt : LIMIT RATE limit_mode NUM SLASH time_unit limit_burst_pkts close_scope_limit { if ($7 == 0) { erec_queue(error(&@7, "limit burst must be > 0"), @@ -3059,7 +3060,7 @@ limit_stmt : LIMIT RATE limit_mode NUM SLASH time_unit limit_burst_pkts $$->limit.type = NFT_LIMIT_PKTS; $$->limit.flags = $3; } - | LIMIT RATE limit_mode NUM STRING limit_burst_bytes + | LIMIT RATE limit_mode NUM STRING limit_burst_bytes close_scope_limit { struct error_record *erec; uint64_t rate, unit; @@ -3084,7 +3085,7 @@ limit_stmt : LIMIT RATE limit_mode NUM SLASH time_unit limit_burst_pkts $$->limit.type = NFT_LIMIT_PKT_BYTES; $$->limit.flags = $3; } - | LIMIT NAME stmt_expr + | LIMIT NAME stmt_expr close_scope_limit { $$ = objref_stmt_alloc(&@$); $$->objref.type = NFT_OBJECT_LIMIT; @@ -4140,7 +4141,7 @@ set_elem_stmt : COUNTER $$->counter.packets = $3; $$->counter.bytes = $5; } - | LIMIT RATE limit_mode NUM SLASH time_unit limit_burst_pkts + | LIMIT RATE limit_mode NUM SLASH time_unit limit_burst_pkts close_scope_limit { if ($7 == 0) { erec_queue(error(&@7, "limit burst must be > 0"), @@ -4154,7 +4155,7 @@ set_elem_stmt : COUNTER $$->limit.type = NFT_LIMIT_PKTS; $$->limit.flags = $3; } - | LIMIT RATE limit_mode NUM STRING limit_burst_bytes + | LIMIT RATE limit_mode NUM STRING limit_burst_bytes close_scope_limit { struct error_record *erec; uint64_t rate, unit; |