From 88ba0c92754d89c71dab11f701839522a5ddb5a9 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 25 Jan 2019 15:09:41 +0100 Subject: 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 --- tests/py/arp/arp.t.payload | 6 ++++-- tests/py/arp/arp.t.payload.netdev | 6 ++++-- tests/py/inet/tcp.t | 4 ++-- tests/py/inet/tcp.t.payload | 18 ++++++++++++------ tests/py/ip/ip.t.payload | 6 ++++-- tests/py/ip/ip.t.payload.bridge | 6 ++++-- tests/py/ip/ip.t.payload.inet | 6 ++++-- tests/py/ip/ip.t.payload.netdev | 6 ++++-- 8 files changed, 38 insertions(+), 20 deletions(-) diff --git a/tests/py/arp/arp.t.payload b/tests/py/arp/arp.t.payload index bb95e1c1..33e73417 100644 --- a/tests/py/arp/arp.t.payload +++ b/tests/py/arp/arp.t.payload @@ -272,8 +272,10 @@ arp test-arp input arp test-arp input [ meta load iifname => reg 1 ] [ cmp eq reg 1 0x61766e69 0x0064696c 0x00000000 0x00000000 ] - [ payload load 6b @ network header + 0 => reg 1 ] - [ cmp eq reg 1 0x00080100 0x00000406 ] + [ payload load 4b @ network header + 0 => reg 1 ] + [ cmp eq reg 1 0x00080100 ] + [ payload load 2b @ network header + 4 => reg 1 ] + [ cmp eq reg 1 0x00000406 ] [ payload load 4b @ network header + 24 => reg 1 ] [ cmp eq reg 1 0x108fa8c0 ] [ immediate reg 1 0x44332211 0x00006655 ] diff --git a/tests/py/arp/arp.t.payload.netdev b/tests/py/arp/arp.t.payload.netdev index 00c26ccc..4fcf3504 100644 --- a/tests/py/arp/arp.t.payload.netdev +++ b/tests/py/arp/arp.t.payload.netdev @@ -364,8 +364,10 @@ netdev test-netdev ingress [ cmp eq reg 1 0x61766e69 0x0064696c 0x00000000 0x00000000 ] [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000608 ] - [ payload load 6b @ network header + 0 => reg 1 ] - [ cmp eq reg 1 0x00080100 0x00000406 ] + [ payload load 4b @ network header + 0 => reg 1 ] + [ cmp eq reg 1 0x00080100 ] + [ payload load 2b @ network header + 4 => reg 1 ] + [ cmp eq reg 1 0x00000406 ] [ payload load 4b @ network header + 24 => reg 1 ] [ cmp eq reg 1 0x108fa8c0 ] [ immediate reg 1 0x44332211 0x00006655 ] 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 diff --git a/tests/py/ip/ip.t.payload b/tests/py/ip/ip.t.payload index eba79dec..d627b22f 100644 --- a/tests/py/ip/ip.t.payload +++ b/tests/py/ip/ip.t.payload @@ -370,8 +370,10 @@ ip test-ip4 input # ip saddr 192.168.3.1 ip daddr 192.168.3.100 ip test-ip4 input - [ payload load 8b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0103a8c0 0x6403a8c0 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ cmp eq reg 1 0x0103a8c0 ] + [ payload load 4b @ network header + 16 => reg 1 ] + [ cmp eq reg 1 0x6403a8c0 ] # ip saddr != 1.1.1.1 ip test-ip4 input diff --git a/tests/py/ip/ip.t.payload.bridge b/tests/py/ip/ip.t.payload.bridge index f16759bf..ad1d0aa8 100644 --- a/tests/py/ip/ip.t.payload.bridge +++ b/tests/py/ip/ip.t.payload.bridge @@ -482,8 +482,10 @@ bridge test-bridge input bridge test-bridge input [ payload load 2b @ link header + 12 => reg 1 ] [ cmp eq reg 1 0x00000008 ] - [ payload load 8b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0103a8c0 0x6403a8c0 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ cmp eq reg 1 0x0103a8c0 ] + [ payload load 4b @ network header + 16 => reg 1 ] + [ cmp eq reg 1 0x6403a8c0 ] # ip saddr != 1.1.1.1 bridge test-bridge input diff --git a/tests/py/ip/ip.t.payload.inet b/tests/py/ip/ip.t.payload.inet index 12b03e2e..b9cb28a2 100644 --- a/tests/py/ip/ip.t.payload.inet +++ b/tests/py/ip/ip.t.payload.inet @@ -482,8 +482,10 @@ inet test-inet input inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] - [ payload load 8b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0103a8c0 0x6403a8c0 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ cmp eq reg 1 0x0103a8c0 ] + [ payload load 4b @ network header + 16 => reg 1 ] + [ cmp eq reg 1 0x6403a8c0 ] # ip saddr != 1.1.1.1 inet test-inet input diff --git a/tests/py/ip/ip.t.payload.netdev b/tests/py/ip/ip.t.payload.netdev index 187a39f3..588e5ca2 100644 --- a/tests/py/ip/ip.t.payload.netdev +++ b/tests/py/ip/ip.t.payload.netdev @@ -395,8 +395,10 @@ netdev test-netdev ingress netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000008 ] - [ payload load 8b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0103a8c0 0x6403a8c0 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ cmp eq reg 1 0x0103a8c0 ] + [ payload load 4b @ network header + 16 => reg 1 ] + [ cmp eq reg 1 0x6403a8c0 ] # ip saddr 1.1.1.1 netdev test-netdev ingress -- cgit v1.2.3