From 8f591eba561aceeef605283c693b659a708d1cd3 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 2 Nov 2020 14:58:41 +0100 Subject: tcpopt: rename noop to nop 'nop' is the tcp padding "option". "noop" is retained for compatibility on parser side. Signed-off-by: Florian Westphal --- tests/py/any/tcpopt.t | 2 +- tests/py/any/tcpopt.t.json | 4 ++-- tests/py/any/tcpopt.t.payload | 16 +--------------- 3 files changed, 4 insertions(+), 18 deletions(-) (limited to 'tests') diff --git a/tests/py/any/tcpopt.t b/tests/py/any/tcpopt.t index 5f21d498..1d42de87 100644 --- a/tests/py/any/tcpopt.t +++ b/tests/py/any/tcpopt.t @@ -5,7 +5,7 @@ *inet;test-inet;input tcp option eol kind 1;ok -tcp option noop kind 1;ok +tcp option nop kind 1;ok tcp option maxseg kind 1;ok tcp option maxseg length 1;ok tcp option maxseg size 1;ok diff --git a/tests/py/any/tcpopt.t.json b/tests/py/any/tcpopt.t.json index 2c6236a1..b15e36ee 100644 --- a/tests/py/any/tcpopt.t.json +++ b/tests/py/any/tcpopt.t.json @@ -14,14 +14,14 @@ } ] -# tcp option noop kind 1 +# tcp option nop kind 1 [ { "match": { "left": { "tcp option": { "field": "kind", - "name": "noop" + "name": "nop" } }, "op": "==", diff --git a/tests/py/any/tcpopt.t.payload b/tests/py/any/tcpopt.t.payload index f63076ae..9c480c8b 100644 --- a/tests/py/any/tcpopt.t.payload +++ b/tests/py/any/tcpopt.t.payload @@ -19,21 +19,7 @@ inet [ exthdr load tcpopt 1b @ 0 + 0 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option noop kind 1 -ip - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - -# tcp option noop kind 1 -ip6 - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - -# tcp option noop kind 1 +# tcp option nop kind 1 inet [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] -- cgit v1.2.3