diff options
| author | Florian Westphal <fw@strlen.de> | 2021-03-08 18:18:36 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2021-03-11 13:43:33 +0100 |
| commit | 8861db1b771a69de91f0d17ea9b70a63b3c9504a (patch) | |
| tree | 87f24807ba4718d3279fefebcaa595671c5391c6 | |
| parent | 31e5a129ee6db48414975ffad3530034a96a6365 (diff) | |
scanner: rt: move to own scope
classid and nexthop can be moved out of INIT scope.
Rest are still needed because tehy are used by other expressions as
well.
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | include/parser.h | 1 | ||||
| -rw-r--r-- | src/parser_bison.y | 7 | ||||
| -rw-r--r-- | src/scanner.l | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/include/parser.h b/include/parser.h index 001698db..2cdccaf5 100644 --- a/include/parser.h +++ b/include/parser.h @@ -32,6 +32,7 @@ enum startcond_type { PARSER_SC_EXPR_IPSEC, PARSER_SC_EXPR_NUMGEN, PARSER_SC_EXPR_QUEUE, + PARSER_SC_EXPR_RT, }; struct mnl_socket; diff --git a/src/parser_bison.y b/src/parser_bison.y index 83d78a23..0f4d51ad 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -865,6 +865,7 @@ close_scope_hash : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_HASH); close_scope_ipsec : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_IPSEC); }; 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); }; common_block : INCLUDE QUOTED_STRING stmt_separator { @@ -4893,11 +4894,11 @@ nf_key_proto : IP { $$ = NFPROTO_IPV4; } | IP6 { $$ = NFPROTO_IPV6; } ; -rt_expr : RT rt_key +rt_expr : RT rt_key close_scope_rt { $$ = rt_expr_alloc(&@$, $2, true); } - | RT nf_key_proto rt_key + | RT nf_key_proto rt_key close_scope_rt { enum nft_rt_keys rtk = $3; @@ -5391,7 +5392,7 @@ hbh_hdr_field : NEXTHDR { $$ = HBHHDR_NEXTHDR; } | HDRLENGTH { $$ = HBHHDR_HDRLENGTH; } ; -rt_hdr_expr : RT rt_hdr_field +rt_hdr_expr : RT rt_hdr_field close_scope_rt { $$ = exthdr_expr_alloc(&@$, &exthdr_rt, $2); } diff --git a/src/scanner.l b/src/scanner.l index cf3d7d52..faf180ca 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -200,6 +200,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) %s SCANSTATE_EXPR_IPSEC %s SCANSTATE_EXPR_NUMGEN %s SCANSTATE_EXPR_QUEUE +%s SCANSTATE_EXPR_RT %% @@ -494,7 +495,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "sctp" { return SCTP; } "vtag" { return VTAG; } -"rt" { return RT; } +"rt" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_RT); return RT; } "rt0" { return RT0; } "rt2" { return RT2; } "srh" { return RT4; } @@ -536,8 +537,10 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "oifgroup" { return OIFGROUP; } "cgroup" { return CGROUP; } -"classid" { return CLASSID; } -"nexthop" { return NEXTHOP; } +<SCANSTATE_EXPR_RT>{ + "classid" { return CLASSID; } + "nexthop" { return NEXTHOP; } +} "ct" { return CT; } "l3proto" { return L3PROTOCOL; } |