From a060d912e55a170cda34c68154a76c7e4370d334 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 23 Jul 2021 17:20:00 +0200 Subject: scanner: ah, esp: Move to own scopes They share 'sequence' keyword with icmp and tcp expressions. Signed-off-by: Phil Sutter --- src/scanner.l | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/scanner.l') diff --git a/src/scanner.l b/src/scanner.l index 65640ebb..7c4d8b7f 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -211,8 +211,10 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) %s SCANSTATE_TCP %s SCANSTATE_VLAN %s SCANSTATE_CMD_LIST +%s SCANSTATE_EXPR_AH %s SCANSTATE_EXPR_COMP %s SCANSTATE_EXPR_DCCP +%s SCANSTATE_EXPR_ESP %s SCANSTATE_EXPR_FIB %s SCANSTATE_EXPR_HASH %s SCANSTATE_EXPR_IPSEC @@ -532,7 +534,9 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "max-delay" { return MAXDELAY; } "mtu" { return MTU; } } -"sequence" { return SEQUENCE; } +{ + "sequence" { return SEQUENCE; } +} "igmp" { scanner_push_start_cond(yyscanner, SCANSTATE_IGMP); return IGMP; } { @@ -548,11 +552,11 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) } "nexthdr" { return NEXTHDR; } -"ah" { return AH; } +"ah" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_AH); return AH; } "reserved" { return RESERVED; } -"spi" { return SPI; } +"spi" { return SPI; } -"esp" { return ESP; } +"esp" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_ESP); return ESP; } "comp" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_COMP); return COMP; } { -- cgit v1.2.3