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/scanner.l | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/scanner.l') diff --git a/src/scanner.l b/src/scanner.l index be01c6f3..fd1cf059 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -241,10 +241,13 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) %s SCANSTATE_EXPR_UDP %s SCANSTATE_EXPR_UDPLITE +%s SCANSTATE_STMT_DUP +%s SCANSTATE_STMT_FWD %s SCANSTATE_STMT_LOG %s SCANSTATE_STMT_NAT %s SCANSTATE_STMT_REJECT %s SCANSTATE_STMT_SYNPROXY +%s SCANSTATE_STMT_TPROXY %% @@ -328,7 +331,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "cgroupv2" { return CGROUPV2; } "level" { return LEVEL; } } -"tproxy" { return TPROXY; } +"tproxy" { scanner_push_start_cond(yyscanner, SCANSTATE_STMT_TPROXY); return TPROXY; } "accept" { return ACCEPT; } "drop" { return DROP; } @@ -336,7 +339,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "jump" { return JUMP; } "goto" { return GOTO; } "return" { return RETURN; } -"to" { return TO; } +"to" { return TO; } /* XXX: SCANSTATE_FLAGS and SCANSTATE_IP here are workarounds */ "inet" { return INET; } "netdev" { return NETDEV; } @@ -759,8 +762,8 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "mod" { return MOD; } "offset" { return OFFSET; } } -"dup" { return DUP; } -"fwd" { return FWD; } +"dup" { scanner_push_start_cond(yyscanner, SCANSTATE_STMT_DUP); return DUP; } +"fwd" { scanner_push_start_cond(yyscanner, SCANSTATE_STMT_FWD); return FWD; } "fib" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_FIB); return FIB; } -- cgit v1.2.3