scanner: reset: move to own Scope

Isolate two more keywords shared with list command.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/include/parser.h b/include/parser.h
index 09499f08119bf0eb1a398edb2e2381aaf8c85614..0601b410a8458d5ff0b651047ba9a0cf3f5fc60f 100644 (file)
--- a/include/parser.h
+++ b/include/parser.h
@@ -47,6 +47,7 @@ enum startcond_type {
        PARSER_SC_VLAN,
        PARSER_SC_CMD_LIST,
        PARSER_SC_CMD_MONITOR,
+       PARSER_SC_CMD_RESET,
        PARSER_SC_EXPR_AH,
        PARSER_SC_EXPR_COMP,
        PARSER_SC_EXPR_DCCP,

diff --git a/src/parser_bison.y b/src/parser_bison.y
index 4ca86f73fc16ffe381ad9ea6f3f49916c042759e..ae6187c3ab564bea7335986cb392e6192f607d5d 100644 (file)
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -956,6 +956,7 @@ close_scope_numgen  : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_NUMGE
 close_scope_osf                : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_OSF); };
 close_scope_quota      : { scanner_pop_start_cond(nft->scanner, PARSER_SC_QUOTA); };
 close_scope_queue      : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_QUEUE); };
+close_scope_reset      : { scanner_pop_start_cond(nft->scanner, PARSER_SC_CMD_RESET); };
 close_scope_rt         : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_RT); };
 close_scope_sctp       : { scanner_pop_start_cond(nft->scanner, PARSER_SC_SCTP); };
 close_scope_sctp_chunk : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_SCTP_CHUNK); };
@@ -1051,7 +1052,7 @@ base_cmd          :       /* empty */     add_cmd         { $$ = $1; }
                        |       DELETE          delete_cmd      { $$ = $2; }
                        |       GET             get_cmd         { $$ = $2; }
                        |       LIST            list_cmd        close_scope_list        { $$ = $2; }
-                       |       RESET           reset_cmd       { $$ = $2; }
+                       |       RESET           reset_cmd       close_scope_reset       { $$ = $2; }
                        |       FLUSH           flush_cmd       { $$ = $2; }
                        |       RENAME          rename_cmd      { $$ = $2; }
                        |       IMPORT          import_cmd      { $$ = $2; }
@@ -3401,7 +3402,7 @@ reject_opts               :       /* empty */
                                $<stmt>0->reject.expr = $3;
                                datatype_set($<stmt>0->reject.expr, &icmpx_code_type);
                        }
-                       |       WITH    TCP     close_scope_tcp RESET
+                       |       WITH    TCP     close_scope_tcp RESET close_scope_reset
                        {
                                $<stmt>0->reject.type = NFT_REJECT_TCP_RST;
                        }
@@ -4765,7 +4766,7 @@ keyword_expr              :       ETHER   close_scope_eth { $$ = symbol_value(&@$, "ether"); }
                        |       DNAT                    { $$ = symbol_value(&@$, "dnat"); }
                        |       SNAT                    { $$ = symbol_value(&@$, "snat"); }
                        |       ECN                     { $$ = symbol_value(&@$, "ecn"); }
-                       |       RESET                   { $$ = symbol_value(&@$, "reset"); }
+                       |       RESET   close_scope_reset       { $$ = symbol_value(&@$, "reset"); }
                        |       ORIGINAL                { $$ = symbol_value(&@$, "original"); }
                        |       REPLY                   { $$ = symbol_value(&@$, "reply"); }
                        |       LABEL                   { $$ = symbol_value(&@$, "label"); }

diff --git a/src/scanner.l b/src/scanner.l
index ea369c0775025c130dfb3644bc0f5bdcbd3b31bc..8725295a210cb713e8096be9cf221e7e22607fc1 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -213,6 +213,7 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 %s SCANSTATE_VLAN
 %s SCANSTATE_CMD_LIST
 %s SCANSTATE_CMD_MONITOR
+%s SCANSTATE_CMD_RESET
 %s SCANSTATE_EXPR_AH
 %s SCANSTATE_EXPR_COMP
 %s SCANSTATE_EXPR_DCCP
@@ -340,7 +341,7 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 "delete"               { return DELETE; }
 "get"                  { return GET; }
 "list"                 { scanner_push_start_cond(yyscanner, SCANSTATE_CMD_LIST); return LIST; }
-"reset"                        { return RESET; }
+"reset"                        { scanner_push_start_cond(yyscanner, SCANSTATE_CMD_RESET); return RESET; }
 "flush"                        { return FLUSH; }
 "rename"               { return RENAME; }
 "import"                { return IMPORT; }
@@ -384,8 +385,10 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr})
 <SCANSTATE_COUNTER,SCANSTATE_CT,SCANSTATE_LIMIT>"packets"              { return PACKETS; }
 <SCANSTATE_COUNTER,SCANSTATE_CT,SCANSTATE_LIMIT,SCANSTATE_QUOTA>"bytes"        { return BYTES; }
 
-"counters"             { return COUNTERS; }
-"quotas"               { return QUOTAS; }
+<SCANSTATE_CMD_LIST,SCANSTATE_CMD_RESET>{
+       "counters"              { return COUNTERS; }
+       "quotas"                { return QUOTAS; }
+}
 
 "log"                  { scanner_push_start_cond(yyscanner, SCANSTATE_STMT_LOG); return LOG; }
 "prefix"               { return PREFIX; }