From 3fd6b24ace319b139ec3c4e3031a5f05d21e304e Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Tue, 15 Jun 2010 13:30:55 +0200 Subject: ipset 5 in an almost ready state - milestone Reworked protocol and internal interfaces, missing set types added, backward compatibility verified, lots of tests added (and thanks to the tests, bugs fixed), even the manpage is rewritten ;-). Countless changes everywhere... The missing bits before announcing ipset 5: - net namespace support - new iptables/ip6tables extension library - iptables/ip6tables match and target tests (backward/forward compatibility) - tests on catching syntax errors --- tests/ipportiphash.t | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'tests/ipportiphash.t') diff --git a/tests/ipportiphash.t b/tests/ipportiphash.t index 860d5a6..3f61947 100644 --- a/tests/ipportiphash.t +++ b/tests/ipportiphash.t @@ -1,13 +1,15 @@ -# Range: Try to create from an invalid range -2 ipset -N test ipportiphash --from 2.0.0.1 --to 2.1.0.1 -# Range: Create a set from a valid range +# Range: Create a set from a range (range ignored) 0 ipset -N test ipportiphash --from 2.0.0.1 --to 2.1.0.0 -# Range: Add zero valued element -1 ipset -A test 2.0.0.1,0,0.0.0.0 -# Range: Test zero valued element -1 ipset -T test 2.0.0.1,0,0.0.0.0 -# Range: Delete zero valued element -1 ipset -D test 2.0.0.1,0,0.0.0.0 +# Range: Destroy set +0 ipset -X test +# Range: Create a set +0 ipset -N test ipportiphash +# Range: Add partly zero valued element +0 ipset -A test 2.0.0.1,0,0.0.0.0 +# Range: Test partly zero valued element +0 ipset -T test 2.0.0.1,0,0.0.0.0 +# Range: Delete party zero valued element +0 ipset -D test 2.0.0.1,0,0.0.0.0 # Range: Add almost zero valued element 0 ipset -A test 2.0.0.1,0,0.0.0.1 # Range: Test almost zero valued element @@ -33,20 +35,18 @@ # Range: Test value after upper boundary 1 ipset -T test 2.1.0.1,128,2.2.2.2 # Range: Try to add value before lower boundary -1 ipset -A test 2.0.0.0,5,1.1.1.1 +0 ipset -A test 2.0.0.0,5,1.1.1.1 # Range: Try to add value after upper boundary -1 ipset -A test 2.1.0.1,128,2.2.2.2 +0 ipset -A test 2.1.0.1,128,2.2.2.2 # Range: List set 0 ipset -L test > .foo0 && ./sort.sh .foo0 # Range: Check listing -0 diff .foo ipportiphash.t.list0 && rm .foo +0 diff -I 'Size in memory.*' .foo ipportiphash.t.list0 && rm .foo # Range: Flush test set 0 ipset -F test # Range: Delete test set 0 ipset -X test -# Network: Try to create a set from an invalid network -2 ipset -N test ipportiphash --network 2.0.0.0/15 -# Network: Create a set from a valid network +# Network: Create a set from a valid network (network ignored) 0 ipset -N test ipportiphash --network 2.0.0.0/16 # Network: Add lower boundary 0 ipset -A test 2.0.0.0,5,1.1.1.1 @@ -65,13 +65,15 @@ # Network: Test value after upper boundary 1 ipset -T test 2.1.0.0,128,2.2.2.2 # Network: Try to add value before lower boundary -1 ipset -A test 1.255.255.255,5,1.1.1.1 -# Network: Try to add value after upper boundary -1 ipset -A test 2.1.0.0,128,2.2.2.2 +0 ipset -A test 1.255.255.255,5,1.1.1.1 +# Network: Try to test value before lower boundary +0 ipset -T test 1.255.255.255,5,1.1.1.1 +# Network: Try to del value before lower boundary +0 ipset -D test 1.255.255.255,5,1.1.1.1 # Network: List set 0 ipset -L test > .foo0 && ./sort.sh .foo0 # Network: Check listing -0 diff .foo ipportiphash.t.list1 && rm .foo +0 diff -I 'Size in memory.*' .foo ipportiphash.t.list1 && rm .foo # Network: Flush test set 0 ipset -F test # Network: Delete test set -- cgit v1.2.3