From 31e5a129ee6db48414975ffad3530034a96a6365 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 8 Mar 2021 18:18:35 +0100 Subject: scanner: ipsec: move to own scope ... and hide the ipsec specific tokens from the INITITAL scope. Signed-off-by: Florian Westphal --- src/scanner.l | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/scanner.l') diff --git a/src/scanner.l b/src/scanner.l index 893364b7..cf3d7d52 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -197,6 +197,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) %option warn %option stack %s SCANSTATE_EXPR_HASH +%s SCANSTATE_EXPR_IPSEC %s SCANSTATE_EXPR_NUMGEN %s SCANSTATE_EXPR_QUEUE @@ -594,12 +595,14 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "exthdr" { return EXTHDR; } -"ipsec" { return IPSEC; } -"reqid" { return REQID; } -"spnum" { return SPNUM; } +"ipsec" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_IPSEC); return IPSEC; } +{ + "reqid" { return REQID; } + "spnum" { return SPNUM; } -"in" { return IN; } -"out" { return OUT; } + "in" { return IN; } + "out" { return OUT; } +} "secmark" { return SECMARK; } "secmarks" { return SECMARKS; } -- cgit v1.2.3