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/bitmap:ip.t | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'tests/bitmap:ip.t') diff --git a/tests/bitmap:ip.t b/tests/bitmap:ip.t index b44f5c4..03cbe0d 100644 --- a/tests/bitmap:ip.t +++ b/tests/bitmap:ip.t @@ -23,21 +23,21 @@ # Range: Delete element not added to the set 1 ipset -D test 2.0.0.2 # Range: Delete element not added to the set, with exist flag -0 ipset -x -D test 2.0.0.2 +0 ipset -! -D test 2.0.0.2 # Range: Add element in the middle 0 ipset -A test 2.0.0.128 # Range: Add element in the middle again 1 ipset -A test 2.0.0.128 # Range: Add element in the middle again, with exist flag -0 ipset -x -A test 2.0.0.128 +0 ipset -! -A test 2.0.0.128 # Range: Delete the same element 0 ipset -D test 2.0.0.128 # Range: Add a range of elements 0 ipset -A test 2.0.0.128-2.0.0.131 timeout 6 # Range: List set -0 ipset list test > .foo +0 ipset list test | sed 's/timeout ./timeout x/' > .foo # Range: Check listing -0 grep '2.0.0.1 timeout' .foo >/dev/null +0 diff .foo bitmap:ip.t.list4 && rm .foo # Sleep 10s so that entries can time out 0 sleep 10s # Range: List set after timeout @@ -77,9 +77,9 @@ # Network: Delete the same element 0 ipset -D test 2.0.0.128 # Network: List set -0 ipset list test > .foo +0 ipset list test | sed 's/timeout ./timeout x/' > .foo # Network: Check listing -0 grep '2.0.255.255 timeout' .foo >/dev/null +0 diff .foo bitmap:ip.t.list5 && rm .foo # Sleep 10s so that entries can time out 0 sleep 10s # Network: List set @@ -118,8 +118,10 @@ 0 ipset -D test 10.2.0.0 # Subnets: Add a subnet of subnets 0 ipset -A test 10.8.0.0/16 timeout 8 +# Subnets: List set +0 ipset list test | sed 's/timeout ./timeout x/' > .foo # Subnets: Check listing -0 ipset list test | grep '10.0.0.0 timeout' >/dev/null +0 diff .foo bitmap:ip.t.list6 && rm .foo # Sleep 10s so that entries can time out 0 sleep 10s # Subnets: List set -- cgit v1.2.3