diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2025-07-27 23:45:43 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2025-07-29 03:53:17 +0200 |
| commit | 199a63d2e71af03c239a0343e8687b44e20b71ad (patch) | |
| tree | 0dff6ff28af7a540b328bb7a2737947654a2956d | |
| parent | d83bd130529c08d5f0ab36af98ea03b288f3d83f (diff) | |
Revert mptcp tests for sets/typeof_sets_0
Revert tests:
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>
| -rw-r--r-- | tests/shell/testcases/sets/dumps/typeof_sets_0.nft | 19 | ||||
| -rwxr-xr-x | tests/shell/testcases/sets/typeof_sets_0 | 37 |
2 files changed, 0 insertions, 56 deletions
diff --git a/tests/shell/testcases/sets/dumps/typeof_sets_0.nft b/tests/shell/testcases/sets/dumps/typeof_sets_0.nft index 34aaab60..63fc5b14 100644 --- 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 28e39b4d..4c07288c 100755 --- 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 - } }" |