diff options
| author | Phil Sutter <phil@nwl.cc> | 2021-07-23 14:03:19 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2022-03-01 10:54:03 +0100 |
| commit | 26b536538ac82f603932dc23f41bc5581ebc5d73 (patch) | |
| tree | 1819b649f3d09c8e1e3ff80895928e924829ad71 /src/scanner.l | |
| parent | f572211935d3bda67108deb8cc2aa684f27e2c5c (diff) | |
scanner: tcp: Move to own scope
Apart from header fields, this isolates TCP option types and
fields, too.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/src/scanner.l b/src/scanner.l index a584b5fb..95dcd033 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -468,30 +468,46 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "ptr" { return PTR; } "value" { return VALUE; } + + "option" { return OPTION; } + "options" { return OPTIONS; } } <SCANSTATE_TCP>{ -"echo" { return ECHO; } -"eol" { return EOL; } -"fastopen" { return FASTOPEN; } -"mptcp" { return MPTCP; } -"md5sig" { return MD5SIG; } -"subtype" { return SUBTYPE; } -"nop" { return NOP; } -"noop" { return NOP; } -"sack" { return SACK; } -"sack0" { return SACK0; } -"sack1" { return SACK1; } -"sack2" { return SACK2; } -"sack3" { return SACK3; } -"time" { return TIME; } + /* tcp header fields */ + "ackseq" { return ACKSEQ; } + "doff" { return DOFF; } + "window" { return WINDOW; } + "urgptr" { return URGPTR; } + + /* tcp option types */ + "echo" { return ECHO; } + "eol" { return EOL; } + "maxseg" { return MSS; } + "mss" { return MSS; } + "nop" { return NOP; } + "noop" { return NOP; } + "sack" { return SACK; } + "sack0" { return SACK0; } + "sack1" { return SACK1; } + "sack2" { return SACK2; } + "sack3" { return SACK3; } + "fastopen" { return FASTOPEN; } + "mptcp" { return MPTCP; } + "md5sig" { return MD5SIG; } + + /* tcp option fields */ + "left" { return LEFT; } + "right" { return RIGHT; } + "count" { return COUNT; } + "tsval" { return TSVAL; } + "tsecr" { return TSECR; } + "subtype" { return SUBTYPE; } -"count" { return COUNT; } -"left" { return LEFT; } -"right" { return RIGHT; } -"tsval" { return TSVAL; } -"tsecr" { return TSECR; } + "options" { return OPTIONS; } + "option" { return OPTION; } } +"time" { return TIME; } "maxseg" { return MSS; } "mss" { return MSS; } "sack-permitted" { return SACK_PERM; } @@ -540,11 +556,6 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "port" { return PORT; } "tcp" { scanner_push_start_cond(yyscanner, SCANSTATE_TCP); return TCP; } -"ackseq" { return ACKSEQ; } -"doff" { return DOFF; } -"window" { return WINDOW; } -"urgptr" { return URGPTR; } -"option" { return OPTION; } "dccp" { return DCCP; } @@ -688,7 +699,6 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "notrack" { return NOTRACK; } -"options" { return OPTIONS; } "all" { return ALL; } "xml" { return XML; } |