From: Jozsef Kadlecsik Date: Thu, 2 May 2013 09:36:06 +0000 (+0200) Subject: Update testsuite as the trailing space was eliminated at listings X-Git-Tag: v6.19~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0945fec3486276d084d498a001970922de37068;p=thirdparty%2Fipset.git Update testsuite as the trailing space was eliminated at listings --- diff --git a/tests/bitmap:ip.t b/tests/bitmap:ip.t index 252bde49..88d399a9 100644 --- a/tests/bitmap:ip.t +++ b/tests/bitmap:ip.t @@ -110,11 +110,11 @@ 1 ipset add test 9.255.255.255 # Subnets: Try to add element after upper boundary 1 ipset add test 11.0.0.0 -# Subnets: Try to delete element not added to the set -1 ipset -D test 10.2.0.0 -# Subnets: Add element to the set -0 ipset -A test 10.2.0.0 -# Subnets: Delete the same element from the set +# Subnets: Try to delete element not added to the set +1 ipset -D test 10.2.0.0 +# Subnets: Add element to the set +0 ipset -A test 10.2.0.0 +# Subnets: Delete the same element from the set 0 ipset -D test 10.2.0.0 # Subnets: Add a subnet of subnets 0 ipset -A test 10.8.0.0/16 timeout 4 @@ -210,7 +210,7 @@ 0 ipset x test # Counters: require sendip skip which sendip -# Counters: create set +# Counters: create set 0 ipset n test bitmap:ip range 10.255.0.0/16 counters # Counters: add elemet with zero counters 0 ipset a test 10.255.255.64 @@ -220,7 +220,7 @@ skip which sendip 0 ./check_counters test 10.255.255.64 5 $((5*40)) # Counters: destroy set 0 ipset x test -# Counters and timeout: create set +# Counters and timeout: create set 0 ipset n test bitmap:ip range 10.255.0.0/16 counters timeout 600 # Counters and timeout: add elemet with zero counters 0 ipset a test 10.255.255.64 diff --git a/tests/bitmap:ip.t.list0 b/tests/bitmap:ip.t.list0 index e3bbf3b3..c3166037 100644 --- a/tests/bitmap:ip.t.list0 +++ b/tests/bitmap:ip.t.list0 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.1-2.1.0.0 timeout 5 +Header: range 2.0.0.1-2.1.0.0 timeout 5 Size in memory: 524408 References: 0 Members: diff --git a/tests/bitmap:ip.t.list1 b/tests/bitmap:ip.t.list1 index c97f3590..3c94983d 100644 --- a/tests/bitmap:ip.t.list1 +++ b/tests/bitmap:ip.t.list1 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.0-2.0.255.255 timeout 5 +Header: range 2.0.0.0-2.0.255.255 timeout 5 Size in memory: 524408 References: 0 Members: diff --git a/tests/bitmap:ip.t.list2 b/tests/bitmap:ip.t.list2 index f3db85c5..78bce6c2 100644 --- a/tests/bitmap:ip.t.list2 +++ b/tests/bitmap:ip.t.list2 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout 5 +Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout 5 Size in memory: 524408 References: 0 Members: diff --git a/tests/bitmap:ip.t.list3 b/tests/bitmap:ip.t.list3 index 8d427b54..3f4e0644 100644 --- a/tests/bitmap:ip.t.list3 +++ b/tests/bitmap:ip.t.list3 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 0.0.0.0-255.255.255.255 netmask 16 timeout 5 +Header: range 0.0.0.0-255.255.255.255 netmask 16 timeout 5 Size in memory: 524408 References: 0 Members: diff --git a/tests/bitmap:ip.t.list4 b/tests/bitmap:ip.t.list4 index 43418be6..e706b67e 100644 --- a/tests/bitmap:ip.t.list4 +++ b/tests/bitmap:ip.t.list4 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.1-2.1.0.0 timeout x +Header: range 2.0.0.1-2.1.0.0 timeout x Size in memory: 524408 References: 0 Members: diff --git a/tests/bitmap:ip.t.list5 b/tests/bitmap:ip.t.list5 index 7d4c34da..2d916352 100644 --- a/tests/bitmap:ip.t.list5 +++ b/tests/bitmap:ip.t.list5 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.0-2.0.255.255 timeout x +Header: range 2.0.0.0-2.0.255.255 timeout x Size in memory: 524408 References: 0 Members: diff --git a/tests/bitmap:ip.t.list6 b/tests/bitmap:ip.t.list6 index e5a7c07e..68b1b073 100644 --- a/tests/bitmap:ip.t.list6 +++ b/tests/bitmap:ip.t.list6 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout x +Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout x Size in memory: 524408 References: 0 Members: diff --git a/tests/hash:ip,port,ip.t.list0 b/tests/hash:ip,port,ip.t.list0 index 779649f5..7218937c 100644 --- a/tests/hash:ip,port,ip.t.list0 +++ b/tests/hash:ip,port,ip.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 timeout x +Header: family inet hashsize 1024 maxelem 65536 timeout x Size in memory: 8720 References: 0 Members: diff --git a/tests/hash:ip,port,ip.t.list1 b/tests/hash:ip,port,ip.t.list1 index 2e42e5a6..78ad1fd1 100644 --- a/tests/hash:ip,port,ip.t.list1 +++ b/tests/hash:ip,port,ip.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 timeout 5 +Header: family inet hashsize 1024 maxelem 65536 timeout 5 Size in memory: 8304 References: 0 Members: diff --git a/tests/hash:ip,port,net.t b/tests/hash:ip,port,net.t index 22c2b131..cb68cb80 100644 --- a/tests/hash:ip,port,net.t +++ b/tests/hash:ip,port,net.t @@ -59,7 +59,7 @@ # Add a non-matching IP address entry 0 ipset -A test 2.2.2.2,80,1.1.1.1 nomatch # Add an overlapping matching small net -0 ipset -A test 2.2.2.2,80,1.1.1.0/30 +0 ipset -A test 2.2.2.2,80,1.1.1.0/30 # Add an overlapping non-matching larger net 0 ipset -A test 2.2.2.2,80,1.1.1.0/28 nomatch # Add an even larger matching net diff --git a/tests/hash:ip,port,net.t.list0 b/tests/hash:ip,port,net.t.list0 index 3ce6e1f6..c214eadb 100644 --- a/tests/hash:ip,port,net.t.list0 +++ b/tests/hash:ip,port,net.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,net -Header: family inet hashsize 1024 maxelem 65536 timeout x +Header: family inet hashsize 1024 maxelem 65536 timeout x Size in memory: 8720 References: 0 Members: diff --git a/tests/hash:ip,port.t.list0 b/tests/hash:ip,port.t.list0 index 7896f573..fb9c57b8 100644 --- a/tests/hash:ip,port.t.list0 +++ b/tests/hash:ip,port.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 timeout x +Header: family inet hashsize 1024 maxelem 65536 timeout x Size in memory: 8592 References: 0 Members: diff --git a/tests/hash:ip,port.t.list1 b/tests/hash:ip,port.t.list1 index 0b71466f..eab115cc 100644 --- a/tests/hash:ip,port.t.list1 +++ b/tests/hash:ip,port.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 timeout 5 +Header: family inet hashsize 1024 maxelem 65536 timeout 5 Size in memory: 8304 References: 0 Members: diff --git a/tests/hash:ip,port.t.list2 b/tests/hash:ip,port.t.list2 index bb6e9e43..7e7f3adb 100644 --- a/tests/hash:ip,port.t.list2 +++ b/tests/hash:ip,port.t.list2 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 8432 References: 0 Members: diff --git a/tests/hash:ip.t b/tests/hash:ip.t index 56b3004b..2ad68315 100644 --- a/tests/hash:ip.t +++ b/tests/hash:ip.t @@ -186,7 +186,7 @@ 0 ipset x test # Counters: require sendip skip which sendip -# Counters: create set +# Counters: create set 0 ipset n test hash:ip counters # Counters: add elemet with zero counters 0 ipset a test 10.255.255.64 @@ -196,7 +196,7 @@ skip which sendip 0 ./check_counters test 10.255.255.64 5 $((5*40)) # Counters: destroy set 0 ipset x test -# Counters and timeout: create set +# Counters and timeout: create set 0 ipset n test hash:ip counters timeout 600 # Counters and timeout: add elemet with zero counters 0 ipset a test 10.255.255.64 diff --git a/tests/hash:ip.t.list0 b/tests/hash:ip.t.list0 index 09a18507..3d13afcf 100644 --- a/tests/hash:ip.t.list0 +++ b/tests/hash:ip.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 timeout 5 +Header: family inet hashsize 128 maxelem 65536 timeout 5 Size in memory: 1208 References: 0 Members: diff --git a/tests/hash:ip.t.list1 b/tests/hash:ip.t.list1 index cb21bc41..ffd4f728 100644 --- a/tests/hash:ip.t.list1 +++ b/tests/hash:ip.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 5 +Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 5 Size in memory: 1352 References: 0 Members: diff --git a/tests/hash:ip.t.list2 b/tests/hash:ip.t.list2 index ec085bf4..274cf47a 100644 --- a/tests/hash:ip.t.list2 +++ b/tests/hash:ip.t.list2 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 timeout x +Header: family inet hashsize 128 maxelem 65536 timeout x Size in memory: 1280 References: 0 Members: diff --git a/tests/hash:ip.t.list3 b/tests/hash:ip.t.list3 index 7bdf31a5..50777103 100644 --- a/tests/hash:ip.t.list3 +++ b/tests/hash:ip.t.list3 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout x +Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout x Size in memory: 1352 References: 0 Members: diff --git a/tests/hash:ip6,port,ip6.t.list0 b/tests/hash:ip6,port,ip6.t.list0 index 061ea94c..41ac1c0d 100644 --- a/tests/hash:ip6,port,ip6.t.list0 +++ b/tests/hash:ip6,port,ip6.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,ip -Header: family inet6 hashsize 1024 maxelem 65536 timeout x +Header: family inet6 hashsize 1024 maxelem 65536 timeout x Size in memory: 9104 References: 0 Members: diff --git a/tests/hash:ip6,port,ip6.t.list1 b/tests/hash:ip6,port,ip6.t.list1 index b05e3ffa..7a3a4adc 100644 --- a/tests/hash:ip6,port,ip6.t.list1 +++ b/tests/hash:ip6,port,ip6.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,ip -Header: family inet6 hashsize 1024 maxelem 65536 timeout 5 +Header: family inet6 hashsize 1024 maxelem 65536 timeout 5 Size in memory: 8304 References: 0 Members: diff --git a/tests/hash:ip6,port,net6.t b/tests/hash:ip6,port,net6.t index d4f9f266..23a5da04 100644 --- a/tests/hash:ip6,port,net6.t +++ b/tests/hash:ip6,port,net6.t @@ -55,7 +55,7 @@ # Add a non-matching IP address entry 0 ipset -A test 2:2:2::2,80,1:1:1::1 nomatch # Add an overlapping matching small net -0 ipset -A test 2:2:2::2,80,1:1:1::/124 +0 ipset -A test 2:2:2::2,80,1:1:1::/124 # Add an overlapping non-matching larger net 0 ipset -A test 2:2:2::2,80,1:1:1::/120 nomatch # Add an even larger matching net diff --git a/tests/hash:ip6,port,net6.t.list0 b/tests/hash:ip6,port,net6.t.list0 index 0b0fabd4..78472ffd 100644 --- a/tests/hash:ip6,port,net6.t.list0 +++ b/tests/hash:ip6,port,net6.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,net -Header: family inet6 hashsize 1024 maxelem 65536 +Header: family inet6 hashsize 1024 maxelem 65536 Size in memory: 9928 References: 0 Members: diff --git a/tests/hash:ip6,port.t.list0 b/tests/hash:ip6,port.t.list0 index d64f0db4..5edbaac6 100644 --- a/tests/hash:ip6,port.t.list0 +++ b/tests/hash:ip6,port.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port -Header: family inet6 hashsize 1024 maxelem 65536 timeout x +Header: family inet6 hashsize 1024 maxelem 65536 timeout x Size in memory: 8848 References: 0 Members: diff --git a/tests/hash:ip6,port.t.list1 b/tests/hash:ip6,port.t.list1 index 31c2fd50..bf311792 100644 --- a/tests/hash:ip6,port.t.list1 +++ b/tests/hash:ip6,port.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port -Header: family inet6 hashsize 1024 maxelem 65536 timeout 5 +Header: family inet6 hashsize 1024 maxelem 65536 timeout 5 Size in memory: 8304 References: 0 Members: diff --git a/tests/hash:ip6.t.list0 b/tests/hash:ip6.t.list0 index 25df7d97..df81e382 100644 --- a/tests/hash:ip6.t.list0 +++ b/tests/hash:ip6.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 timeout 5 +Header: family inet6 hashsize 128 maxelem 65536 timeout 5 Size in memory: 1240 References: 0 Members: diff --git a/tests/hash:ip6.t.list1 b/tests/hash:ip6.t.list1 index 215677d2..c3b1c303 100644 --- a/tests/hash:ip6.t.list1 +++ b/tests/hash:ip6.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 5 +Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 5 Size in memory: 1448 References: 0 Members: diff --git a/tests/hash:ip6.t.list2 b/tests/hash:ip6.t.list2 index 339bf3f3..1989efd9 100644 --- a/tests/hash:ip6.t.list2 +++ b/tests/hash:ip6.t.list2 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 timeout x +Header: family inet6 hashsize 128 maxelem 65536 timeout x Size in memory: 1344 References: 0 Members: diff --git a/tests/hash:ip6.t.list3 b/tests/hash:ip6.t.list3 index b7f7d12f..ece96d64 100644 --- a/tests/hash:ip6.t.list3 +++ b/tests/hash:ip6.t.list3 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout x +Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout x Size in memory: 1448 References: 0 Members: diff --git a/tests/hash:net,iface.t.list0 b/tests/hash:net,iface.t.list0 index 1771fcae..4bf10fe9 100644 --- a/tests/hash:net,iface.t.list0 +++ b/tests/hash:net,iface.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:net,iface -Header: family inet hashsize 128 maxelem 65536 +Header: family inet hashsize 128 maxelem 65536 Size in memory: 2928 References: 0 Members: diff --git a/tests/hash:net,iface.t.list1 b/tests/hash:net,iface.t.list1 index 4a298e27..de561299 100644 --- a/tests/hash:net,iface.t.list1 +++ b/tests/hash:net,iface.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:net,iface -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 18512 References: 0 Members: diff --git a/tests/hash:net,iface.t.list2 b/tests/hash:net,iface.t.list2 index 89aa033b..fbd502c9 100644 --- a/tests/hash:net,iface.t.list2 +++ b/tests/hash:net,iface.t.list2 @@ -1,6 +1,6 @@ Name: test Type: hash:net,iface -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 17168 References: 0 Members: diff --git a/tests/hash:net,port.t b/tests/hash:net,port.t index 3d1586b9..abe565f8 100644 --- a/tests/hash:net,port.t +++ b/tests/hash:net,port.t @@ -81,7 +81,7 @@ # Add a non-matching IP address entry 0 ipset -A test 1.1.1.1,80 nomatch # Add an overlapping matching small net -0 ipset -A test 1.1.1.0/30,80 +0 ipset -A test 1.1.1.0/30,80 # Add an overlapping non-matching larger net 0 ipset -A test 1.1.1.0/28,80 nomatch # Add an even larger matching net diff --git a/tests/hash:net,port.t.list0 b/tests/hash:net,port.t.list0 index 60244a01..e28b4a38 100644 --- a/tests/hash:net,port.t.list0 +++ b/tests/hash:net,port.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:net,port -Header: family inet hashsize 128 maxelem 65536 timeout x +Header: family inet hashsize 128 maxelem 65536 timeout x Size in memory: 2072 References: 0 Members: diff --git a/tests/hash:net,port.t.list1 b/tests/hash:net,port.t.list1 index 753c5753..10031e4b 100644 --- a/tests/hash:net,port.t.list1 +++ b/tests/hash:net,port.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:net,port -Header: family inet hashsize 128 maxelem 65536 timeout 5 +Header: family inet hashsize 128 maxelem 65536 timeout 5 Size in memory: 2000 References: 0 Members: diff --git a/tests/hash:net.t b/tests/hash:net.t index ef82a6e1..0c997dd8 100644 --- a/tests/hash:net.t +++ b/tests/hash:net.t @@ -67,7 +67,7 @@ # Add a non-matching IP address entry 0 ipset -A test 1.1.1.1 nomatch # Add an overlapping matching small net -0 ipset -A test 1.1.1.0/30 +0 ipset -A test 1.1.1.0/30 # Add an overlapping non-matching larger net 0 ipset -A test 1.1.1.0/28 nomatch # Add an even larger matching net diff --git a/tests/hash:net.t.list0 b/tests/hash:net.t.list0 index 7e4d92bb..a71fa740 100644 --- a/tests/hash:net.t.list0 +++ b/tests/hash:net.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 timeout x +Header: family inet hashsize 128 maxelem 65536 timeout x Size in memory: 1672 References: 0 Members: diff --git a/tests/hash:net.t.list1 b/tests/hash:net.t.list1 index fb8dc80d..7ea6afc5 100644 --- a/tests/hash:net.t.list1 +++ b/tests/hash:net.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 timeout 5 +Header: family inet hashsize 128 maxelem 65536 timeout 5 Size in memory: 1672 References: 0 Members: diff --git a/tests/hash:net.t.list2 b/tests/hash:net.t.list2 index dad3f22b..bc81b5e6 100644 --- a/tests/hash:net.t.list2 +++ b/tests/hash:net.t.list2 @@ -1,6 +1,6 @@ Name: test Type: hash:net -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 17016 References: 0 Members: diff --git a/tests/hash:net6,port.t b/tests/hash:net6,port.t index 06f82b74..a47ece73 100644 --- a/tests/hash:net6,port.t +++ b/tests/hash:net6,port.t @@ -83,7 +83,7 @@ # Add a non-matching IP address entry 0 ipset -A test 1:1:1::1,80 nomatch # Add an overlapping matching small net -0 ipset -A test 1:1:1::/124,80 +0 ipset -A test 1:1:1::/124,80 # Add an overlapping non-matching larger net 0 ipset -A test 1:1:1::/120,80 nomatch # Add an even larger matching net diff --git a/tests/hash:net6,port.t.list0 b/tests/hash:net6,port.t.list0 index f574d2c6..f0a27b44 100644 --- a/tests/hash:net6,port.t.list0 +++ b/tests/hash:net6,port.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:net,port -Header: family inet6 hashsize 128 maxelem 65536 timeout x +Header: family inet6 hashsize 128 maxelem 65536 timeout x Size in memory: 2328 References: 0 Members: diff --git a/tests/hash:net6,port.t.list1 b/tests/hash:net6,port.t.list1 index f3b23cbf..e5e90a46 100644 --- a/tests/hash:net6,port.t.list1 +++ b/tests/hash:net6,port.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:net,port -Header: family inet6 hashsize 128 maxelem 65536 timeout 5 +Header: family inet6 hashsize 128 maxelem 65536 timeout 5 Size in memory: 2328 References: 0 Members: diff --git a/tests/hash:net6.t b/tests/hash:net6.t index 981dfdbc..fc377f49 100644 --- a/tests/hash:net6.t +++ b/tests/hash:net6.t @@ -51,7 +51,7 @@ # Add a non-matching IP address entry 0 ipset -A test 1:1:1::1 nomatch # Add an overlapping matching small net -0 ipset -A test 1:1:1::/124 +0 ipset -A test 1:1:1::/124 # Add an overlapping non-matching larger net 0 ipset -A test 1:1:1::/120 nomatch # Add an even larger matching net diff --git a/tests/hash:net6.t.list0 b/tests/hash:net6.t.list0 index 4b06c8cc..52b0ce53 100644 --- a/tests/hash:net6.t.list0 +++ b/tests/hash:net6.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:net -Header: family inet6 hashsize 128 maxelem 65536 timeout x +Header: family inet6 hashsize 128 maxelem 65536 timeout x Size in memory: 2696 References: 0 Members: diff --git a/tests/hash:net6.t.list1 b/tests/hash:net6.t.list1 index 891c0ce2..e92da529 100644 --- a/tests/hash:net6.t.list1 +++ b/tests/hash:net6.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:net -Header: family inet6 hashsize 128 maxelem 65536 timeout 5 +Header: family inet6 hashsize 128 maxelem 65536 timeout 5 Size in memory: 2696 References: 0 Members: diff --git a/tests/iphash.t b/tests/iphash.t index 8fd0836c..f7fdab39 100644 --- a/tests/iphash.t +++ b/tests/iphash.t @@ -1,5 +1,5 @@ -# IP: Create a set -0 ipset -N test iphash --hashsize 128 +# IP: Create a set +0 ipset -N test iphash --hashsize 128 # Range: Add zero valued element 1 ipset -A test 0.0.0.0 # Range: Test zero valued element @@ -52,7 +52,7 @@ 0 (sort iphash.t.large > .foo.2) && (cmp .foo.1 .foo.2) # IP: Delete test set 0 ipset x test -# Network: Create a set +# Network: Create a set 0 ipset -N test iphash --hashsize 128 --netmask 24 # Network: Add zero valued element 1 ipset -A test 0.0.0.0 diff --git a/tests/iphash.t.large b/tests/iphash.t.large index a6506923..24cc1258 100644 --- a/tests/iphash.t.large +++ b/tests/iphash.t.large @@ -1,4 +1,4 @@ -create test hash:ip family inet hashsize 1024 maxelem 65536 +create test hash:ip family inet hashsize 1024 maxelem 65536 add test 10.10.0.0 add test 10.10.0.1 add test 10.10.0.2 diff --git a/tests/iphash.t.list0 b/tests/iphash.t.list0 index b871248c..2302485a 100644 --- a/tests/iphash.t.list0 +++ b/tests/iphash.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 +Header: family inet hashsize 128 maxelem 65536 Size in memory: 1184 References: 0 Members: diff --git a/tests/iphash.t.list1 b/tests/iphash.t.list1 index 652c3665..ea5d2a19 100644 --- a/tests/iphash.t.list1 +++ b/tests/iphash.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 +Header: family inet hashsize 128 maxelem 65536 netmask 24 Size in memory: 1184 References: 0 Members: diff --git a/tests/ipmap.t b/tests/ipmap.t index 684fb7d9..7ae141c0 100644 --- a/tests/ipmap.t +++ b/tests/ipmap.t @@ -43,7 +43,7 @@ # Range: Restore set and catch error 1 sed 's/2.0.0.131/222.0.0.131/' < ipmap.t.restore | ipset -R # Range: Check returned error line number -0 num=`grep 'in line' < .foo.err | sed 's/.* in line //' | cut -d : -f 1` && test $num -eq 6 +0 num=`grep 'in line' < .foo.err | sed 's/.* in line //' | cut -d : -f 1` && test $num -eq 6 # Range: Destroy set 0 ipset -X test # Range: Restore set diff --git a/tests/ipmap.t.list0 b/tests/ipmap.t.list0 index c97caef3..c1c4360e 100644 --- a/tests/ipmap.t.list0 +++ b/tests/ipmap.t.list0 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.1-2.1.0.0 +Header: range 2.0.0.1-2.1.0.0 Size in memory: 8232 References: 0 Members: diff --git a/tests/ipmap.t.list1 b/tests/ipmap.t.list1 index d971782b..abfc98d4 100644 --- a/tests/ipmap.t.list1 +++ b/tests/ipmap.t.list1 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.1-2.1.0.0 +Header: range 2.0.0.1-2.1.0.0 Size in memory: 8232 References: 0 Members: diff --git a/tests/ipmap.t.list2 b/tests/ipmap.t.list2 index 09a305c2..932cad28 100644 --- a/tests/ipmap.t.list2 +++ b/tests/ipmap.t.list2 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.0-2.0.255.255 +Header: range 2.0.0.0-2.0.255.255 Size in memory: 8232 References: 0 Members: diff --git a/tests/ipmap.t.list3 b/tests/ipmap.t.list3 index 037051b7..ab391d01 100644 --- a/tests/ipmap.t.list3 +++ b/tests/ipmap.t.list3 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 10.0.0.0-10.255.255.255 netmask 24 +Header: range 10.0.0.0-10.255.255.255 netmask 24 Size in memory: 8232 References: 0 Members: diff --git a/tests/ipmap.t.list4 b/tests/ipmap.t.list4 index 7135ff49..eaff2209 100644 --- a/tests/ipmap.t.list4 +++ b/tests/ipmap.t.list4 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip -Header: range 0.0.0.0-255.255.255.255 netmask 16 +Header: range 0.0.0.0-255.255.255.255 netmask 16 Size in memory: 8232 References: 0 Members: diff --git a/tests/ipporthash.t.list0 b/tests/ipporthash.t.list0 index c31e1510..20c805dd 100644 --- a/tests/ipporthash.t.list0 +++ b/tests/ipporthash.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 8464 References: 0 Members: diff --git a/tests/ipporthash.t.list1 b/tests/ipporthash.t.list1 index a99b8dbd..0834a001 100644 --- a/tests/ipporthash.t.list1 +++ b/tests/ipporthash.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 8464 References: 0 Members: diff --git a/tests/ipportiphash.t.list0 b/tests/ipportiphash.t.list0 index 055aaf29..fc881ada 100644 --- a/tests/ipportiphash.t.list0 +++ b/tests/ipportiphash.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 8528 References: 0 Members: diff --git a/tests/ipportiphash.t.list1 b/tests/ipportiphash.t.list1 index 22784b7f..9a7d1f0f 100644 --- a/tests/ipportiphash.t.list1 +++ b/tests/ipportiphash.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 8416 References: 0 Members: diff --git a/tests/ipportnethash.t b/tests/ipportnethash.t index f5be27f5..b34d46d8 100644 --- a/tests/ipportnethash.t +++ b/tests/ipportnethash.t @@ -73,7 +73,7 @@ # Add a non-matching IP address entry 0 ipset -A test 2.1.0.0,80,1.1.1.1 nomatch # Add an overlapping matching small net -0 ipset -A test 2.1.0.0,80,1.1.1.0/30 +0 ipset -A test 2.1.0.0,80,1.1.1.0/30 # Add an overlapping non-matching larger net 0 ipset -A test 2.1.0.0,80,1.1.1.0/28 nomatch # Add an even larger matching net diff --git a/tests/ipportnethash.t.list0 b/tests/ipportnethash.t.list0 index 96fa73f1..27470321 100644 --- a/tests/ipportnethash.t.list0 +++ b/tests/ipportnethash.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,net -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 8776 References: 0 Members: diff --git a/tests/ipportnethash.t.list1 b/tests/ipportnethash.t.list1 index 2d287e45..76becdb4 100644 --- a/tests/ipportnethash.t.list1 +++ b/tests/ipportnethash.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,port,net -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 8776 References: 0 Members: diff --git a/tests/iptree.t.list0 b/tests/iptree.t.list0 index 73beb61c..c5f1527f 100644 --- a/tests/iptree.t.list0 +++ b/tests/iptree.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 8352 References: 0 Members: diff --git a/tests/iptreemap.t.list0 b/tests/iptreemap.t.list0 index a1c74354..4c664723 100644 --- a/tests/iptreemap.t.list0 +++ b/tests/iptreemap.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 9048 References: 0 Members: diff --git a/tests/macipmap.t.list0 b/tests/macipmap.t.list0 index 7239eb01..d37e5601 100644 --- a/tests/macipmap.t.list0 +++ b/tests/macipmap.t.list0 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip,mac -Header: range 2.0.0.1-2.1.0.0 +Header: range 2.0.0.1-2.1.0.0 Size in memory: 458864 References: 0 Members: diff --git a/tests/macipmap.t.list1 b/tests/macipmap.t.list1 index 2c4a8000..0447c41d 100644 --- a/tests/macipmap.t.list1 +++ b/tests/macipmap.t.list1 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip,mac -Header: range 2.0.0.0-2.0.255.255 +Header: range 2.0.0.0-2.0.255.255 Size in memory: 458864 References: 0 Members: diff --git a/tests/macipmap.t.list2 b/tests/macipmap.t.list2 index b4d943ba..0c8bf6f6 100644 --- a/tests/macipmap.t.list2 +++ b/tests/macipmap.t.list2 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip,mac -Header: range 2.0.0.1-2.1.0.0 timeout x +Header: range 2.0.0.1-2.1.0.0 timeout x Size in memory: 1048688 References: 0 Members: diff --git a/tests/macipmap.t.list3 b/tests/macipmap.t.list3 index 93a0db39..bf788214 100644 --- a/tests/macipmap.t.list3 +++ b/tests/macipmap.t.list3 @@ -1,6 +1,6 @@ Name: test Type: bitmap:ip,mac -Header: range 2.0.0.1-2.1.0.0 timeout x +Header: range 2.0.0.1-2.1.0.0 timeout x Size in memory: 1048688 References: 0 Members: diff --git a/tests/match_target.t b/tests/match_target.t index 4a2b9be5..cab81842 100644 --- a/tests/match_target.t +++ b/tests/match_target.t @@ -22,7 +22,7 @@ 0 ipset test ipport 10.255.255.64,tcp:1025 # Check that 10.255.255.64,udp:1025 is not in ipport set 1 ipset test ipport 10.255.255.64,udp:1025 -# Send probe packet from 10.255.255.64,udp:1025 +# Send probe packet from 10.255.255.64,udp:1025 0 sendip -p ipv4 -id 127.0.0.1 -is 10.255.255.64 -p udp -ud 80 -us 1025 127.0.0.1 # Check that proper sets matched and target worked 0 ./check_klog.sh 10.255.255.64 udp 1025 ipport list @@ -61,7 +61,7 @@ # Create set and rules to check --exist and --timeout flags of SET target 0 ./iptables.sh inet timeout # Add 10.255.255.64,icmp:host-prohibited to the set -0 ipset add test 10.255.255.64,icmp:host-prohibited +0 ipset add test 10.255.255.64,icmp:host-prohibited # Check that 10.255.255.64,icmp:3/10 is in ipport set 0 ipset test test 10.255.255.64,icmp:host-prohibited # Sleep 3s so that entry can time out diff --git a/tests/match_target6.t b/tests/match_target6.t index 15a3b9e8..86197c0e 100644 --- a/tests/match_target6.t +++ b/tests/match_target6.t @@ -22,7 +22,7 @@ 0 ipset test ipport 1002:1002:1002:1002::64,tcp:1025 # Check that 1002:1002:1002:1002::64,udp:1025 is not in ipport set 1 ipset test ipport 1002:1002:1002:1002::64,udp:1025 -# Send probe packet from 1002:1002:1002:1002::64,udp:1025 +# Send probe packet from 1002:1002:1002:1002::64,udp:1025 0 sendip -p ipv6 -6d ::1 -6s 1002:1002:1002:1002::64 -p udp -ud 80 -us 1025 ::1 # Check that proper sets matched and target worked 0 ./check_klog.sh 1002:1002:1002:1002::64 udp 1025 ipport list diff --git a/tests/nethash.t b/tests/nethash.t index 273ceeba..05e64c38 100644 --- a/tests/nethash.t +++ b/tests/nethash.t @@ -1,5 +1,5 @@ -# Create a set -0 ipset -N test nethash --hashsize 128 +# Create a set +0 ipset -N test nethash --hashsize 128 # Add zero valued element 1 ipset -A test 0.0.0.0/0 # Test zero valued element @@ -41,7 +41,7 @@ # Add a non-matching IP address entry 0 ipset -A test 1.1.1.1 nomatch # Add an overlapping matching small net -0 ipset -A test 1.1.1.0/30 +0 ipset -A test 1.1.1.0/30 # Add an overlapping non-matching larger net 0 ipset -A test 1.1.1.0/28 nomatch # Add an even larger matching net diff --git a/tests/nethash.t.list0 b/tests/nethash.t.list0 index 4c73c564..1a157e98 100644 --- a/tests/nethash.t.list0 +++ b/tests/nethash.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 +Header: family inet hashsize 128 maxelem 65536 Size in memory: 1544 References: 0 Members: diff --git a/tests/portmap.t.list0 b/tests/portmap.t.list0 index 88636c18..4ff6b1fa 100644 --- a/tests/portmap.t.list0 +++ b/tests/portmap.t.list0 @@ -1,6 +1,6 @@ Name: test Type: bitmap:port -Header: range 1-1024 +Header: range 1-1024 Size in memory: 152 References: 0 Members: diff --git a/tests/portmap.t.list1 b/tests/portmap.t.list1 index 1dff3130..a34caba6 100644 --- a/tests/portmap.t.list1 +++ b/tests/portmap.t.list1 @@ -1,6 +1,6 @@ Name: test Type: bitmap:port -Header: range 0-65535 +Header: range 0-65535 Size in memory: 8216 References: 0 Members: diff --git a/tests/portmap.t.list2 b/tests/portmap.t.list2 index f2e511f0..6afaf023 100644 --- a/tests/portmap.t.list2 +++ b/tests/portmap.t.list2 @@ -1,6 +1,6 @@ Name: test Type: bitmap:port -Header: range 0-65535 timeout 8 +Header: range 0-65535 timeout 8 Elements: 1 Size in memory: 524288 References: 0 diff --git a/tests/portmap.t.list3 b/tests/portmap.t.list3 index 1af93d6d..441da01f 100644 --- a/tests/portmap.t.list3 +++ b/tests/portmap.t.list3 @@ -1,6 +1,6 @@ Name: test Type: bitmap:port -Header: range 0-65535 timeout x +Header: range 0-65535 timeout x Size in memory: 524400 References: 0 Members: diff --git a/tests/restore.t.list0 b/tests/restore.t.list0 index 6c568858..65aa8b84 100644 --- a/tests/restore.t.list0 +++ b/tests/restore.t.list0 @@ -1,6 +1,6 @@ Name: a Type: hash:ip -Header: family inet6 hashsize 1024 maxelem 65536 +Header: family inet6 hashsize 1024 maxelem 65536 Size in memory: 16704 References: 0 Members: diff --git a/tests/restore.t.list1 b/tests/restore.t.list1 index 146748d5..0602ab6a 100644 --- a/tests/restore.t.list1 +++ b/tests/restore.t.list1 @@ -1,6 +1,6 @@ Name: b Type: hash:ip -Header: family inet6 hashsize 1024 maxelem 65536 +Header: family inet6 hashsize 1024 maxelem 65536 Size in memory: 16704 References: 0 Members: diff --git a/tests/restore.t.multi.saved b/tests/restore.t.multi.saved index cbbf7cc0..5a569bad 100644 --- a/tests/restore.t.multi.saved +++ b/tests/restore.t.multi.saved @@ -1,4 +1,4 @@ -create priviledged-ports bitmap:port range 1-1023 timeout 0 +create priviledged-ports bitmap:port range 1-1023 timeout 0 add priviledged-ports 1 timeout 0 add priviledged-ports 2 timeout 0 add priviledged-ports 3 timeout 0 @@ -1022,7 +1022,7 @@ add priviledged-ports 1020 timeout 0 add priviledged-ports 1021 timeout 0 add priviledged-ports 1022 timeout 0 add priviledged-ports 1023 timeout 0 -create test-net bitmap:ip range 10.1.1.168-10.1.1.175 timeout 0 +create test-net bitmap:ip range 10.1.1.168-10.1.1.175 timeout 0 add test-net 10.1.1.168 timeout 0 add test-net 10.1.1.169 timeout 0 add test-net 10.1.1.170 timeout 0 @@ -1031,7 +1031,7 @@ add test-net 10.1.1.172 timeout 0 add test-net 10.1.1.173 timeout 0 add test-net 10.1.1.174 timeout 0 add test-net 10.1.1.175 timeout 0 -create test-ports bitmap:port range 12770-19999 timeout 0 +create test-ports bitmap:port range 12770-19999 timeout 0 add test-ports 12770 timeout 0 add test-ports 12771 timeout 0 add test-ports 12772 timeout 0 @@ -1048,5 +1048,5 @@ add test-ports 12782 timeout 0 add test-ports 12783 timeout 0 add test-ports 12784 timeout 0 add test-ports 19999 timeout 0 -create test-port bitmap:port range 29950-29950 timeout 0 +create test-port bitmap:port range 29950-29950 timeout 0 add test-port 29950 timeout 0 diff --git a/tests/setlist.t b/tests/setlist.t index d505f61c..78fe3235 100644 --- a/tests/setlist.t +++ b/tests/setlist.t @@ -177,9 +177,9 @@ 0 ipset x # Counters: require sendip skip which sendip >/dev/null -# Counters: create set +# Counters: create set 0 ipset n a hash:ip counters -# Counters: create list set +# Counters: create list set 0 ipset n test list:set counters # Counters: add elemet with zero counters 0 ipset a a 10.255.255.64 @@ -195,9 +195,9 @@ skip which sendip >/dev/null 0 ipset f # Counters: destroy sets 0 ipset x -# Counters and timeout: create set +# Counters and timeout: create set 0 ipset n a hash:ip counters timeout 600 -# Counters and timeout: create list set +# Counters and timeout: create list set 0 ipset n test list:set counters timeout 600 # Counters and timeout: add elemet with zero counters 0 ipset a a 10.255.255.64 diff --git a/tests/setlist.t.list0 b/tests/setlist.t.list0 index ab0ddee5..c413c26a 100644 --- a/tests/setlist.t.list0 +++ b/tests/setlist.t.list0 @@ -1,6 +1,6 @@ Name: test Type: list:set -Header: size 8 +Header: size 8 Size in memory: 112 References: 0 Members: diff --git a/tests/setlist.t.list1 b/tests/setlist.t.list1 index 419a03fe..47ba1752 100644 --- a/tests/setlist.t.list1 +++ b/tests/setlist.t.list1 @@ -1,6 +1,6 @@ Name: test Type: list:set -Header: size 8 +Header: size 8 Size in memory: 120 References: 0 Members: diff --git a/tests/setlist.t.list2 b/tests/setlist.t.list2 index dff03142..d1bb378e 100644 --- a/tests/setlist.t.list2 +++ b/tests/setlist.t.list2 @@ -1,6 +1,6 @@ Name: test Type: list:set -Header: size 8 +Header: size 8 Size in memory: 120 References: 0 Members: diff --git a/tests/setlist.t.list3 b/tests/setlist.t.list3 index 1fdb7e53..0a9e0b4a 100644 --- a/tests/setlist.t.list3 +++ b/tests/setlist.t.list3 @@ -1,6 +1,6 @@ Name: test Type: list:set -Header: size 8 +Header: size 8 Size in memory: 120 References: 0 Members: diff --git a/tests/setlist.t.list4 b/tests/setlist.t.list4 index 956d59e2..bce58248 100644 --- a/tests/setlist.t.list4 +++ b/tests/setlist.t.list4 @@ -1,34 +1,34 @@ Name: a Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 16504 References: 1 Members: Name: b Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 16504 References: 0 Members: Name: c Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 16504 References: 0 Members: Name: d Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet hashsize 1024 maxelem 65536 Size in memory: 16504 References: 0 Members: Name: test Type: list:set -Header: size 8 +Header: size 8 Size in memory: 112 References: 0 Members: