diff options
| -rw-r--r-- | doc/payload-expression.txt | 4 | ||||
| -rw-r--r-- | src/tcpopt.c | 2 | ||||
| -rw-r--r-- | tests/py/any/tcpopt.t | 2 | ||||
| -rw-r--r-- | tests/py/any/tcpopt.t.json | 4 | ||||
| -rw-r--r-- | tests/py/any/tcpopt.t.payload | 16 |
5 files changed, 7 insertions, 21 deletions
diff --git a/doc/payload-expression.txt b/doc/payload-expression.txt index 2fa394ea..3cfa7791 100644 --- a/doc/payload-expression.txt +++ b/doc/payload-expression.txt @@ -559,8 +559,8 @@ Segment Routing Header |eol| End if option list| kind -|noop| -1 Byte TCP No-op options | +|nop| +1 Byte TCP Nop padding option | kind |maxseg| TCP Maximum Segment Size| diff --git a/src/tcpopt.c b/src/tcpopt.c index 8d5bdec5..17cb580d 100644 --- a/src/tcpopt.c +++ b/src/tcpopt.c @@ -27,7 +27,7 @@ static const struct exthdr_desc tcpopt_eol = { }; static const struct exthdr_desc tcpopt_nop = { - .name = "noop", + .name = "nop", .type = TCPOPT_KIND_NOP, .templates = { [TCPOPTHDR_FIELD_KIND] = PHT("kind", 0, 8), 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 ] |