diff options
Diffstat (limited to 'tests/shell')
14 files changed, 31 insertions, 10 deletions
diff --git a/tests/shell/testcases/chains/0003jump_loop_1 b/tests/shell/testcases/chains/0003jump_loop_1 index 80e243f0..1a8eaf68 100755 --- a/tests/shell/testcases/chains/0003jump_loop_1 +++ b/tests/shell/testcases/chains/0003jump_loop_1 @@ -5,8 +5,9 @@ set -e MAX_JUMPS=16 $NFT add table t +$NFT "add chain t c1 { type filter hook prerouting priority 0; }" -for i in $(seq 1 $MAX_JUMPS) +for i in $(seq 2 $MAX_JUMPS) do $NFT add chain t c${i} done diff --git a/tests/shell/testcases/chains/0010endless_jump_loop_1 b/tests/shell/testcases/chains/0010endless_jump_loop_1 index 5d3ef239..6000e5d7 100755 --- a/tests/shell/testcases/chains/0010endless_jump_loop_1 +++ b/tests/shell/testcases/chains/0010endless_jump_loop_1 @@ -3,7 +3,7 @@ set -e $NFT add table t -$NFT add chain t c +$NFT add chain "t c { type filter hook input priority 0; }" # kernel should return ELOOP $NFT add rule t c tcp dport vmap {1 : jump c} 2>/dev/null || exit 0 diff --git a/tests/shell/testcases/chains/0011endless_jump_loop_1 b/tests/shell/testcases/chains/0011endless_jump_loop_1 index d75932d7..66abf8d0 100755 --- a/tests/shell/testcases/chains/0011endless_jump_loop_1 +++ b/tests/shell/testcases/chains/0011endless_jump_loop_1 @@ -3,7 +3,7 @@ set -e $NFT add table t -$NFT add chain t c1 +$NFT add chain "t c1 { type filter hook forward priority 0; }" $NFT add chain t c2 $NFT add map t m {type inet_service : verdict \;} $NFT add element t m {2 : jump c2} diff --git a/tests/shell/testcases/chains/0018check_jump_loop_1 b/tests/shell/testcases/chains/0018check_jump_loop_1 index b87520f2..1e674d3d 100755 --- a/tests/shell/testcases/chains/0018check_jump_loop_1 +++ b/tests/shell/testcases/chains/0018check_jump_loop_1 @@ -3,7 +3,7 @@ set -e $NFT add table ip filter -$NFT add chain ip filter ap1 +$NFT add chain ip filter ap1 "{ type filter hook input priority 0; }" $NFT add chain ip filter ap2 $NFT add rule ip filter ap1 jump ap2 diff --git a/tests/shell/testcases/chains/dumps/0003jump_loop_1.json-nft b/tests/shell/testcases/chains/dumps/0003jump_loop_1.json-nft index ceef3224..d197e123 100644 --- a/tests/shell/testcases/chains/dumps/0003jump_loop_1.json-nft +++ b/tests/shell/testcases/chains/dumps/0003jump_loop_1.json-nft @@ -19,7 +19,11 @@ "family": "ip", "table": "t", "name": "c1", - "handle": 0 + "handle": 0, + "type": "filter", + "hook": "prerouting", + "prio": 0, + "policy": "accept" } }, { diff --git a/tests/shell/testcases/chains/dumps/0003jump_loop_1.nft b/tests/shell/testcases/chains/dumps/0003jump_loop_1.nft index 7054cde4..8d89bc40 100644 --- a/tests/shell/testcases/chains/dumps/0003jump_loop_1.nft +++ b/tests/shell/testcases/chains/dumps/0003jump_loop_1.nft @@ -1,5 +1,6 @@ table ip t { chain c1 { + type filter hook prerouting priority filter; policy accept; jump c2 } diff --git a/tests/shell/testcases/chains/dumps/0010endless_jump_loop_1.json-nft b/tests/shell/testcases/chains/dumps/0010endless_jump_loop_1.json-nft index db64cdbc..af99873d 100644 --- a/tests/shell/testcases/chains/dumps/0010endless_jump_loop_1.json-nft +++ b/tests/shell/testcases/chains/dumps/0010endless_jump_loop_1.json-nft @@ -19,7 +19,11 @@ "family": "ip", "table": "t", "name": "c", - "handle": 0 + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" } } ] diff --git a/tests/shell/testcases/chains/dumps/0010endless_jump_loop_1.nft b/tests/shell/testcases/chains/dumps/0010endless_jump_loop_1.nft index 1e0d1d60..62fefaff 100644 --- a/tests/shell/testcases/chains/dumps/0010endless_jump_loop_1.nft +++ b/tests/shell/testcases/chains/dumps/0010endless_jump_loop_1.nft @@ -1,4 +1,5 @@ table ip t { chain c { + type filter hook input priority filter; policy accept; } } diff --git a/tests/shell/testcases/chains/dumps/0011endless_jump_loop_1.json-nft b/tests/shell/testcases/chains/dumps/0011endless_jump_loop_1.json-nft index e1a2262f..75a4d895 100644 --- a/tests/shell/testcases/chains/dumps/0011endless_jump_loop_1.json-nft +++ b/tests/shell/testcases/chains/dumps/0011endless_jump_loop_1.json-nft @@ -19,7 +19,11 @@ "family": "ip", "table": "t", "name": "c1", - "handle": 0 + "handle": 0, + "type": "filter", + "hook": "forward", + "prio": 0, + "policy": "accept" } }, { diff --git a/tests/shell/testcases/chains/dumps/0011endless_jump_loop_1.nft b/tests/shell/testcases/chains/dumps/0011endless_jump_loop_1.nft index ca0a7378..d35736e8 100644 --- a/tests/shell/testcases/chains/dumps/0011endless_jump_loop_1.nft +++ b/tests/shell/testcases/chains/dumps/0011endless_jump_loop_1.nft @@ -5,6 +5,7 @@ table ip t { } chain c1 { + type filter hook forward priority filter; policy accept; tcp dport vmap @m } diff --git a/tests/shell/testcases/chains/dumps/0018check_jump_loop_1.json-nft b/tests/shell/testcases/chains/dumps/0018check_jump_loop_1.json-nft index 7294c841..ac7e1199 100644 --- a/tests/shell/testcases/chains/dumps/0018check_jump_loop_1.json-nft +++ b/tests/shell/testcases/chains/dumps/0018check_jump_loop_1.json-nft @@ -19,7 +19,11 @@ "family": "ip", "table": "filter", "name": "ap1", - "handle": 0 + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" } }, { diff --git a/tests/shell/testcases/chains/dumps/0018check_jump_loop_1.nft b/tests/shell/testcases/chains/dumps/0018check_jump_loop_1.nft index 437900bc..bdd0ead7 100644 --- a/tests/shell/testcases/chains/dumps/0018check_jump_loop_1.nft +++ b/tests/shell/testcases/chains/dumps/0018check_jump_loop_1.nft @@ -1,5 +1,6 @@ table ip filter { chain ap1 { + type filter hook input priority filter; policy accept; jump ap2 } diff --git a/tests/shell/testcases/transactions/0023rule_1 b/tests/shell/testcases/transactions/0023rule_1 index e58c088c..863bcde4 100755 --- a/tests/shell/testcases/transactions/0023rule_1 +++ b/tests/shell/testcases/transactions/0023rule_1 @@ -1,7 +1,7 @@ #!/bin/bash RULESET="add table x -add chain x y +add chain x y { type filter hook input priority 0; } add rule x y jump y" # kernel must return ELOOP diff --git a/tests/shell/testcases/transactions/anon_chain_loop b/tests/shell/testcases/transactions/anon_chain_loop index 2fd61810..3053d166 100755 --- a/tests/shell/testcases/transactions/anon_chain_loop +++ b/tests/shell/testcases/transactions/anon_chain_loop @@ -3,7 +3,7 @@ # anon chains with c1 -> c2 recursive jump, expect failure $NFT -f - <<EOF table ip t { - chain c2 { } + chain c2 { type filter hook input priority 0; } chain c1 { } } |