|
 |
0341a5 |
From f4476f9428a79c5d6d8fe284f0da91c2d4177e66 Mon Sep 17 00:00:00 2001
|
|
|
0341a5 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
0341a5 |
Date: Mon, 12 Jul 2021 17:44:08 +0200
|
|
|
0341a5 |
Subject: [PATCH] tcpopt: rename noop to nop
|
|
|
0341a5 |
|
|
|
0341a5 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1979334
|
|
|
0341a5 |
Upstream Status: nftables commit 8f591eba561ac
|
|
|
0341a5 |
|
|
|
0341a5 |
commit 8f591eba561aceeef605283c693b659a708d1cd3
|
|
|
0341a5 |
Author: Florian Westphal <fw@strlen.de>
|
|
|
0341a5 |
Date: Mon Nov 2 14:58:41 2020 +0100
|
|
|
0341a5 |
|
|
|
0341a5 |
tcpopt: rename noop to nop
|
|
|
0341a5 |
|
|
|
0341a5 |
'nop' is the tcp padding "option". "noop" is retained for compatibility
|
|
|
0341a5 |
on parser side.
|
|
|
0341a5 |
|
|
|
0341a5 |
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
0341a5 |
---
|
|
|
0341a5 |
doc/payload-expression.txt | 4 ++--
|
|
|
0341a5 |
src/tcpopt.c | 2 +-
|
|
|
0341a5 |
tests/py/any/tcpopt.t | 2 +-
|
|
|
0341a5 |
tests/py/any/tcpopt.t.json | 4 ++--
|
|
|
0341a5 |
tests/py/any/tcpopt.t.payload | 16 +---------------
|
|
|
0341a5 |
5 files changed, 7 insertions(+), 21 deletions(-)
|
|
|
0341a5 |
|
|
|
0341a5 |
diff --git a/doc/payload-expression.txt b/doc/payload-expression.txt
|
|
|
0341a5 |
index 27145c3..3a07321 100644
|
|
|
0341a5 |
--- a/doc/payload-expression.txt
|
|
|
0341a5 |
+++ b/doc/payload-expression.txt
|
|
|
0341a5 |
@@ -559,8 +559,8 @@ Segment Routing Header
|
|
|
0341a5 |
|eol|
|
|
|
0341a5 |
End if option list|
|
|
|
0341a5 |
kind
|
|
|
0341a5 |
-|noop|
|
|
|
0341a5 |
-1 Byte TCP No-op options |
|
|
|
0341a5 |
+|nop|
|
|
|
0341a5 |
+1 Byte TCP Nop padding option |
|
|
|
0341a5 |
kind
|
|
|
0341a5 |
|maxseg|
|
|
|
0341a5 |
TCP Maximum Segment Size|
|
|
|
0341a5 |
diff --git a/src/tcpopt.c b/src/tcpopt.c
|
|
|
0341a5 |
index 8d5bdec..17cb580 100644
|
|
|
0341a5 |
--- a/src/tcpopt.c
|
|
|
0341a5 |
+++ b/src/tcpopt.c
|
|
|
0341a5 |
@@ -27,7 +27,7 @@ static const struct exthdr_desc tcpopt_eol = {
|
|
|
0341a5 |
};
|
|
|
0341a5 |
|
|
|
0341a5 |
static const struct exthdr_desc tcpopt_nop = {
|
|
|
0341a5 |
- .name = "noop",
|
|
|
0341a5 |
+ .name = "nop",
|
|
|
0341a5 |
.type = TCPOPT_KIND_NOP,
|
|
|
0341a5 |
.templates = {
|
|
|
0341a5 |
[TCPOPTHDR_FIELD_KIND] = PHT("kind", 0, 8),
|
|
|
0341a5 |
diff --git a/tests/py/any/tcpopt.t b/tests/py/any/tcpopt.t
|
|
|
0341a5 |
index 5f21d49..1d42de8 100644
|
|
|
0341a5 |
--- a/tests/py/any/tcpopt.t
|
|
|
0341a5 |
+++ b/tests/py/any/tcpopt.t
|
|
|
0341a5 |
@@ -5,7 +5,7 @@
|
|
|
0341a5 |
*inet;test-inet;input
|
|
|
0341a5 |
|
|
|
0341a5 |
tcp option eol kind 1;ok
|
|
|
0341a5 |
-tcp option noop kind 1;ok
|
|
|
0341a5 |
+tcp option nop kind 1;ok
|
|
|
0341a5 |
tcp option maxseg kind 1;ok
|
|
|
0341a5 |
tcp option maxseg length 1;ok
|
|
|
0341a5 |
tcp option maxseg size 1;ok
|
|
|
0341a5 |
diff --git a/tests/py/any/tcpopt.t.json b/tests/py/any/tcpopt.t.json
|
|
|
0341a5 |
index 2c6236a..b15e36e 100644
|
|
|
0341a5 |
--- a/tests/py/any/tcpopt.t.json
|
|
|
0341a5 |
+++ b/tests/py/any/tcpopt.t.json
|
|
|
0341a5 |
@@ -14,14 +14,14 @@
|
|
|
0341a5 |
}
|
|
|
0341a5 |
]
|
|
|
0341a5 |
|
|
|
0341a5 |
-# tcp option noop kind 1
|
|
|
0341a5 |
+# tcp option nop kind 1
|
|
|
0341a5 |
[
|
|
|
0341a5 |
{
|
|
|
0341a5 |
"match": {
|
|
|
0341a5 |
"left": {
|
|
|
0341a5 |
"tcp option": {
|
|
|
0341a5 |
"field": "kind",
|
|
|
0341a5 |
- "name": "noop"
|
|
|
0341a5 |
+ "name": "nop"
|
|
|
0341a5 |
}
|
|
|
0341a5 |
},
|
|
|
0341a5 |
"op": "==",
|
|
|
0341a5 |
diff --git a/tests/py/any/tcpopt.t.payload b/tests/py/any/tcpopt.t.payload
|
|
|
0341a5 |
index f63076a..9c480c8 100644
|
|
|
0341a5 |
--- a/tests/py/any/tcpopt.t.payload
|
|
|
0341a5 |
+++ b/tests/py/any/tcpopt.t.payload
|
|
|
0341a5 |
@@ -19,21 +19,7 @@ inet
|
|
|
0341a5 |
[ exthdr load tcpopt 1b @ 0 + 0 => reg 1 ]
|
|
|
0341a5 |
[ cmp eq reg 1 0x00000001 ]
|
|
|
0341a5 |
|
|
|
0341a5 |
-# tcp option noop kind 1
|
|
|
0341a5 |
-ip
|
|
|
0341a5 |
- [ meta load l4proto => reg 1 ]
|
|
|
0341a5 |
- [ cmp eq reg 1 0x00000006 ]
|
|
|
0341a5 |
- [ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ]
|
|
|
0341a5 |
- [ cmp eq reg 1 0x00000001 ]
|
|
|
0341a5 |
-
|
|
|
0341a5 |
-# tcp option noop kind 1
|
|
|
0341a5 |
-ip6
|
|
|
0341a5 |
- [ meta load l4proto => reg 1 ]
|
|
|
0341a5 |
- [ cmp eq reg 1 0x00000006 ]
|
|
|
0341a5 |
- [ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ]
|
|
|
0341a5 |
- [ cmp eq reg 1 0x00000001 ]
|
|
|
0341a5 |
-
|
|
|
0341a5 |
-# tcp option noop kind 1
|
|
|
0341a5 |
+# tcp option nop kind 1
|
|
|
0341a5 |
inet
|
|
|
0341a5 |
[ meta load l4proto => reg 1 ]
|
|
|
0341a5 |
[ cmp eq reg 1 0x00000006 ]
|
|
|
0341a5 |
--
|
|
|
0341a5 |
2.31.1
|
|
|
0341a5 |
|