From 59d184be2d17be0bec5077eb7b0724cdc21ae7aa Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 30 Jul 2021 18:11:51 +0200 Subject: scanner: dup, fwd, tproxy: Move to own scopes With these three scopes in place, keyword 'to' may be isolated. Signed-off-by: Phil Sutter --- src/parser_bison.y | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/parser_bison.y') diff --git a/src/parser_bison.y b/src/parser_bison.y index 428df690..ca5c488c 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -937,12 +937,14 @@ close_scope_ct : { scanner_pop_start_cond(nft->scanner, PARSER_SC_CT); }; close_scope_counter : { scanner_pop_start_cond(nft->scanner, PARSER_SC_COUNTER); }; close_scope_dccp : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_DCCP); }; close_scope_dst : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_DST); }; +close_scope_dup : { scanner_pop_start_cond(nft->scanner, PARSER_SC_STMT_DUP); }; close_scope_esp : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_ESP); }; close_scope_eth : { scanner_pop_start_cond(nft->scanner, PARSER_SC_ETH); }; close_scope_export : { scanner_pop_start_cond(nft->scanner, PARSER_SC_CMD_EXPORT); }; close_scope_fib : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_FIB); }; close_scope_flags : { scanner_pop_start_cond(nft->scanner, PARSER_SC_FLAGS); }; close_scope_frag : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_FRAG); }; +close_scope_fwd : { scanner_pop_start_cond(nft->scanner, PARSER_SC_STMT_FWD); }; close_scope_hash : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_HASH); }; close_scope_hbh : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_HBH); }; close_scope_ip : { scanner_pop_start_cond(nft->scanner, PARSER_SC_IP); }; @@ -971,6 +973,7 @@ close_scope_sctp_chunk : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_S close_scope_secmark : { scanner_pop_start_cond(nft->scanner, PARSER_SC_SECMARK); }; close_scope_socket : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_SOCKET); } close_scope_tcp : { scanner_pop_start_cond(nft->scanner, PARSER_SC_TCP); }; +close_scope_tproxy : { scanner_pop_start_cond(nft->scanner, PARSER_SC_STMT_TPROXY); }; close_scope_type : { scanner_pop_start_cond(nft->scanner, PARSER_SC_TYPE); }; close_scope_th : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_TH); }; close_scope_udp : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_UDP); }; @@ -2846,13 +2849,13 @@ stmt : verdict_stmt | log_stmt close_scope_log | reject_stmt close_scope_reject | nat_stmt close_scope_nat - | tproxy_stmt + | tproxy_stmt close_scope_tproxy | queue_stmt | ct_stmt | masq_stmt close_scope_nat | redir_stmt close_scope_nat - | dup_stmt - | fwd_stmt + | dup_stmt close_scope_dup + | fwd_stmt close_scope_fwd | set_stmt | map_stmt | synproxy_stmt close_scope_synproxy -- cgit v1.2.3