From 8861db1b771a69de91f0d17ea9b70a63b3c9504a Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 8 Mar 2021 18:18:36 +0100 Subject: 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 --- src/scanner.l | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/scanner.l') 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; } +{ + "classid" { return CLASSID; } + "nexthop" { return NEXTHOP; } +} "ct" { return CT; } "l3proto" { return L3PROTOCOL; } -- cgit v1.2.3