From 4eec8b3824d49c1c0503ebbf7844a4e312bc29e1 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu" Date: Thu, 13 Nov 2008 09:36:37 +0000 Subject: 2.4.4 - Premature checking prevents to add valid elements to hash types, fixed (bug reported by JC Janos). - Local variable shadows another variable, fixed (reported by Jan Engelhardt). - More compiler warning options added and warnings fixed. --- tests/iphash.t | 6 ++++++ tests/ipporthash.t | 2 ++ tests/ipportiphash.t | 8 ++++++++ tests/ipportnethash.t | 12 ++++++++++-- tests/nethash.t | 12 ++++++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/iphash.t b/tests/iphash.t index 46ce58b..4c33ce3 100644 --- a/tests/iphash.t +++ b/tests/iphash.t @@ -28,6 +28,12 @@ 0 ipset -X test # Network: Create a set 0 ipset -N test iphash --hashsize 128 --netmask 24 +# Range: Add zero valued element +2 ipset -A test 0.0.0.0 +# Range: Test zero valued element +2 ipset -T test 0.0.0.0 +# Range: Delete zero valued element +2 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 diff --git a/tests/ipporthash.t b/tests/ipporthash.t index 4db4bf3..74fed1a 100644 --- a/tests/ipporthash.t +++ b/tests/ipporthash.t @@ -6,6 +6,8 @@ 1 ipset -A test 2.0.0.1,0 # Range: Test zero valued element 1 ipset -T test 2.0.0.1,0 +# Range: Delete zero valued element +1 ipset -D test 2.0.0.1,0 # Range: Add lower boundary 0 ipset -A test 2.0.0.1,5 # Range: Add upper boundary diff --git a/tests/ipportiphash.t b/tests/ipportiphash.t index 2b38667..c7c25e5 100644 --- a/tests/ipportiphash.t +++ b/tests/ipportiphash.t @@ -6,6 +6,14 @@ 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: Add almost zero valued element +0 ipset -A test 2.0.0.1,0,0.0.0.1 +# Range: Test almost zero valued element +0 ipset -T test 2.0.0.1,0,0.0.0.1 +# Range: Delete almost zero valued element +0 ipset -D test 2.0.0.1,0,0.0.0.1 # Range: Add lower boundary 0 ipset -A test 2.0.0.1,5,1.1.1.1 # Range: Add upper boundary diff --git a/tests/ipportnethash.t b/tests/ipportnethash.t index 35cb9fc..0b87dad 100644 --- a/tests/ipportnethash.t +++ b/tests/ipportnethash.t @@ -3,9 +3,17 @@ # Range: Create a set from a valid range 0 ipset -N test ipportnethash --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/1 +2 ipset -A test 2.0.0.1,0,0.0.0.0/0 # Range: Test zero valued element -1 ipset -T test 2.0.0.1,0,0.0.0.0/1 +2 ipset -T test 2.0.0.1,0,0.0.0.0/0 +# Range: Delete zero valued element +2 ipset -D test 2.0.0.1,0,0.0.0.0/0 +# Range: Add almost zero valued element +0 ipset -A test 2.0.0.1,0,0.0.0.0/24 +# Range: Test almost zero valued element +0 ipset -T test 2.0.0.1,0,0.0.0.0/24 +# Range: Delete almost zero valued element +0 ipset -D test 2.0.0.1,0,0.0.0.0/24 # Range: Add lower boundary 0 ipset -A test 2.0.0.1,5,1.1.1.1/24 # Range: Add upper boundary diff --git a/tests/nethash.t b/tests/nethash.t index 0011216..b2f234e 100644 --- a/tests/nethash.t +++ b/tests/nethash.t @@ -4,6 +4,18 @@ 2 ipset -A test 0.0.0.0/0 # Range: Test zero valued element 2 ipset -T test 0.0.0.0/0 +# Range: Delete zero valued element +2 ipset -D test 0.0.0.0/0 +# Range: Try to add /0 +2 ipset -A test 1.1.1.1/0 +# Range: Try to add /32 +2 ipset -A test 1.1.1.1/32 +# Range: Add almost zero valued element +0 ipset -A test 0.0.0.0/1 +# Range: Test almost zero valued element +0 ipset -T test 0.0.0.0/1 +# Range: Delete almost zero valued element +0 ipset -D test 0.0.0.0/1 # Add first random network 0 ipset -A test 2.0.0.1/24 # Add second random network -- cgit v1.2.3