From 2a9aea6f2dfb6ee61528809af98860e06b38762b Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 2 Nov 2020 00:27:04 +0100 Subject: 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 --- src/tcpopt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tcpopt.c') diff --git a/src/tcpopt.c b/src/tcpopt.c index ec305d94..6dbaa9e6 100644 --- a/src/tcpopt.c +++ b/src/tcpopt.c @@ -55,7 +55,7 @@ static const struct exthdr_desc tcpopt_window = { }; static const struct exthdr_desc tcpopt_sack_permitted = { - .name = "sack-permitted", + .name = "sack-perm", .type = TCPOPT_SACK_PERMITTED, .templates = { [TCPOPTHDR_FIELD_KIND] = PHT("kind", 0, 8), -- cgit v1.2.3