diff options
| author | Florian Westphal <fw@strlen.de> | 2020-11-02 00:27:04 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2020-11-09 12:14:52 +0100 |
| commit | 2a9aea6f2dfb6ee61528809af98860e06b38762b (patch) | |
| tree | 0d0f1c44efdfa6ef4a5787da7d4e3b1ef843c68a /src/scanner.l | |
| parent | db3207dc06bc0c3cd3ec0df409512448ecba603e (diff) | |
parser: merge sack-perm/sack-permitted and maxseg/mss
One was added by the tcp option parsing ocde, the other by synproxy.
So we have:
synproxy ... sack-perm
synproxy ... mss
and
tcp option maxseg
tcp option sack-permitted
This kills the extra tokens on the scanner/parser side,
so sack-perm and sack-permitted can both be used.
Likewise, 'synproxy maxseg' and 'tcp option mss size 42' will work too.
On the output side, the shorter form is now preferred, i.e. sack-perm
and mss.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scanner.l b/src/scanner.l index 7afd9bfb..516c648f 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -421,14 +421,16 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "echo" { return ECHO; } "eol" { return EOL; } -"maxseg" { return MAXSEG; } +"maxseg" { return MSS; } +"mss" { return MSS; } "noop" { return NOOP; } "sack" { return SACK; } "sack0" { return SACK0; } "sack1" { return SACK1; } "sack2" { return SACK2; } "sack3" { return SACK3; } -"sack-permitted" { return SACK_PERMITTED; } +"sack-permitted" { return SACK_PERM; } +"sack-perm" { return SACK_PERM; } "timestamp" { return TIMESTAMP; } "time" { return TIME; } @@ -565,9 +567,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "osf" { return OSF; } "synproxy" { return SYNPROXY; } -"mss" { return MSS; } "wscale" { return WSCALE; } -"sack-perm" { return SACKPERM; } "notrack" { return NOTRACK; } |