From 2165324da913e5d3fe719680e81cadda12d2c19c Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 30 Jul 2021 17:43:26 +0200 Subject: scanner: at: Move to own scope Modification of raw TCP option rule is a bit more complicated to avoid pushing tcp_hdr_option_type into the introduced scope by accident. Signed-off-by: Phil Sutter --- 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 078bcc70..8d4907dc 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -197,6 +197,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) %option warn %option stack %s SCANSTATE_ARP +%s SCANSTATE_AT %s SCANSTATE_CT %s SCANSTATE_COUNTER %s SCANSTATE_ETH @@ -283,7 +284,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "/" { return SLASH; } "-" { return DASH; } "*" { return ASTERISK; } -"@" { return AT; } +"@" { scanner_push_start_cond(yyscanner, SCANSTATE_AT); return AT; } "$" { return '$'; } "=" { return '='; } "vmap" { return VMAP; } @@ -456,8 +457,10 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "port" { return PORT; } } -"ll" { return LL_HDR; } -"nh" { return NETWORK_HDR; } +{ + "ll" { return LL_HDR; } + "nh" { return NETWORK_HDR; } +} "th" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_TH); return TRANSPORT_HDR; } "bridge" { return BRIDGE; } -- cgit v1.2.3