From 232f2c3287fc780f31c076767799afc08d34cf02 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 23 Jul 2021 14:34:34 +0200 Subject: scanner: synproxy: Move to own scope Quite a few keywords are shared with PARSER_SC_TCP. Signed-off-by: Phil Sutter --- src/scanner.l | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/scanner.l') diff --git a/src/scanner.l b/src/scanner.l index 95dcd033..01cb501c 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -221,6 +221,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) %s SCANSTATE_EXPR_SOCKET %s SCANSTATE_STMT_LOG +%s SCANSTATE_STMT_SYNPROXY %% @@ -492,6 +493,9 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "sack1" { return SACK1; } "sack2" { return SACK2; } "sack3" { return SACK3; } + "sack-permitted" { return SACK_PERM; } + "sack-perm" { return SACK_PERM; } + "timestamp" { return TIMESTAMP; } "fastopen" { return FASTOPEN; } "mptcp" { return MPTCP; } "md5sig" { return MD5SIG; } @@ -508,11 +512,6 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "option" { return OPTION; } } "time" { return TIME; } -"maxseg" { return MSS; } -"mss" { return MSS; } -"sack-permitted" { return SACK_PERM; } -"sack-perm" { return SACK_PERM; } -"timestamp" { return TIMESTAMP; } "icmp" { scanner_push_start_cond(yyscanner, SCANSTATE_ICMP); return ICMP; } "icmpv6" { scanner_push_start_cond(yyscanner, SCANSTATE_ICMP); return ICMP6; } @@ -694,8 +693,15 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "osf" { return OSF; } -"synproxy" { return SYNPROXY; } -"wscale" { return WSCALE; } +"synproxy" { scanner_push_start_cond(yyscanner, SCANSTATE_STMT_SYNPROXY); return SYNPROXY; } +{ + "wscale" { return WSCALE; } + "maxseg" { return MSS; } + "mss" { return MSS; } + "timestamp" { return TIMESTAMP; } + "sack-permitted" { return SACK_PERM; } + "sack-perm" { return SACK_PERM; } +} "notrack" { return NOTRACK; } -- cgit v1.2.3