diff options
| author | Florian Westphal <fw@strlen.de> | 2019-01-25 15:09:41 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2019-01-25 15:10:23 +0100 |
| commit | 88ba0c92754d89c71dab11f701839522a5ddb5a9 (patch) | |
| tree | 93e60ed790a7c85ddd7588c8fbf66c9429de5633 /tests/py/inet | |
| parent | f5821e0b8a4813c0a0b9909f97d0db8855d04ffd (diff) | |
tests: fix up expected payloads after expr merge change
nft currently doesn't do payload merging anymore in some cases,
so fix up the expected output.
Fixes: ce2651222911 ("payload: refine payload expr merging")
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/inet')
| -rw-r--r-- | tests/py/inet/tcp.t | 4 | ||||
| -rw-r--r-- | tests/py/inet/tcp.t.payload | 18 |
2 files changed, 14 insertions, 8 deletions
diff --git a/tests/py/inet/tcp.t b/tests/py/inet/tcp.t index f96e3634..e0a83e2b 100644 --- a/tests/py/inet/tcp.t +++ b/tests/py/inet/tcp.t @@ -38,8 +38,8 @@ tcp sport 8080 drop;ok tcp sport 1024 tcp dport 22;ok tcp sport 1024 tcp dport 22 tcp sequence 0;ok -tcp sequence 0 tcp sport 1024 tcp dport 22;ok;tcp sport 1024 tcp dport 22 tcp sequence 0 -tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22;ok;tcp sport { 1022, 1024} tcp dport 22 tcp sequence 0 +tcp sequence 0 tcp sport 1024 tcp dport 22;ok +tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22;ok;tcp sequence 0 tcp sport { 1022, 1024} tcp dport 22 tcp sequence 22;ok tcp sequence != 233;ok diff --git a/tests/py/inet/tcp.t.payload b/tests/py/inet/tcp.t.payload index 2390a24e..55f1bc2e 100644 --- a/tests/py/inet/tcp.t.payload +++ b/tests/py/inet/tcp.t.payload @@ -216,15 +216,19 @@ inet test-inet input inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] - [ payload load 8b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x16000004 0x00000000 ] + [ payload load 4b @ transport header + 0 => reg 1 ] + [ cmp eq reg 1 0x16000004 ] + [ payload load 4b @ transport header + 4 => reg 1 ] + [ cmp eq reg 1 0x00000000 ] # tcp sequence 0 tcp sport 1024 tcp dport 22 inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] - [ payload load 8b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x16000004 0x00000000 ] + [ payload load 4b @ transport header + 4 => reg 1 ] + [ cmp eq reg 1 0x00000000 ] + [ payload load 4b @ transport header + 0 => reg 1 ] + [ cmp eq reg 1 0x16000004 ] # tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22 __set%d test-inet 3 @@ -233,10 +237,12 @@ __set%d test-inet 0 inet test-inet input [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] + [ payload load 4b @ transport header + 4 => reg 1 ] + [ cmp eq reg 1 0x00000000 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] - [ payload load 6b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 0x00000000 ] + [ payload load 2b @ transport header + 2 => reg 1 ] + [ cmp eq reg 1 0x00001600 ] # tcp sequence 22 inet test-inet input |