From b7a5d5e828989b2f32746fe860f4e8b59c332198 Mon Sep 17 00:00:00 2001 From: Vytas Dauksa Date: Thu, 23 Jan 2014 07:37:48 +0100 Subject: print mark & mark mask in hex rather then decimal modified ipset_print_mark to print in hex rather then decimal and altered accordingly test cases. Signed-off-by: Jozsef Kadlecsik --- tests/ipmarkhash.t | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'tests/ipmarkhash.t') diff --git a/tests/ipmarkhash.t b/tests/ipmarkhash.t index 30301fb..e96bbfa 100644 --- a/tests/ipmarkhash.t +++ b/tests/ipmarkhash.t @@ -5,31 +5,31 @@ # Create a set 0 ipset -N test ipmarkhash # Add partly zero valued element -0 ipset -A test 2.0.0.1,0 +0 ipset -A test 2.0.0.1,0x0 # Test partly zero valued element -0 ipset -T test 2.0.0.1,0 +0 ipset -T test 2.0.0.1,0x0 # Delete partly zero valued element -0 ipset -D test 2.0.0.1,0 +0 ipset -D test 2.0.0.1,0x0 # Add first random value -0 ipset -A test 2.0.0.1,5 +0 ipset -A test 2.0.0.1,0x5 # Add second random value -0 ipset -A test 2.1.0.0,128 +0 ipset -A test 2.1.0.0,0x80 # Test first random value -0 ipset -T test 2.0.0.1,5 +0 ipset -T test 2.0.0.1,0x5 # Test second random value -0 ipset -T test 2.1.0.0,128 +0 ipset -T test 2.1.0.0,0x80 # Test value not added to the set -1 ipset -T test 2.0.0.1,4 +1 ipset -T test 2.0.0.1,0x4 # Delete value not added to the set -1 ipset -D test 2.0.0.1,6 +1 ipset -D test 2.0.0.1,0x6 # Test value before first random value -1 ipset -T test 2.0.0.0,5 +1 ipset -T test 2.0.0.0,0x5 # Test value after second random value -1 ipset -T test 2.1.0.1,128 +1 ipset -T test 2.1.0.1,0x80 # Try to add value before first random value -0 ipset -A test 2.0.0.0,5 +0 ipset -A test 2.0.0.0,0x5 # Try to add value after second random value -0 ipset -A test 2.1.0.1,128 +0 ipset -A test 2.1.0.1,0x80 # List set 0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 # Check listing @@ -41,25 +41,25 @@ # Create a set from a network (network ignored) 0 ipset -N test ipmarkhash --network 2.0.0.0/16 # Add first random value -0 ipset -A test 2.0.0.0,5 +0 ipset -A test 2.0.0.0,0x5 # Add second random value -0 ipset -A test 2.0.255.255,128 +0 ipset -A test 2.0.255.255,0x80 # Test first random value -0 ipset -T test 2.0.0.0,5 +0 ipset -T test 2.0.0.0,0x5 # Test second random value -0 ipset -T test 2.0.255.255,128 +0 ipset -T test 2.0.255.255,0x80 # Test value not added to the set -1 ipset -T test 2.0.0.0,4 +1 ipset -T test 2.0.0.0,0x4 # Delete value not added to the set -1 ipset -D test 2.0.0.0,6 +1 ipset -D test 2.0.0.0,0x6 # Test value before first random value -1 ipset -T test 1.255.255.255,5 +1 ipset -T test 1.255.255.255,0x5 # Test value after second random value -1 ipset -T test 2.1.0.0,128 +1 ipset -T test 2.1.0.0,0x80 # Try to add value before first random value -0 ipset -A test 1.255.255.255,5 +0 ipset -A test 1.255.255.255,0x5 # Try to add value after second random value -0 ipset -A test 2.1.0.0,128 +0 ipset -A test 2.1.0.0,0x80 # List set 0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 # Check listing -- cgit v1.2.3