Description: Disable tests related to unsupport --bitmask flag Added in the Linux kernel >= 6.2 Author: Neutron Soutmun Forwarded: not-needed Last-Update: 2023-02-12 Index: ipset/tests/hash:ip,port.t =================================================================== --- ipset.orig/tests/hash:ip,port.t +++ ipset/tests/hash:ip,port.t @@ -170,122 +170,4 @@ 0 ./check_extensions test 2.0.0.20 700 13 12479 # Counters and timeout: destroy set 0 ipset x test -# Network: Create a set with timeout and netmask -0 ipset -N test hash:ip,port --hashsize 128 --netmask 24 timeout 4 -# Network: Add zero valued element -1 ipset -A test 0.0.0.0,80 -# Network: Test zero valued element -1 ipset -T test 0.0.0.0,80 -# Network: Delete zero valued element -1 ipset -D test 0.0.0.0,80 -# Network: Add first random network -0 ipset -A test 2.0.0.1,8080 -# Network: Add second random network -0 ipset -A test 192.168.68.69,22 -# Network: Test first random value -0 ipset -T test 2.0.0.255,8080 -# Network: Test second random value -0 ipset -T test 192.168.68.95,22 -# Network: Test value not added to the set -1 ipset -T test 2.0.1.0,8080 -# Network: Add third element -0 ipset -A test 200.100.10.1,22 timeout 0 -# Network: Add third random network -0 ipset -A test 200.100.0.12,22 -# Network: Delete the same network -0 ipset -D test 200.100.0.12,22 -# Network: List set -0 ipset -L test > .foo0 && ./sort.sh .foo0 -# Network: Check listing -0 ./diff.sh .foo hash:ip,port.t.list3 -# Sleep 5s so that elements can time out -0 sleep 5 -# Network: List set -0 ipset -L test > .foo -# Network: Check listing -0 ./diff.sh .foo hash:ip,port.t.list4 -# Network: Flush test set -0 ipset -F test -# Network: add element with 1s timeout -0 ipset add test 200.100.0.12,80 timeout 1 -# Network: readd element with 3s timeout -0 ipset add test 200.100.0.12,80 timeout 3 -exist -# Network: sleep 2s -0 sleep 2s -# Network: check readded element -0 ipset test test 200.100.0.12,80 -# Network: Delete test set -0 ipset -X test -# Network: Create a set with timeout and bitmask -0 ipset -N test hash:ip,port --hashsize 128 --bitmask 255.255.255.0 timeout 4 -# Network: Add zero valued element -1 ipset -A test 0.0.0.0,80 -# Network: Test zero valued element -1 ipset -T test 0.0.0.0,80 -# Network: Delete zero valued element -1 ipset -D test 0.0.0.0,80 -# Network: Add first random network -0 ipset -A test 2.0.0.1,8080 -# Network: Add second random network -0 ipset -A test 192.168.68.69,22 -# Network: Test first random value -0 ipset -T test 2.0.0.255,8080 -# Network: Test second random value -0 ipset -T test 192.168.68.95,22 -# Network: Test value not added to the set -1 ipset -T test 2.0.1.0,8080 -# Network: Add third element -0 ipset -A test 200.100.10.1,22 timeout 0 -# Network: Add third random network -0 ipset -A test 200.100.0.12,22 -# Network: Delete the same network -0 ipset -D test 200.100.0.12,22 -# Network: List set -0 ipset -L test > .foo0 && ./sort.sh .foo0 -# Network: Check listing -0 ./diff.sh .foo hash:ip,port.t.list5 -# Sleep 5s so that elements can time out -0 sleep 5 -# Network: List set -0 ipset -L test > .foo -# Network: Check listing -0 ./diff.sh .foo hash:ip,port.t.list6 -# Network: Flush test set -0 ipset -F test -# Network: add element with 1s timeout -0 ipset add test 200.100.0.12,80 timeout 1 -# Network: readd element with 3s timeout -0 ipset add test 200.100.0.12,80 timeout 3 -exist -# Network: sleep 2s -0 sleep 2s -# Network: check readded element -0 ipset test test 200.100.0.12,80 -# Network: Delete test set -0 ipset -X test -# Network: Create a set with bitmask which is not a valid netmask -0 ipset -N test hash:ip,port --hashsize 128 --bitmask 255.255.0.255 -# Network: Add zero valued element -1 ipset -A test 0.0.0.0 -# Network: Test zero valued element -1 ipset -T test 0.0.0.0 -# Network: Delete zero valued element -1 ipset -D test 0.0.0.0 -# Network: Add first random network -0 ipset -A test 1.2.3.4,22 -# Network: Add second random network -0 ipset -A test 1.168.122.124,22 -# Network: Test first random value -0 ipset -T test 1.2.9.4,22 -# Network: Test second random value -0 ipset -T test 1.168.68.124,22 -# Network: Test value not added to the set -1 ipset -T test 2.0.1.0,23 -# Network: Test delete value -0 ipset -D test 1.168.0.124,22 -# Network: List set -0 ipset -L test > .foo -# Network: Check listing -0 ./diff.sh .foo hash:ip,port.t.list7 -# Network: Delete test set -0 ipset -X test # eof Index: ipset/tests/hash:ip.t =================================================================== --- ipset.orig/tests/hash:ip.t +++ ipset/tests/hash:ip.t @@ -72,52 +72,6 @@ 0 n=`ipset list test|grep '^10.0'|wc -l` && test $n -eq 1024 # IP: Destroy sets 0 ipset -X -# Network: Create a set with timeout and netmask -0 ipset -N test iphash --hashsize 128 --netmask 24 timeout 4 -# Network: Add zero valued element -1 ipset -A test 0.0.0.0 -# Network: Test zero valued element -1 ipset -T test 0.0.0.0 -# Network: Delete zero valued element -1 ipset -D test 0.0.0.0 -# Network: Add first random network -0 ipset -A test 2.0.0.1 -# Network: Add second random network -0 ipset -A test 192.168.68.69 -# Network: Test first random value -0 ipset -T test 2.0.0.255 -# Network: Test second random value -0 ipset -T test 192.168.68.95 -# Network: Test value not added to the set -1 ipset -T test 2.0.1.0 -# Network: Add third element -0 ipset -A test 200.100.10.1 timeout 0 -# Network: Add third random network -0 ipset -A test 200.100.0.12 -# Network: Delete the same network -0 ipset -D test 200.100.0.12 -# Network: List set -0 ipset -L test > .foo0 && ./sort.sh .foo0 -# Network: Check listing -0 ./diff.sh .foo hash:ip.t.list3 -# Sleep 5s so that elements can time out -0 sleep 5 -# Network: List set -0 ipset -L test > .foo -# Network: Check listing -0 ./diff.sh .foo hash:ip.t.list1 -# Network: Flush test set -0 ipset -F test -# Network: add element with 1s timeout -0 ipset add test 200.100.0.12 timeout 1 -# Network: readd element with 3s timeout -0 ipset add test 200.100.0.12 timeout 3 -exist -# Network: sleep 2s -0 sleep 2s -# Network: check readded element -0 ipset test test 200.100.0.12 -# Network: Delete test set -0 ipset -X test # Range: Create set 0 ipset create test hash:ip # Range: Add a single element @@ -216,78 +170,4 @@ skip which sendip 0 ./check_extensions test 10.255.255.64 600 6 $((6*40)) # Counters and timeout: destroy set 0 ipset x test -# Network: Create a set with timeout and bitmask -0 ipset -N test iphash --hashsize 128 --bitmask 255.255.255.0 timeout 4 -# Network: Add zero valued element -1 ipset -A test 0.0.0.0 -# Network: Test zero valued element -1 ipset -T test 0.0.0.0 -# Network: Delete zero valued element -1 ipset -D test 0.0.0.0 -# Network: Add first random network -0 ipset -A test 2.0.0.1 -# Network: Add second random network -0 ipset -A test 192.168.68.69 -# Network: Test first random value -0 ipset -T test 2.0.0.255 -# Network: Test second random value -0 ipset -T test 192.168.68.95 -# Network: Test value not added to the set -1 ipset -T test 2.0.1.0 -# Network: Add third element -0 ipset -A test 200.100.10.1 timeout 0 -# Network: Add third random network -0 ipset -A test 200.100.0.12 -# Network: Delete the same network -0 ipset -D test 200.100.0.12 -# Network: List set -0 ipset -L test > .foo0 && ./sort.sh .foo0 -# Network: Check listing -0 ./diff.sh .foo hash:ip.t.list4 -# Sleep 5s so that elements can time out -0 sleep 5 -# Network: List set -0 ipset -L test > .foo -# Network: Check listing -0 ./diff.sh .foo hash:ip.t.list5 -# Network: Flush test set -0 ipset -F test -# Network: add element with 1s timeout -0 ipset add test 200.100.0.12 timeout 1 -# Network: readd element with 3s timeout -0 ipset add test 200.100.0.12 timeout 3 -exist -# Network: sleep 2s -0 sleep 2s -# Network: check readded element -0 ipset test test 200.100.0.12 -# Network: Delete test set -0 ipset -X test -# Network: Create a set with both bitmask and netmask -1 ipset -N test iphash --hashsize 128 --bitmask 255.255.0.255 --netmask 24 -# Network: Create a set with bitmask which is not a valid netmask -0 ipset -N test iphash --hashsize 128 --bitmask 255.255.0.255 -# Network: Add zero valued element -1 ipset -A test 0.0.0.0 -# Network: Test zero valued element -1 ipset -T test 0.0.0.0 -# Network: Delete zero valued element -1 ipset -D test 0.0.0.0 -# Network: Add first random network -0 ipset -A test 1.2.3.4 -# Network: Add second random network -0 ipset -A test 1.2.4.5 -# Network: Test first random value -0 ipset -T test 1.2.9.4 -# Network: Test second random value -0 ipset -T test 1.2.9.5 -# Network: Test value not added to the set -1 ipset -T test 2.0.1.0 -# Network: Test delete value -0 ipset -D test 1.2.0.5 -# Network: List set -0 ipset -L test > .foo -# Network: Check listing -0 ./diff.sh .foo hash:ip.t.list6 -# Network: Delete test set -0 ipset -X test # eof Index: ipset/tests/hash:net,net.t =================================================================== --- ipset.orig/tests/hash:net,net.t +++ ipset/tests/hash:net,net.t @@ -166,110 +166,4 @@ 0 ./check_extensions test 2.0.0.0/25,2.0.0.0/25 700 13 12479 # Counters and timeout: destroy set 0 ipset x test -# Network: Create a set with timeout and netmask -0 ipset -N test hash:net,net --hashsize 128 --netmask 24 timeout 4 -# Network: Add first random network -0 ipset -A test 2.0.10.1,2.10.10.254 -# Network: Add second random network -0 ipset -A test 192.168.68.1,192.168.68.254 -# Network: Test first random value -0 ipset -T test 2.0.10.11,2.10.10.25 -# Network: Test second random value -0 ipset -T test 192.168.68.11,192.168.68.5 -# Network: Test value not added to the set -1 ipset -T test 2.10.1.0,21.0.1.0 -# Network: Add third element -0 ipset -A test 200.100.10.1,200.100.10.100 timeout 0 -# Network: Add third random network -0 ipset -A test 200.100.0.12,200.100.0.13 -# Network: Delete the same network -0 ipset -D test 200.100.0.12,200.100.0.13 -# Network: List set -0 ipset -L test > .foo0 && ./sort.sh .foo0 -# Network: Check listing -0 ./diff.sh .foo hash:net,net.t.list3 -# Sleep 5s so that elements can time out -0 sleep 5 -# Network: List set -0 ipset -L test > .foo -# Network: Check listing -0 ./diff.sh .foo hash:net,net.t.list4 -# Network: Flush test set -0 ipset -F test -# Network: add element with 1s timeout -0 ipset add test 200.100.0.12,80.20.0.12 timeout 1 -# Network: readd element with 3s timeout -0 ipset add test 200.100.0.12,80.20.0.12 timeout 3 -exist -# Network: sleep 2s -0 sleep 2s -# Network: check readded element -0 ipset test test 200.100.0.12,80.20.0.12 -# Network: Delete test set -0 ipset -X test -# Network: Create a set with timeout and bitmask -0 ipset -N test hash:net,net --hashsize 128 --bitmask 255.255.255.0 timeout 4 -# Network: Add first random network -0 ipset -A test 2.0.10.1,2.10.10.254 -# Network: Add second random network -0 ipset -A test 192.168.68.1,192.168.68.254 -# Network: Test first random value -0 ipset -T test 2.0.10.11,2.10.10.25 -# Network: Test second random value -0 ipset -T test 192.168.68.11,192.168.68.5 -# Network: Test value not added to the set -1 ipset -T test 2.10.1.0,21.0.1.0 -# Network: Add third element -0 ipset -A test 200.100.10.1,200.100.10.100 timeout 0 -# Network: Add third random network -0 ipset -A test 200.100.0.12,200.100.0.13 -# Network: Delete the same network -0 ipset -D test 200.100.0.12,200.100.0.13 -# Network: List set -0 ipset -L test > .foo0 && ./sort.sh .foo0 -# Network: Check listing -0 ./diff.sh .foo hash:net,net.t.list5 -# Sleep 5s so that elements can time out -0 sleep 5 -# Network: List set -0 ipset -L test > .foo -# Network: Check listing -0 ./diff.sh .foo hash:net,net.t.list6 -# Network: Flush test set -0 ipset -F test -# Network: add element with 1s timeout -0 ipset add test 200.100.0.12,80.20.0.12 timeout 1 -# Network: readd element with 3s timeout -0 ipset add test 200.100.0.12,80.20.0.12 timeout 3 -exist -# Network: sleep 2s -0 sleep 2s -# Network: check readded element -0 ipset test test 200.100.0.12,80.20.0.12 -# Network: Delete test set -0 ipset -X test -# Network: Create a set with bitmask which is not a valid netmask -0 ipset -N test hash:net,net --hashsize 128 --bitmask 255.255.0.255 -# Network: Add zero valued element -1 ipset -A test 0.0.0.0 -# Network: Test zero valued element -1 ipset -T test 0.0.0.0 -# Network: Delete zero valued element -1 ipset -D test 0.0.0.0 -# Network: Add first random network -0 ipset -A test 1.2.3.4,22.23.24.25 -# Network: Add second random network -0 ipset -A test 1.168.122.124,122.23.45.50 -# Network: Test first random value -0 ipset -T test 1.2.43.4,22.23.2.25 -# Network: Test second random value -0 ipset -T test 1.168.12.124,122.23.4.50 -# Network: Test value not added to the set -1 ipset -T test 2.168.122.124,22.23.45.50 -# Network: Test delete value -0 ipset -D test 1.168.12.124,122.23.0.50 -# Network: List set -0 ipset -L test > .foo -# Network: Check listing -0 ./diff.sh .foo hash:net,net.t.list7 -# Network: Delete test set -0 ipset -X test # eof