tests: py: remove duplicate payloads.

nft-test.py only needs one payload per rule, but a number of rules have
duplicates, typically one per address family, so just keep the last
payload for rules listed more than once.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/tests/py/any/ct.t.payload b/tests/py/any/ct.t.payload
index ccbddc89959d72d145c77daa2662a503884ecb8e..2f4ba4a7442e3bcb84e3f705a9f5368cc7797281 100644 (file)
--- a/tests/py/any/ct.t.payload
+++ b/tests/py/any/ct.t.payload
@@ -329,20 +329,6 @@ ip test-ip4 output
   [ meta load mark => reg 1 ]
   [ ct set mark with reg 1 ]
 
-# ct mark set (meta mark | 0x10) << 8
-ip test-ip4 output
-  [ meta load mark => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0xffffffef ) ^ 0x00000010 ]
-  [ bitwise reg 1 = ( reg 1 << 0x00000008 ) ]
-  [ ct set mark with reg 1 ]
-
-# ct mark set (meta mark | 0x10) << 8
-ip6 test-ip6 output
-  [ meta load mark => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0xffffffef ) ^ 0x00000010 ]
-  [ bitwise reg 1 = ( reg 1 << 0x00000008 ) ]
-  [ ct set mark with reg 1 ]
-
 # ct mark set (meta mark | 0x10) << 8
 inet test-inet output
   [ meta load mark => reg 1 ]

diff --git a/tests/py/any/tcpopt.t.payload b/tests/py/any/tcpopt.t.payload
index cddba613a088e377ae48afaa8fac536943d396b6..56473798f8fdfa4eafd5455af6bfd2d29e227ca4 100644 (file)
--- a/tests/py/any/tcpopt.t.payload
+++ b/tests/py/any/tcpopt.t.payload
@@ -1,17 +1,3 @@
-# tcp option eol kind 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 0 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option eol kind 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 0 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option eol kind 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -26,20 +12,6 @@ inet
   [ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option maxseg kind 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 2 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option maxseg kind 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 2 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option maxseg kind 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -47,20 +19,6 @@ inet
   [ exthdr load tcpopt 1b @ 2 + 0 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option maxseg length 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 2 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option maxseg length 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 2 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option maxseg length 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -68,20 +26,6 @@ inet
   [ exthdr load tcpopt 1b @ 2 + 1 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option maxseg size 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 2b @ 2 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00000100 ]
-
-# tcp option maxseg size 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 2b @ 2 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00000100 ]
-
 # tcp option maxseg size 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -89,20 +33,6 @@ inet
   [ exthdr load tcpopt 2b @ 2 + 2 => reg 1 ]
   [ cmp eq reg 1 0x00000100 ]
 
-# tcp option window kind 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 3 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option window kind 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 3 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option window kind 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -110,20 +40,6 @@ inet
   [ exthdr load tcpopt 1b @ 3 + 0 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option window length 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 3 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option window length 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 3 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option window length 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -131,20 +47,6 @@ inet
   [ exthdr load tcpopt 1b @ 3 + 1 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option window count 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 3 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option window count 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 3 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option window count 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -152,20 +54,6 @@ inet
   [ exthdr load tcpopt 1b @ 3 + 2 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option sack-perm kind 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option sack-perm kind 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option sack-perm kind 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -173,20 +61,6 @@ inet
   [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option sack-perm length 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option sack-perm length 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option sack-perm length 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -194,20 +68,6 @@ inet
   [ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option sack kind 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 5 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option sack kind 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 5 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option sack kind 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -215,20 +75,6 @@ inet
   [ exthdr load tcpopt 1b @ 5 + 0 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option sack length 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 5 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option sack length 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 5 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option sack length 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -236,20 +82,6 @@ inet
   [ exthdr load tcpopt 1b @ 5 + 1 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option sack left 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack left 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack left 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -257,20 +89,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option sack0 left 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack0 left 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack0 left 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -278,20 +96,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option sack1 left 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 10 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack1 left 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 10 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack1 left 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -299,20 +103,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 10 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option sack2 left 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 18 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack2 left 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 18 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack2 left 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -320,20 +110,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 18 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option sack3 left 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 26 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack3 left 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 26 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack3 left 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -341,20 +117,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 26 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option sack right 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack right 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack right 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -362,20 +124,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option sack0 right 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack0 right 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack0 right 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -383,20 +131,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option sack1 right 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 14 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack1 right 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 14 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack1 right 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -404,20 +138,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 14 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option sack2 right 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 22 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack2 right 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 22 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack2 right 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -425,20 +145,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 22 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option sack3 right 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 30 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack3 right 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 30 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option sack3 right 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -446,20 +152,6 @@ inet
   [ exthdr load tcpopt 4b @ 5 + 30 => reg 1 ]
   [ cmp eq reg 1 0x01000000 ]
 
-# tcp option timestamp kind 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 8 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option timestamp kind 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 8 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option timestamp kind 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -467,20 +159,6 @@ inet
   [ exthdr load tcpopt 1b @ 8 + 0 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option timestamp length 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 8 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option timestamp length 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 8 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # tcp option timestamp length 1
 inet 
   [ meta load l4proto => reg 1 ]
@@ -488,20 +166,6 @@ inet
   [ exthdr load tcpopt 1b @ 8 + 1 => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# tcp option timestamp tsval 1
-ip 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 8 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option timestamp tsval 1
-ip6 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 8 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
 # tcp option timestamp tsval 1
 inet 
   [ meta load l4proto => reg 1 ]

diff --git a/tests/py/inet/ether-ip.t.payload.netdev b/tests/py/inet/ether-ip.t.payload.netdev
index 16b092122c725019f4a31749b3878316fd651017..b0fa6d84b31b1a84ed923163e2bc760975f21bb6 100644 (file)
--- a/tests/py/inet/ether-ip.t.payload.netdev
+++ b/tests/py/inet/ether-ip.t.payload.netdev
@@ -13,21 +13,6 @@ netdev test-netdev ingress
   [ payload load 6b @ link header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0c540f00 0x00000411 ]
 
-# tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04
-netdev test-netdev ingress 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00001600 ]
-  [ meta load protocol => reg 1 ]
-  [ cmp eq reg 1 0x00000008 ]
-  [ payload load 4b @ network header + 16 => reg 1 ]
-  [ cmp eq reg 1 0x04030201 ]
-  [ meta load iiftype => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-  [ payload load 6b @ link header + 6 => reg 1 ]
-  [ cmp eq reg 1 0x0c540f00 0x00000411 ]
-
 # tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept
 netdev test-netdev ingress 
   [ meta load l4proto => reg 1 ]

diff --git a/tests/py/inet/osf.t.payload b/tests/py/inet/osf.t.payload
index 6f5fba345275b9107e26204136d01488a83325f8..6ddab9763b6494255558a26b9ecb765cbbfdaff8 100644 (file)
--- a/tests/py/inet/osf.t.payload
+++ b/tests/py/inet/osf.t.payload
@@ -1,79 +1,23 @@
-# osf name "Linux"
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
-# osf name "Linux"
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
 # osf name "Linux"
 inet osfinet osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
 
-# osf ttl loose name "Linux"
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
-# osf ttl loose name "Linux"
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
 # osf ttl loose name "Linux"
 inet osfinet osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
 
-# osf ttl skip name "Linux"
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
-# osf ttl skip name "Linux"
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
 # osf ttl skip name "Linux"
 inet osfinet osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
 
-# osf ttl skip version "Linux:3.0"
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x2e333a78 0x00000030 0x00000000 ]
-
-# osf ttl skip version "Linux:3.0"
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x2e333a78 0x00000030 0x00000000 ]
-
 # osf ttl skip version "Linux:3.0"
 inet osfinet osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x756e694c 0x2e333a78 0x00000030 0x00000000 ]
 
-# osf name { "Windows", "MacOs" }
-__set%d osfip 3 size 2
-__set%d osfip 0
-       element 646e6957 0073776f 00000000 00000000  : 0 [end]  element 4f63614d 00000073 00000000 00000000  : 0 [end]
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __set%d ]
-
-# osf name { "Windows", "MacOs" }
-__set%d osfip6 3 size 2
-__set%d osfip6 0
-       element 646e6957 0073776f 00000000 00000000  : 0 [end]  element 4f63614d 00000073 00000000 00000000  : 0 [end]
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __set%d ]
-
 # osf name { "Windows", "MacOs" }
 __set%d osfinet 3 size 2
 __set%d osfinet 0
@@ -82,22 +26,6 @@ inet osfinet osfchain
   [ osf dreg 1 ]
   [ lookup reg 1 set __set%d ]
 
-# osf version { "Windows:XP", "MacOs:Sierra" }
-__set%d osfip 3 size 2
-__set%d osfip 0
-       element 646e6957 3a73776f 00005058 00000000  : 0 [end]  element 4f63614d 69533a73 61727265 00000000  : 0 [end]
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __set%d ]
-
-# osf version { "Windows:XP", "MacOs:Sierra" }
-__set%d osfip6 3 size 2
-__set%d osfip6 0
-       element 646e6957 3a73776f 00005058 00000000  : 0 [end]  element 4f63614d 69533a73 61727265 00000000  : 0 [end]
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __set%d ]
-
 # osf version { "Windows:XP", "MacOs:Sierra" }
 __set%d osfinet 3 size 2
 __set%d osfinet 0
@@ -106,24 +34,6 @@ inet osfinet osfchain
   [ osf dreg 1 ]
   [ lookup reg 1 set __set%d ]
 
-# ct mark set osf name map { "Windows" : 0x00000001, "MacOs" : 0x00000002 }
-__map%d osfip b size 2
-__map%d osfip 0
-       element 646e6957 0073776f 00000000 00000000  : 00000001 0 [end] element 4f63614d 00000073 00000000 00000000  : 00000002 0 [end]
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ ct set mark with reg 1 ]
-
-# ct mark set osf name map { "Windows" : 0x00000001, "MacOs" : 0x00000002 }
-__map%d osfip6 b size 2
-__map%d osfip6 0
-       element 646e6957 0073776f 00000000 00000000  : 00000001 0 [end] element 4f63614d 00000073 00000000 00000000  : 00000002 0 [end]
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ ct set mark with reg 1 ]
-
 # ct mark set osf name map { "Windows" : 0x00000001, "MacOs" : 0x00000002 }
 __map%d osfinet b size 2
 __map%d osfinet 0
@@ -133,24 +43,6 @@ inet osfinet osfchain
   [ lookup reg 1 set __map%d dreg 1 ]
   [ ct set mark with reg 1 ]
 
-# ct mark set osf version map { "Windows:XP" : 0x00000003, "MacOs:Sierra" : 0x00000004 }
-__map%d osfip b size 2
-__map%d osfip 0
-       element 646e6957 3a73776f 00005058 00000000  : 00000003 0 [end] element 4f63614d 69533a73 61727265 00000000  : 00000004 0 [end]
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ ct set mark with reg 1 ]
-
-# ct mark set osf version map { "Windows:XP" : 0x00000003, "MacOs:Sierra" : 0x00000004 }
-__map%d osfip6 b size 2
-__map%d osfip6 0
-       element 646e6957 3a73776f 00005058 00000000  : 00000003 0 [end] element 4f63614d 69533a73 61727265 00000000  : 00000004 0 [end]
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ ct set mark with reg 1 ]
-
 # ct mark set osf version map { "Windows:XP" : 0x00000003, "MacOs:Sierra" : 0x00000004 }
 __map%d osfinet b size 2
 __map%d osfinet 0

diff --git a/tests/py/inet/socket.t.payload b/tests/py/inet/socket.t.payload
index 79fcea79477b69515677fa1207fc3e33ace8a4b3..e66ccbf70aeaf4f62d2d0f7ed185b45dfc6f9094 100644 (file)
--- a/tests/py/inet/socket.t.payload
+++ b/tests/py/inet/socket.t.payload
@@ -1,73 +1,23 @@
-# socket transparent 0
-ip sockip4 sockchain 
-  [ socket load transparent => reg 1 ]
-  [ cmp eq reg 1 0x00000000 ]
-
-# socket transparent 0
-ip6 sockip6 sockchain 
-  [ socket load transparent => reg 1 ]
-  [ cmp eq reg 1 0x00000000 ]
-
 # socket transparent 0
 inet sockin sockchain 
   [ socket load transparent => reg 1 ]
   [ cmp eq reg 1 0x00000000 ]
 
-# socket transparent 1
-ip sockip4 sockchain 
-  [ socket load transparent => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# socket transparent 1
-ip6 sockip6 sockchain 
-  [ socket load transparent => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # socket transparent 1
 inet sockin sockchain 
   [ socket load transparent => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# socket mark 0x00000005
-ip sockip4 sockchain 
-  [ socket load mark => reg 1 ]
-  [ cmp eq reg 1 0x00000005 ]
-
-# socket mark 0x00000005
-ip6 sockip6 sockchain 
-  [ socket load mark => reg 1 ]
-  [ cmp eq reg 1 0x00000005 ]
-
 # socket mark 0x00000005
 inet sockin sockchain 
   [ socket load mark => reg 1 ]
   [ cmp eq reg 1 0x00000005 ]
 
-# socket wildcard 0
-ip sockip4 sockchain
-  [ socket load wildcard => reg 1 ]
-  [ cmp eq reg 1 0x00000000 ]
-
-# socket wildcard 0
-ip6 sockip6 sockchain
-  [ socket load wildcard => reg 1 ]
-  [ cmp eq reg 1 0x00000000 ]
-
 # socket wildcard 0
 inet sockin sockchain
   [ socket load wildcard => reg 1 ]
   [ cmp eq reg 1 0x00000000 ]
 
-# socket wildcard 1
-ip sockip4 sockchain
-  [ socket load wildcard => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# socket wildcard 1
-ip6 sockip6 sockchain
-  [ socket load wildcard => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
 # socket wildcard 1
 inet sockin sockchain
   [ socket load wildcard => reg 1 ]

diff --git a/tests/py/inet/synproxy.t.payload b/tests/py/inet/synproxy.t.payload
index 2e6feaaf80fdd9676adeb97cb95fd1e417e0dcf8..dd318b9a4a42133b822b9de077d141b7d156c0df 100644 (file)
--- a/tests/py/inet/synproxy.t.payload
+++ b/tests/py/inet/synproxy.t.payload
@@ -1,71 +1,23 @@
-# synproxy
-ip synproxyip synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
 # synproxy
 inet synproxyinet synproxychain
   [ synproxy mss 0 wscale 0 ]
 
-# synproxy mss 1460 wscale 7
-ip synproxyip synproxychain
-  [ synproxy mss 1460 wscale 7 ]
-
-# synproxy mss 1460 wscale 7
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 1460 wscale 7 ]
-
 # synproxy mss 1460 wscale 7
 inet synproxyinet synproxychain
   [ synproxy mss 1460 wscale 7 ]
 
-# synproxy mss 1460 wscale 5 timestamp sack-perm
-ip synproxyip synproxychain
-  [ synproxy mss 1460 wscale 5 ]
-
-# synproxy mss 1460 wscale 5 timestamp sack-perm
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 1460 wscale 5 ]
-
 # synproxy mss 1460 wscale 5 timestamp sack-perm
 inet synproxyinet synproxychain
   [ synproxy mss 1460 wscale 5 ]
 
-# synproxy timestamp sack-perm
-ip synproxyip synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy timestamp sack-perm
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
 # synproxy timestamp sack-perm
 inet synproxyinet synproxychain
   [ synproxy mss 0 wscale 0 ]
 
-# synproxy timestamp
-ip synproxyip synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy timestamp
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
 # synproxy timestamp
 inet synproxyinet synproxychain
   [ synproxy mss 0 wscale 0 ]
 
-# synproxy sack-perm
-ip synproxyip synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy sack-perm
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
 # synproxy sack-perm
 inet synproxyinet synproxychain
   [ synproxy mss 0 wscale 0 ]

diff --git a/tests/py/netdev/reject.t.payload b/tests/py/netdev/reject.t.payload
index 71a66f9d97ad50c2fc128a7e14dbed7097e81093..d3af2f33b43a7f95e33b21583769e82bf39301e1 100644 (file)
--- a/tests/py/netdev/reject.t.payload
+++ b/tests/py/netdev/reject.t.payload
@@ -6,10 +6,6 @@ netdev
 netdev 
   [ reject type 2 code 1 ]
 
-# reject
-netdev 
-  [ reject type 2 code 1 ]
-
 # reject with icmp type admin-prohibited
 netdev 
   [ reject type 0 code 13 ]