Revert mptcp tests for sets/typeof_sets_0

Revert upstream commits:

 9832c2c347eb ("tcpopt: add symbol table for mptcp suboptions")
 01fe0f07a0ed ("netlink_delinearize: also consider exthdr type when trimming binops")

These commits are not backported, revert these tests.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/shell/testcases/sets/dumps/typeof_sets_0.nft b/tests/shell/testcases/sets/dumps/typeof_sets_0.nft
index 34aaab601cda310d3620d8fc876f2fbcc520456d..63fc5b14513730038891d61200dc04282a3e9f5a 100644 (file)
--- a/tests/shell/testcases/sets/dumps/typeof_sets_0.nft
+++ b/tests/shell/testcases/sets/dumps/typeof_sets_0.nft
@@ -60,17 +60,6 @@ table inet t {
                elements = { "eth0" . 10.1.1.2 . exists }
        }
 
-       set s13 {
-               typeof tcp option mptcp subtype
-               elements = { mp-join, dss }
-       }
-
-       set s14 {
-               typeof tcp option mptcp subtype . ip daddr
-               elements = { remove-addr . 10.1.1.1,
-                            mp-join . 10.1.1.2 }
-       }
-
        chain c1 {
                osf name @s1 accept
        }
@@ -114,12 +103,4 @@ table inet t {
        chain c12 {
                iifname . ip saddr . meta ipsec @s12 accept
        }
-
-       chain c13 {
-               tcp option mptcp subtype @s13 accept
-       }
-
-       chain c14 {
-               tcp option mptcp subtype . ip saddr @s14 accept
-       }
 }

diff --git a/tests/shell/testcases/sets/typeof_sets_0 b/tests/shell/testcases/sets/typeof_sets_0
index 28e39b4d2cb3097c1c037cd88ed92893bec83cb0..4c07288cdd079ec1451e8a2911c91c7201f7b088 100755 (executable)
--- a/tests/shell/testcases/sets/typeof_sets_0
+++ b/tests/shell/testcases/sets/typeof_sets_0
@@ -120,16 +120,6 @@ INPUT="table inet t {$INPUT_OSF_SET
                typeof meta iifname . ip saddr . meta ipsec
                elements = { \"eth0\" . 10.1.1.2 . 1 }
        }
-
-       set s13 {
-               typeof tcp option mptcp subtype
-               elements = { mp-join, dss }
-       }
-
-       set s14 {
-               typeof tcp option mptcp subtype . ip daddr
-               elements = { remove-addr . 10.1.1.1, mp-join . 10.1.1.2 }
-       }
 $INPUT_OSF_CHAIN
        chain c2 {
                ether type vlan vlan id @s2 accept
@@ -159,14 +149,6 @@ $INPUT_VERSION_CHAIN
        chain c12 {
                meta iifname . ip saddr . meta ipsec @s12 accept
        }
-
-       chain c13 {
-               tcp option mptcp subtype @s13 accept
-       }
-
-       chain c14 {
-               tcp option mptcp subtype . ip saddr @s14 accept
-       }
 }"
 
 EXPECTED="table inet t {$INPUT_OSF_SET
@@ -215,17 +197,6 @@ $INPUT_VERSION_SET
                typeof iifname . ip saddr . meta ipsec
                elements = { \"eth0\" . 10.1.1.2 . exists }
        }
-
-       set s13 {
-               typeof tcp option mptcp subtype
-               elements = { mp-join, dss }
-       }
-
-       set s14 {
-               typeof tcp option mptcp subtype . ip daddr
-               elements = { remove-addr . 10.1.1.1,
-                            mp-join . 10.1.1.2 }
-       }
 $INPUT_OSF_CHAIN
        chain c2 {
                vlan id @s2 accept
@@ -254,14 +225,6 @@ $INPUT_SCTP_CHAIN$INPUT_VERSION_CHAIN
        chain c12 {
                iifname . ip saddr . meta ipsec @s12 accept
        }
-
-       chain c13 {
-               tcp option mptcp subtype @s13 accept
-       }
-
-       chain c14 {
-               tcp option mptcp subtype . ip saddr @s14 accept
-       }
 }"