| Message ID | 20220404121410.188509-17-jeremy@azazel.net |
|---|---|
| State | Changes Requested |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | Extend values assignable to packet marks and payload fields | expand |
diff --git a/tests/shell/testcases/chains/0040mark_binop_2 b/tests/shell/testcases/chains/0040mark_binop_2 new file mode 100755 index 000000000000..94ebe976c987 --- /dev/null +++ b/tests/shell/testcases/chains/0040mark_binop_2 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +RULESET=" + add table t + add chain t c { type filter hook output priority filter; } + add rule t c ct mark set ip dscp lshift 2 or 0x10 +" + +$NFT -f - <<< "$RULESET" diff --git a/tests/shell/testcases/chains/0040mark_binop_3 b/tests/shell/testcases/chains/0040mark_binop_3 new file mode 100755 index 000000000000..b491565ca573 --- /dev/null +++ b/tests/shell/testcases/chains/0040mark_binop_3 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +RULESET=" + add table t + add chain t c { type filter hook input priority filter; } + add rule t c meta mark set ip dscp lshift 2 or 0x10 +" + +$NFT -f - <<< "$RULESET" diff --git a/tests/shell/testcases/chains/0040mark_binop_4 b/tests/shell/testcases/chains/0040mark_binop_4 new file mode 100755 index 000000000000..adc5f25ba930 --- /dev/null +++ b/tests/shell/testcases/chains/0040mark_binop_4 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +RULESET=" + add table t + add chain t c { type filter hook output priority filter; } + add rule t c ct mark set ip dscp lshift 26 or 0x10 +" + +$NFT -f - <<< "$RULESET" diff --git a/tests/shell/testcases/chains/0040mark_binop_5 b/tests/shell/testcases/chains/0040mark_binop_5 new file mode 100755 index 000000000000..286b7b1fc7f9 --- /dev/null +++ b/tests/shell/testcases/chains/0040mark_binop_5 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +RULESET=" + add table t + add chain t c { type filter hook input priority filter; } + add rule t c meta mark set ip dscp lshift 26 or 0x10 +" + +$NFT -f - <<< "$RULESET" diff --git a/tests/shell/testcases/chains/0040mark_binop_6 b/tests/shell/testcases/chains/0040mark_binop_6 new file mode 100755 index 000000000000..9ea82952ef24 --- /dev/null +++ b/tests/shell/testcases/chains/0040mark_binop_6 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +RULESET=" + add table ip6 t + add chain ip6 t c { type filter hook output priority filter; } + add rule ip6 t c ct mark set ip6 dscp lshift 2 or 0x10 +" + +$NFT -f - <<< "$RULESET" diff --git a/tests/shell/testcases/chains/0040mark_binop_7 b/tests/shell/testcases/chains/0040mark_binop_7 new file mode 100755 index 000000000000..ff9cfb55ac3e --- /dev/null +++ b/tests/shell/testcases/chains/0040mark_binop_7 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +RULESET=" + add table ip6 t + add chain ip6 t c { type filter hook input priority filter; } + add rule ip6 t c meta mark set ip6 dscp lshift 2 or 0x10 +" + +$NFT -f - <<< "$RULESET" diff --git a/tests/shell/testcases/chains/0040mark_binop_8 b/tests/shell/testcases/chains/0040mark_binop_8 new file mode 100755 index 000000000000..b348ee9367df --- /dev/null +++ b/tests/shell/testcases/chains/0040mark_binop_8 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +RULESET=" + add table ip6 t + add chain ip6 t c { type filter hook output priority filter; } + add rule ip6 t c ct mark set ip6 dscp lshift 26 or 0x10 +" + +$NFT -f - <<< "$RULESET" diff --git a/tests/shell/testcases/chains/0040mark_binop_9 b/tests/shell/testcases/chains/0040mark_binop_9 new file mode 100755 index 000000000000..d19447d42b22 --- /dev/null +++ b/tests/shell/testcases/chains/0040mark_binop_9 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +RULESET=" + add table ip6 t + add chain ip6 t c { type filter hook input priority filter; } + add rule ip6 t c meta mark set ip6 dscp lshift 26 or 0x10 +" + +$NFT -f - <<< "$RULESET" diff --git a/tests/shell/testcases/chains/dumps/0040mark_binop_2.nft b/tests/shell/testcases/chains/dumps/0040mark_binop_2.nft new file mode 100644 index 000000000000..7dc274f4e6a3 --- /dev/null +++ b/tests/shell/testcases/chains/dumps/0040mark_binop_2.nft @@ -0,0 +1,6 @@ +table ip t { + chain c { + type filter hook output priority filter; policy accept; + ct mark set ip dscp << 2 | 16 + } +} diff --git a/tests/shell/testcases/chains/dumps/0040mark_binop_3.nft b/tests/shell/testcases/chains/dumps/0040mark_binop_3.nft new file mode 100644 index 000000000000..c484f7a54948 --- /dev/null +++ b/tests/shell/testcases/chains/dumps/0040mark_binop_3.nft @@ -0,0 +1,6 @@ +table ip t { + chain c { + type filter hook input priority filter; policy accept; + meta mark set ip dscp << 2 | 16 + } +} diff --git a/tests/shell/testcases/chains/dumps/0040mark_binop_4.nft b/tests/shell/testcases/chains/dumps/0040mark_binop_4.nft new file mode 100644 index 000000000000..1bebea1683bc --- /dev/null +++ b/tests/shell/testcases/chains/dumps/0040mark_binop_4.nft @@ -0,0 +1,6 @@ +table ip t { + chain c { + type filter hook output priority filter; policy accept; + ct mark set ip dscp << 26 | 16 + } +} diff --git a/tests/shell/testcases/chains/dumps/0040mark_binop_5.nft b/tests/shell/testcases/chains/dumps/0040mark_binop_5.nft new file mode 100644 index 000000000000..787c6cdd9231 --- /dev/null +++ b/tests/shell/testcases/chains/dumps/0040mark_binop_5.nft @@ -0,0 +1,6 @@ +table ip t { + chain c { + type filter hook input priority filter; policy accept; + meta mark set ip dscp << 26 | 16 + } +} diff --git a/tests/shell/testcases/chains/dumps/0040mark_binop_6.nft b/tests/shell/testcases/chains/dumps/0040mark_binop_6.nft new file mode 100644 index 000000000000..53940eaf2ea4 --- /dev/null +++ b/tests/shell/testcases/chains/dumps/0040mark_binop_6.nft @@ -0,0 +1,6 @@ +table ip6 t { + chain c { + type filter hook output priority filter; policy accept; + ct mark set ip6 dscp << 2 | 16 + } +} diff --git a/tests/shell/testcases/chains/dumps/0040mark_binop_7.nft b/tests/shell/testcases/chains/dumps/0040mark_binop_7.nft new file mode 100644 index 000000000000..35e12a0af66d --- /dev/null +++ b/tests/shell/testcases/chains/dumps/0040mark_binop_7.nft @@ -0,0 +1,6 @@ +table ip6 t { + chain c { + type filter hook input priority filter; policy accept; + meta mark set ip6 dscp << 2 | 16 + } +} diff --git a/tests/shell/testcases/chains/dumps/0040mark_binop_8.nft b/tests/shell/testcases/chains/dumps/0040mark_binop_8.nft new file mode 100644 index 000000000000..f9f16c2491d4 --- /dev/null +++ b/tests/shell/testcases/chains/dumps/0040mark_binop_8.nft @@ -0,0 +1,6 @@ +table ip6 t { + chain c { + type filter hook output priority filter; policy accept; + ct mark set ip6 dscp << 26 | 16 + } +} diff --git a/tests/shell/testcases/chains/dumps/0040mark_binop_9.nft b/tests/shell/testcases/chains/dumps/0040mark_binop_9.nft new file mode 100644 index 000000000000..03c69c3f7cd2 --- /dev/null +++ b/tests/shell/testcases/chains/dumps/0040mark_binop_9.nft @@ -0,0 +1,6 @@ +table ip6 t { + chain c { + type filter hook input priority filter; policy accept; + meta mark set ip6 dscp << 26 | 16 + } +}
Add new test-cases to verify that defining a rule that sets the ct or packet mark to a value derived from a payload works correctly. Signed-off-by: Jeremy Sowden <jeremy@azazel.net> --- tests/shell/testcases/chains/0040mark_binop_2 | 11 +++++++++++ tests/shell/testcases/chains/0040mark_binop_3 | 11 +++++++++++ tests/shell/testcases/chains/0040mark_binop_4 | 11 +++++++++++ tests/shell/testcases/chains/0040mark_binop_5 | 11 +++++++++++ tests/shell/testcases/chains/0040mark_binop_6 | 11 +++++++++++ tests/shell/testcases/chains/0040mark_binop_7 | 11 +++++++++++ tests/shell/testcases/chains/0040mark_binop_8 | 11 +++++++++++ tests/shell/testcases/chains/0040mark_binop_9 | 11 +++++++++++ .../shell/testcases/chains/dumps/0040mark_binop_2.nft | 6 ++++++ .../shell/testcases/chains/dumps/0040mark_binop_3.nft | 6 ++++++ .../shell/testcases/chains/dumps/0040mark_binop_4.nft | 6 ++++++ .../shell/testcases/chains/dumps/0040mark_binop_5.nft | 6 ++++++ .../shell/testcases/chains/dumps/0040mark_binop_6.nft | 6 ++++++ .../shell/testcases/chains/dumps/0040mark_binop_7.nft | 6 ++++++ .../shell/testcases/chains/dumps/0040mark_binop_8.nft | 6 ++++++ .../shell/testcases/chains/dumps/0040mark_binop_9.nft | 6 ++++++ 16 files changed, 136 insertions(+) create mode 100755 tests/shell/testcases/chains/0040mark_binop_2 create mode 100755 tests/shell/testcases/chains/0040mark_binop_3 create mode 100755 tests/shell/testcases/chains/0040mark_binop_4 create mode 100755 tests/shell/testcases/chains/0040mark_binop_5 create mode 100755 tests/shell/testcases/chains/0040mark_binop_6 create mode 100755 tests/shell/testcases/chains/0040mark_binop_7 create mode 100755 tests/shell/testcases/chains/0040mark_binop_8 create mode 100755 tests/shell/testcases/chains/0040mark_binop_9 create mode 100644 tests/shell/testcases/chains/dumps/0040mark_binop_2.nft create mode 100644 tests/shell/testcases/chains/dumps/0040mark_binop_3.nft create mode 100644 tests/shell/testcases/chains/dumps/0040mark_binop_4.nft create mode 100644 tests/shell/testcases/chains/dumps/0040mark_binop_5.nft create mode 100644 tests/shell/testcases/chains/dumps/0040mark_binop_6.nft create mode 100644 tests/shell/testcases/chains/dumps/0040mark_binop_7.nft create mode 100644 tests/shell/testcases/chains/dumps/0040mark_binop_8.nft create mode 100644 tests/shell/testcases/chains/dumps/0040mark_binop_9.nft