From: Jozsef Kadlecsik Date: Mon, 21 Sep 2020 18:12:23 +0000 (+0200) Subject: Handle all variable header parts in helper scripts instead ot test tasks X-Git-Tag: v7.7~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00e8bd9bb72eb1357aab486e314b83f93dad0d2c;p=thirdparty%2Fipset.git Handle all variable header parts in helper scripts instead ot test tasks Thus the tests tasks can be simplified and all exceptions can be handled in the helper scripts. Signed-off-by: Jozsef Kadlecsik --- diff --git a/tests/bitmap:ip.t b/tests/bitmap:ip.t index 88d399a9..a0ca22f9 100644 --- a/tests/bitmap:ip.t +++ b/tests/bitmap:ip.t @@ -35,15 +35,15 @@ # Range: Add a range of elements 0 ipset -A test 2.0.0.128-2.0.0.131 timeout 4 # Range: List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset list test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo bitmap:ip.t.list4 +0 ./diff.sh .foo bitmap:ip.t.list4 # Sleep 5s so that entries can time out 0 sleep 5s # Range: List set after timeout -0 ipset list test | grep -v Revision: > .foo +0 ipset list test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo bitmap:ip.t.list0 +0 ./diff.sh .foo bitmap:ip.t.list0 # Range: Flush test set 0 ipset flush test # Range: Delete test set @@ -77,15 +77,15 @@ # Network: Delete the same element 0 ipset -D test 2.0.0.128 # Network: List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset list test > .foo # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo bitmap:ip.t.list5 +0 ./diff.sh .foo bitmap:ip.t.list5 # Sleep 5s so that entries can time out 0 sleep 5s # Network: List set -0 ipset list test | grep -v Revision: > .foo +0 ipset list test > .foo # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo bitmap:ip.t.list1 +0 ./diff.sh .foo bitmap:ip.t.list1 # Network: Flush test set 0 ipset flush test # Network: Delete test set @@ -119,15 +119,15 @@ # Subnets: Add a subnet of subnets 0 ipset -A test 10.8.0.0/16 timeout 4 # Subnets: List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset list test > .foo # Subnets: Check listing -0 diff -u -I 'Size in memory.*' .foo bitmap:ip.t.list6 +0 ./diff.sh .foo bitmap:ip.t.list6 # Sleep 5s so that entries can time out 0 sleep 5s # Subnets: List set -0 ipset list test | grep -v Revision: > .foo +0 ipset list test > .foo # Subnets: Check listing -0 diff -u -I 'Size in memory.*' .foo bitmap:ip.t.list2 +0 ./diff.sh .foo bitmap:ip.t.list2 # Subnets: Flush test set 0 ipset flush test # Subnets: Delete test set @@ -145,9 +145,9 @@ # Full: Test element not added to the set 1 ipset test test 0.1.0.0 # Full: List set -0 ipset list test | grep -v Revision: > .foo +0 ipset list test > .foo # Full: Check listing -0 diff -u -I 'Size in memory.*' .foo bitmap:ip.t.list3 +0 ./diff.sh .foo bitmap:ip.t.list3 # Full: flush set 0 ipset flush test # Full: add element with 1s timeout diff --git a/tests/bitmap:ip.t.list4 b/tests/bitmap:ip.t.list4 index 7148a8de..a26266b0 100644 --- a/tests/bitmap:ip.t.list4 +++ b/tests/bitmap:ip.t.list4 @@ -1,13 +1,14 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.1-2.1.0.0 timeout x -Size in memory: 532640 +Revision: 3 +Header: range 2.0.0.1-2.1.0.0 timeout 5 +Size in memory: 532608 References: 0 Number of entries: 6 Members: -2.0.0.1 timeout x -2.0.0.128 timeout x -2.0.0.129 timeout x -2.0.0.130 timeout x -2.0.0.131 timeout x -2.1.0.0 timeout x +2.0.0.1 timeout 3 +2.0.0.128 timeout 3 +2.0.0.129 timeout 3 +2.0.0.130 timeout 3 +2.0.0.131 timeout 3 +2.1.0.0 timeout 0 diff --git a/tests/bitmap:ip.t.list5 b/tests/bitmap:ip.t.list5 index 1d226653..79fe97af 100644 --- a/tests/bitmap:ip.t.list5 +++ b/tests/bitmap:ip.t.list5 @@ -1,9 +1,10 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.0-2.0.255.255 timeout x -Size in memory: 532640 +Revision: 3 +Header: range 2.0.0.0-2.0.255.255 timeout 5 +Size in memory: 532608 References: 0 Number of entries: 2 Members: -2.0.0.0 timeout x -2.0.255.255 timeout x +2.0.0.0 timeout 0 +2.0.255.255 timeout 3 diff --git a/tests/bitmap:ip.t.list6 b/tests/bitmap:ip.t.list6 index c3eb3477..a7711481 100644 --- a/tests/bitmap:ip.t.list6 +++ b/tests/bitmap:ip.t.list6 @@ -1,265 +1,266 @@ Name: test Type: bitmap:ip -Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout x -Size in memory: 532640 +Revision: 3 +Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout 5 +Size in memory: 532608 References: 0 Number of entries: 258 Members: -10.0.0.0 timeout x -10.8.0.0 timeout x -10.8.1.0 timeout x -10.8.2.0 timeout x -10.8.3.0 timeout x -10.8.4.0 timeout x -10.8.5.0 timeout x -10.8.6.0 timeout x -10.8.7.0 timeout x -10.8.8.0 timeout x -10.8.9.0 timeout x -10.8.10.0 timeout x -10.8.11.0 timeout x -10.8.12.0 timeout x -10.8.13.0 timeout x -10.8.14.0 timeout x -10.8.15.0 timeout x -10.8.16.0 timeout x -10.8.17.0 timeout x -10.8.18.0 timeout x -10.8.19.0 timeout x -10.8.20.0 timeout x -10.8.21.0 timeout x -10.8.22.0 timeout x -10.8.23.0 timeout x -10.8.24.0 timeout x -10.8.25.0 timeout x -10.8.26.0 timeout x -10.8.27.0 timeout x -10.8.28.0 timeout x -10.8.29.0 timeout x -10.8.30.0 timeout x -10.8.31.0 timeout x -10.8.32.0 timeout x -10.8.33.0 timeout x -10.8.34.0 timeout x -10.8.35.0 timeout x -10.8.36.0 timeout x -10.8.37.0 timeout x -10.8.38.0 timeout x -10.8.39.0 timeout x -10.8.40.0 timeout x -10.8.41.0 timeout x -10.8.42.0 timeout x -10.8.43.0 timeout x -10.8.44.0 timeout x -10.8.45.0 timeout x -10.8.46.0 timeout x -10.8.47.0 timeout x -10.8.48.0 timeout x -10.8.49.0 timeout x -10.8.50.0 timeout x -10.8.51.0 timeout x -10.8.52.0 timeout x -10.8.53.0 timeout x -10.8.54.0 timeout x -10.8.55.0 timeout x -10.8.56.0 timeout x -10.8.57.0 timeout x -10.8.58.0 timeout x -10.8.59.0 timeout x -10.8.60.0 timeout x -10.8.61.0 timeout x -10.8.62.0 timeout x -10.8.63.0 timeout x -10.8.64.0 timeout x -10.8.65.0 timeout x -10.8.66.0 timeout x -10.8.67.0 timeout x -10.8.68.0 timeout x -10.8.69.0 timeout x -10.8.70.0 timeout x -10.8.71.0 timeout x -10.8.72.0 timeout x -10.8.73.0 timeout x -10.8.74.0 timeout x -10.8.75.0 timeout x -10.8.76.0 timeout x -10.8.77.0 timeout x -10.8.78.0 timeout x -10.8.79.0 timeout x -10.8.80.0 timeout x -10.8.81.0 timeout x -10.8.82.0 timeout x -10.8.83.0 timeout x -10.8.84.0 timeout x -10.8.85.0 timeout x -10.8.86.0 timeout x -10.8.87.0 timeout x -10.8.88.0 timeout x -10.8.89.0 timeout x -10.8.90.0 timeout x -10.8.91.0 timeout x -10.8.92.0 timeout x -10.8.93.0 timeout x -10.8.94.0 timeout x -10.8.95.0 timeout x -10.8.96.0 timeout x -10.8.97.0 timeout x -10.8.98.0 timeout x -10.8.99.0 timeout x -10.8.100.0 timeout x -10.8.101.0 timeout x -10.8.102.0 timeout x -10.8.103.0 timeout x -10.8.104.0 timeout x -10.8.105.0 timeout x -10.8.106.0 timeout x -10.8.107.0 timeout x -10.8.108.0 timeout x -10.8.109.0 timeout x -10.8.110.0 timeout x -10.8.111.0 timeout x -10.8.112.0 timeout x -10.8.113.0 timeout x -10.8.114.0 timeout x -10.8.115.0 timeout x -10.8.116.0 timeout x -10.8.117.0 timeout x -10.8.118.0 timeout x -10.8.119.0 timeout x -10.8.120.0 timeout x -10.8.121.0 timeout x -10.8.122.0 timeout x -10.8.123.0 timeout x -10.8.124.0 timeout x -10.8.125.0 timeout x -10.8.126.0 timeout x -10.8.127.0 timeout x -10.8.128.0 timeout x -10.8.129.0 timeout x -10.8.130.0 timeout x -10.8.131.0 timeout x -10.8.132.0 timeout x -10.8.133.0 timeout x -10.8.134.0 timeout x -10.8.135.0 timeout x -10.8.136.0 timeout x -10.8.137.0 timeout x -10.8.138.0 timeout x -10.8.139.0 timeout x -10.8.140.0 timeout x -10.8.141.0 timeout x -10.8.142.0 timeout x -10.8.143.0 timeout x -10.8.144.0 timeout x -10.8.145.0 timeout x -10.8.146.0 timeout x -10.8.147.0 timeout x -10.8.148.0 timeout x -10.8.149.0 timeout x -10.8.150.0 timeout x -10.8.151.0 timeout x -10.8.152.0 timeout x -10.8.153.0 timeout x -10.8.154.0 timeout x -10.8.155.0 timeout x -10.8.156.0 timeout x -10.8.157.0 timeout x -10.8.158.0 timeout x -10.8.159.0 timeout x -10.8.160.0 timeout x -10.8.161.0 timeout x -10.8.162.0 timeout x -10.8.163.0 timeout x -10.8.164.0 timeout x -10.8.165.0 timeout x -10.8.166.0 timeout x -10.8.167.0 timeout x -10.8.168.0 timeout x -10.8.169.0 timeout x -10.8.170.0 timeout x -10.8.171.0 timeout x -10.8.172.0 timeout x -10.8.173.0 timeout x -10.8.174.0 timeout x -10.8.175.0 timeout x -10.8.176.0 timeout x -10.8.177.0 timeout x -10.8.178.0 timeout x -10.8.179.0 timeout x -10.8.180.0 timeout x -10.8.181.0 timeout x -10.8.182.0 timeout x -10.8.183.0 timeout x -10.8.184.0 timeout x -10.8.185.0 timeout x -10.8.186.0 timeout x -10.8.187.0 timeout x -10.8.188.0 timeout x -10.8.189.0 timeout x -10.8.190.0 timeout x -10.8.191.0 timeout x -10.8.192.0 timeout x -10.8.193.0 timeout x -10.8.194.0 timeout x -10.8.195.0 timeout x -10.8.196.0 timeout x -10.8.197.0 timeout x -10.8.198.0 timeout x -10.8.199.0 timeout x -10.8.200.0 timeout x -10.8.201.0 timeout x -10.8.202.0 timeout x -10.8.203.0 timeout x -10.8.204.0 timeout x -10.8.205.0 timeout x -10.8.206.0 timeout x -10.8.207.0 timeout x -10.8.208.0 timeout x -10.8.209.0 timeout x -10.8.210.0 timeout x -10.8.211.0 timeout x -10.8.212.0 timeout x -10.8.213.0 timeout x -10.8.214.0 timeout x -10.8.215.0 timeout x -10.8.216.0 timeout x -10.8.217.0 timeout x -10.8.218.0 timeout x -10.8.219.0 timeout x -10.8.220.0 timeout x -10.8.221.0 timeout x -10.8.222.0 timeout x -10.8.223.0 timeout x -10.8.224.0 timeout x -10.8.225.0 timeout x -10.8.226.0 timeout x -10.8.227.0 timeout x -10.8.228.0 timeout x -10.8.229.0 timeout x -10.8.230.0 timeout x -10.8.231.0 timeout x -10.8.232.0 timeout x -10.8.233.0 timeout x -10.8.234.0 timeout x -10.8.235.0 timeout x -10.8.236.0 timeout x -10.8.237.0 timeout x -10.8.238.0 timeout x -10.8.239.0 timeout x -10.8.240.0 timeout x -10.8.241.0 timeout x -10.8.242.0 timeout x -10.8.243.0 timeout x -10.8.244.0 timeout x -10.8.245.0 timeout x -10.8.246.0 timeout x -10.8.247.0 timeout x -10.8.248.0 timeout x -10.8.249.0 timeout x -10.8.250.0 timeout x -10.8.251.0 timeout x -10.8.252.0 timeout x -10.8.253.0 timeout x -10.8.254.0 timeout x -10.8.255.0 timeout x -10.255.255.0 timeout x +10.0.0.0 timeout 3 +10.8.0.0 timeout 3 +10.8.1.0 timeout 3 +10.8.2.0 timeout 3 +10.8.3.0 timeout 3 +10.8.4.0 timeout 3 +10.8.5.0 timeout 3 +10.8.6.0 timeout 3 +10.8.7.0 timeout 3 +10.8.8.0 timeout 3 +10.8.9.0 timeout 3 +10.8.10.0 timeout 3 +10.8.11.0 timeout 3 +10.8.12.0 timeout 3 +10.8.13.0 timeout 3 +10.8.14.0 timeout 3 +10.8.15.0 timeout 3 +10.8.16.0 timeout 3 +10.8.17.0 timeout 3 +10.8.18.0 timeout 3 +10.8.19.0 timeout 3 +10.8.20.0 timeout 3 +10.8.21.0 timeout 3 +10.8.22.0 timeout 3 +10.8.23.0 timeout 3 +10.8.24.0 timeout 3 +10.8.25.0 timeout 3 +10.8.26.0 timeout 3 +10.8.27.0 timeout 3 +10.8.28.0 timeout 3 +10.8.29.0 timeout 3 +10.8.30.0 timeout 3 +10.8.31.0 timeout 3 +10.8.32.0 timeout 3 +10.8.33.0 timeout 3 +10.8.34.0 timeout 3 +10.8.35.0 timeout 3 +10.8.36.0 timeout 3 +10.8.37.0 timeout 3 +10.8.38.0 timeout 3 +10.8.39.0 timeout 3 +10.8.40.0 timeout 3 +10.8.41.0 timeout 3 +10.8.42.0 timeout 3 +10.8.43.0 timeout 3 +10.8.44.0 timeout 3 +10.8.45.0 timeout 3 +10.8.46.0 timeout 3 +10.8.47.0 timeout 3 +10.8.48.0 timeout 3 +10.8.49.0 timeout 3 +10.8.50.0 timeout 3 +10.8.51.0 timeout 3 +10.8.52.0 timeout 3 +10.8.53.0 timeout 3 +10.8.54.0 timeout 3 +10.8.55.0 timeout 3 +10.8.56.0 timeout 3 +10.8.57.0 timeout 3 +10.8.58.0 timeout 3 +10.8.59.0 timeout 3 +10.8.60.0 timeout 3 +10.8.61.0 timeout 3 +10.8.62.0 timeout 3 +10.8.63.0 timeout 3 +10.8.64.0 timeout 3 +10.8.65.0 timeout 3 +10.8.66.0 timeout 3 +10.8.67.0 timeout 3 +10.8.68.0 timeout 3 +10.8.69.0 timeout 3 +10.8.70.0 timeout 3 +10.8.71.0 timeout 3 +10.8.72.0 timeout 3 +10.8.73.0 timeout 3 +10.8.74.0 timeout 3 +10.8.75.0 timeout 3 +10.8.76.0 timeout 3 +10.8.77.0 timeout 3 +10.8.78.0 timeout 3 +10.8.79.0 timeout 3 +10.8.80.0 timeout 3 +10.8.81.0 timeout 3 +10.8.82.0 timeout 3 +10.8.83.0 timeout 3 +10.8.84.0 timeout 3 +10.8.85.0 timeout 3 +10.8.86.0 timeout 3 +10.8.87.0 timeout 3 +10.8.88.0 timeout 3 +10.8.89.0 timeout 3 +10.8.90.0 timeout 3 +10.8.91.0 timeout 3 +10.8.92.0 timeout 3 +10.8.93.0 timeout 3 +10.8.94.0 timeout 3 +10.8.95.0 timeout 3 +10.8.96.0 timeout 3 +10.8.97.0 timeout 3 +10.8.98.0 timeout 3 +10.8.99.0 timeout 3 +10.8.100.0 timeout 3 +10.8.101.0 timeout 3 +10.8.102.0 timeout 3 +10.8.103.0 timeout 3 +10.8.104.0 timeout 3 +10.8.105.0 timeout 3 +10.8.106.0 timeout 3 +10.8.107.0 timeout 3 +10.8.108.0 timeout 3 +10.8.109.0 timeout 3 +10.8.110.0 timeout 3 +10.8.111.0 timeout 3 +10.8.112.0 timeout 3 +10.8.113.0 timeout 3 +10.8.114.0 timeout 3 +10.8.115.0 timeout 3 +10.8.116.0 timeout 3 +10.8.117.0 timeout 3 +10.8.118.0 timeout 3 +10.8.119.0 timeout 3 +10.8.120.0 timeout 3 +10.8.121.0 timeout 3 +10.8.122.0 timeout 3 +10.8.123.0 timeout 3 +10.8.124.0 timeout 3 +10.8.125.0 timeout 3 +10.8.126.0 timeout 3 +10.8.127.0 timeout 3 +10.8.128.0 timeout 3 +10.8.129.0 timeout 3 +10.8.130.0 timeout 3 +10.8.131.0 timeout 3 +10.8.132.0 timeout 3 +10.8.133.0 timeout 3 +10.8.134.0 timeout 3 +10.8.135.0 timeout 3 +10.8.136.0 timeout 3 +10.8.137.0 timeout 3 +10.8.138.0 timeout 3 +10.8.139.0 timeout 3 +10.8.140.0 timeout 3 +10.8.141.0 timeout 3 +10.8.142.0 timeout 3 +10.8.143.0 timeout 3 +10.8.144.0 timeout 3 +10.8.145.0 timeout 3 +10.8.146.0 timeout 3 +10.8.147.0 timeout 3 +10.8.148.0 timeout 3 +10.8.149.0 timeout 3 +10.8.150.0 timeout 3 +10.8.151.0 timeout 3 +10.8.152.0 timeout 3 +10.8.153.0 timeout 3 +10.8.154.0 timeout 3 +10.8.155.0 timeout 3 +10.8.156.0 timeout 3 +10.8.157.0 timeout 3 +10.8.158.0 timeout 3 +10.8.159.0 timeout 3 +10.8.160.0 timeout 3 +10.8.161.0 timeout 3 +10.8.162.0 timeout 3 +10.8.163.0 timeout 3 +10.8.164.0 timeout 3 +10.8.165.0 timeout 3 +10.8.166.0 timeout 3 +10.8.167.0 timeout 3 +10.8.168.0 timeout 3 +10.8.169.0 timeout 3 +10.8.170.0 timeout 3 +10.8.171.0 timeout 3 +10.8.172.0 timeout 3 +10.8.173.0 timeout 3 +10.8.174.0 timeout 3 +10.8.175.0 timeout 3 +10.8.176.0 timeout 3 +10.8.177.0 timeout 3 +10.8.178.0 timeout 3 +10.8.179.0 timeout 3 +10.8.180.0 timeout 3 +10.8.181.0 timeout 3 +10.8.182.0 timeout 3 +10.8.183.0 timeout 3 +10.8.184.0 timeout 3 +10.8.185.0 timeout 3 +10.8.186.0 timeout 3 +10.8.187.0 timeout 3 +10.8.188.0 timeout 3 +10.8.189.0 timeout 3 +10.8.190.0 timeout 3 +10.8.191.0 timeout 3 +10.8.192.0 timeout 3 +10.8.193.0 timeout 3 +10.8.194.0 timeout 3 +10.8.195.0 timeout 3 +10.8.196.0 timeout 3 +10.8.197.0 timeout 3 +10.8.198.0 timeout 3 +10.8.199.0 timeout 3 +10.8.200.0 timeout 3 +10.8.201.0 timeout 3 +10.8.202.0 timeout 3 +10.8.203.0 timeout 3 +10.8.204.0 timeout 3 +10.8.205.0 timeout 3 +10.8.206.0 timeout 3 +10.8.207.0 timeout 3 +10.8.208.0 timeout 3 +10.8.209.0 timeout 3 +10.8.210.0 timeout 3 +10.8.211.0 timeout 3 +10.8.212.0 timeout 3 +10.8.213.0 timeout 3 +10.8.214.0 timeout 3 +10.8.215.0 timeout 3 +10.8.216.0 timeout 3 +10.8.217.0 timeout 3 +10.8.218.0 timeout 3 +10.8.219.0 timeout 3 +10.8.220.0 timeout 3 +10.8.221.0 timeout 3 +10.8.222.0 timeout 3 +10.8.223.0 timeout 3 +10.8.224.0 timeout 3 +10.8.225.0 timeout 3 +10.8.226.0 timeout 3 +10.8.227.0 timeout 3 +10.8.228.0 timeout 3 +10.8.229.0 timeout 3 +10.8.230.0 timeout 3 +10.8.231.0 timeout 3 +10.8.232.0 timeout 3 +10.8.233.0 timeout 3 +10.8.234.0 timeout 3 +10.8.235.0 timeout 3 +10.8.236.0 timeout 3 +10.8.237.0 timeout 3 +10.8.238.0 timeout 3 +10.8.239.0 timeout 3 +10.8.240.0 timeout 3 +10.8.241.0 timeout 3 +10.8.242.0 timeout 3 +10.8.243.0 timeout 3 +10.8.244.0 timeout 3 +10.8.245.0 timeout 3 +10.8.246.0 timeout 3 +10.8.247.0 timeout 3 +10.8.248.0 timeout 3 +10.8.249.0 timeout 3 +10.8.250.0 timeout 3 +10.8.251.0 timeout 3 +10.8.252.0 timeout 3 +10.8.253.0 timeout 3 +10.8.254.0 timeout 3 +10.8.255.0 timeout 3 +10.255.255.0 timeout 0 diff --git a/tests/comment.t b/tests/comment.t index b12609b2..a4b9973d 100644 --- a/tests/comment.t +++ b/tests/comment.t @@ -9,9 +9,9 @@ # Bitmap comment: Test element with comment 0 ipset test test 2.0.0.1 # Bitmap comment: List set -0 ipset list test | grep -v Revision: > .foo +0 ipset list test > .foo # Bitmap comment: Check listing -0 diff -u -I 'Size in memory.*' .foo comment.t.list0 +0 ./diff.sh .foo comment.t.list0 # Bitmap comment: Delete element with comment 0 ipset del test 2.0.0.1 # Bitmap comment: Test deleted element @@ -31,9 +31,9 @@ # Bitmap comment: Add multiple elements with comment 0 for x in `seq 1 255`; do echo "add test 2.0.0.$x comment \\\"text message $x\\\""; done | ipset restore # Bitmap comment: List set -0 ipset list test | grep -v Revision: > .foo +0 ipset list test > .foo # Bitmap comment: Check listing -0 diff -u -I 'Size in memory.*' .foo comment.t.list1 +0 ./diff.sh .foo comment.t.list1 # Bitmap comment: Delete test set 0 ipset destroy test # Bitmap comment: create set with timeout @@ -43,15 +43,15 @@ # Bitmap comment: Add multiple elements with zero timeout 0 for x in `seq 1 255`; do echo "add test 2.0.1.$x timeout 0 comment \\\"text message $x\\\""; done | ipset restore # Bitmap comment: List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset list test > .foo # Bitmap comment: Check listing -0 diff -u -I 'Size in memory.*' .foo comment.t.list11 +0 ./diff.sh .foo comment.t.list11 # Sleep 5s so that entries can time out 0 sleep 5s # Bitmap comment: List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset list test > .foo # Bitmap comment: Check listing -0 diff -u -I 'Size in memory.*' -I 'Number of entries' .foo comment.t.list12 +0 ./diff.sh .foo comment.t.list12 # Bitmap comment: Flush set 0 ipset flush test # Bitmap comment: Delete test set @@ -87,9 +87,9 @@ # Hash comment: Try to add IP address 0 ipset add test 2.0.0.1,2.0.0.2 # Hash comment: List set -0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Hash comment: Check listing -0 diff -u -I 'Size in memory.*' .foo comment.t.list2 +0 ./diff.sh .foo comment.t.list2 # Hash comment: Update element with comment 0 ipset -! add test 2.0.0.1,2.0.0.2 comment "text 2.0.0.1,2.0.0.2" # Hash comment: Check updated element @@ -123,15 +123,15 @@ # Hash comment: Add multiple elements with zero timeout 0 for x in `seq 0 255`; do echo "add test 2.0.1.$x timeout 0 comment \\\"text message $x\\\""; done | ipset restore # Hash comment: List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Hash comment: Check listing -0 diff -u -I 'Size in memory.*' .foo comment.t.list21 +0 ./diff.sh .foo comment.t.list21 # Sleep 5s so that entries can time out 0 sleep 5s # Hash comment: List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Hash comment: Check listing -0 diff -u -I 'Size in memory.*' .foo comment.t.list22 +0 ./diff.sh .foo comment.t.list22 # Hash comment: Flush set 0 ipset flush test # Hash comment: Delete test set @@ -147,9 +147,9 @@ # List comment: Add b set with comment 0 ipset a test b after a comment "b set comment" # List comment: List sets -0 ipset list | grep -v Revision: > .foo +0 ipset list > .foo # List comment: Check listing -0 diff -u -I 'Size in memory.*' .foo comment.t.list3 +0 ./diff.sh .foo comment.t.list3 # Flush sets 0 ipset f # Destroy sets diff --git a/tests/comment.t.list11 b/tests/comment.t.list11 index 7d6990f4..498ba5f9 100644 --- a/tests/comment.t.list11 +++ b/tests/comment.t.list11 @@ -1,517 +1,518 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.1-2.1.0.0 timeout x comment -Size in memory: 1056928 +Revision: 3 +Header: range 2.0.0.1-2.1.0.0 timeout 3 comment +Size in memory: 1073510 References: 0 Number of entries: 510 Members: -2.0.0.1 timeout x comment "text message 1" -2.0.0.2 timeout x comment "text message 2" -2.0.0.3 timeout x comment "text message 3" -2.0.0.4 timeout x comment "text message 4" -2.0.0.5 timeout x comment "text message 5" -2.0.0.6 timeout x comment "text message 6" -2.0.0.7 timeout x comment "text message 7" -2.0.0.8 timeout x comment "text message 8" -2.0.0.9 timeout x comment "text message 9" -2.0.0.10 timeout x comment "text message 10" -2.0.0.11 timeout x comment "text message 11" -2.0.0.12 timeout x comment "text message 12" -2.0.0.13 timeout x comment "text message 13" -2.0.0.14 timeout x comment "text message 14" -2.0.0.15 timeout x comment "text message 15" -2.0.0.16 timeout x comment "text message 16" -2.0.0.17 timeout x comment "text message 17" -2.0.0.18 timeout x comment "text message 18" -2.0.0.19 timeout x comment "text message 19" -2.0.0.20 timeout x comment "text message 20" -2.0.0.21 timeout x comment "text message 21" -2.0.0.22 timeout x comment "text message 22" -2.0.0.23 timeout x comment "text message 23" -2.0.0.24 timeout x comment "text message 24" -2.0.0.25 timeout x comment "text message 25" -2.0.0.26 timeout x comment "text message 26" -2.0.0.27 timeout x comment "text message 27" -2.0.0.28 timeout x comment "text message 28" -2.0.0.29 timeout x comment "text message 29" -2.0.0.30 timeout x comment "text message 30" -2.0.0.31 timeout x comment "text message 31" -2.0.0.32 timeout x comment "text message 32" -2.0.0.33 timeout x comment "text message 33" -2.0.0.34 timeout x comment "text message 34" -2.0.0.35 timeout x comment "text message 35" -2.0.0.36 timeout x comment "text message 36" -2.0.0.37 timeout x comment "text message 37" -2.0.0.38 timeout x comment "text message 38" -2.0.0.39 timeout x comment "text message 39" -2.0.0.40 timeout x comment "text message 40" -2.0.0.41 timeout x comment "text message 41" -2.0.0.42 timeout x comment "text message 42" -2.0.0.43 timeout x comment "text message 43" -2.0.0.44 timeout x comment "text message 44" -2.0.0.45 timeout x comment "text message 45" -2.0.0.46 timeout x comment "text message 46" -2.0.0.47 timeout x comment "text message 47" -2.0.0.48 timeout x comment "text message 48" -2.0.0.49 timeout x comment "text message 49" -2.0.0.50 timeout x comment "text message 50" -2.0.0.51 timeout x comment "text message 51" -2.0.0.52 timeout x comment "text message 52" -2.0.0.53 timeout x comment "text message 53" -2.0.0.54 timeout x comment "text message 54" -2.0.0.55 timeout x comment "text message 55" -2.0.0.56 timeout x comment "text message 56" -2.0.0.57 timeout x comment "text message 57" -2.0.0.58 timeout x comment "text message 58" -2.0.0.59 timeout x comment "text message 59" -2.0.0.60 timeout x comment "text message 60" -2.0.0.61 timeout x comment "text message 61" -2.0.0.62 timeout x comment "text message 62" -2.0.0.63 timeout x comment "text message 63" -2.0.0.64 timeout x comment "text message 64" -2.0.0.65 timeout x comment "text message 65" -2.0.0.66 timeout x comment "text message 66" -2.0.0.67 timeout x comment "text message 67" -2.0.0.68 timeout x comment "text message 68" -2.0.0.69 timeout x comment "text message 69" -2.0.0.70 timeout x comment "text message 70" -2.0.0.71 timeout x comment "text message 71" -2.0.0.72 timeout x comment "text message 72" -2.0.0.73 timeout x comment "text message 73" -2.0.0.74 timeout x comment "text message 74" -2.0.0.75 timeout x comment "text message 75" -2.0.0.76 timeout x comment "text message 76" -2.0.0.77 timeout x comment "text message 77" -2.0.0.78 timeout x comment "text message 78" -2.0.0.79 timeout x comment "text message 79" -2.0.0.80 timeout x comment "text message 80" -2.0.0.81 timeout x comment "text message 81" -2.0.0.82 timeout x comment "text message 82" -2.0.0.83 timeout x comment "text message 83" -2.0.0.84 timeout x comment "text message 84" -2.0.0.85 timeout x comment "text message 85" -2.0.0.86 timeout x comment "text message 86" -2.0.0.87 timeout x comment "text message 87" -2.0.0.88 timeout x comment "text message 88" -2.0.0.89 timeout x comment "text message 89" -2.0.0.90 timeout x comment "text message 90" -2.0.0.91 timeout x comment "text message 91" -2.0.0.92 timeout x comment "text message 92" -2.0.0.93 timeout x comment "text message 93" -2.0.0.94 timeout x comment "text message 94" -2.0.0.95 timeout x comment "text message 95" -2.0.0.96 timeout x comment "text message 96" -2.0.0.97 timeout x comment "text message 97" -2.0.0.98 timeout x comment "text message 98" -2.0.0.99 timeout x comment "text message 99" -2.0.0.100 timeout x comment "text message 100" -2.0.0.101 timeout x comment "text message 101" -2.0.0.102 timeout x comment "text message 102" -2.0.0.103 timeout x comment "text message 103" -2.0.0.104 timeout x comment "text message 104" -2.0.0.105 timeout x comment "text message 105" -2.0.0.106 timeout x comment "text message 106" -2.0.0.107 timeout x comment "text message 107" -2.0.0.108 timeout x comment "text message 108" -2.0.0.109 timeout x comment "text message 109" -2.0.0.110 timeout x comment "text message 110" -2.0.0.111 timeout x comment "text message 111" -2.0.0.112 timeout x comment "text message 112" -2.0.0.113 timeout x comment "text message 113" -2.0.0.114 timeout x comment "text message 114" -2.0.0.115 timeout x comment "text message 115" -2.0.0.116 timeout x comment "text message 116" -2.0.0.117 timeout x comment "text message 117" -2.0.0.118 timeout x comment "text message 118" -2.0.0.119 timeout x comment "text message 119" -2.0.0.120 timeout x comment "text message 120" -2.0.0.121 timeout x comment "text message 121" -2.0.0.122 timeout x comment "text message 122" -2.0.0.123 timeout x comment "text message 123" -2.0.0.124 timeout x comment "text message 124" -2.0.0.125 timeout x comment "text message 125" -2.0.0.126 timeout x comment "text message 126" -2.0.0.127 timeout x comment "text message 127" -2.0.0.128 timeout x comment "text message 128" -2.0.0.129 timeout x comment "text message 129" -2.0.0.130 timeout x comment "text message 130" -2.0.0.131 timeout x comment "text message 131" -2.0.0.132 timeout x comment "text message 132" -2.0.0.133 timeout x comment "text message 133" -2.0.0.134 timeout x comment "text message 134" -2.0.0.135 timeout x comment "text message 135" -2.0.0.136 timeout x comment "text message 136" -2.0.0.137 timeout x comment "text message 137" -2.0.0.138 timeout x comment "text message 138" -2.0.0.139 timeout x comment "text message 139" -2.0.0.140 timeout x comment "text message 140" -2.0.0.141 timeout x comment "text message 141" -2.0.0.142 timeout x comment "text message 142" -2.0.0.143 timeout x comment "text message 143" -2.0.0.144 timeout x comment "text message 144" -2.0.0.145 timeout x comment "text message 145" -2.0.0.146 timeout x comment "text message 146" -2.0.0.147 timeout x comment "text message 147" -2.0.0.148 timeout x comment "text message 148" -2.0.0.149 timeout x comment "text message 149" -2.0.0.150 timeout x comment "text message 150" -2.0.0.151 timeout x comment "text message 151" -2.0.0.152 timeout x comment "text message 152" -2.0.0.153 timeout x comment "text message 153" -2.0.0.154 timeout x comment "text message 154" -2.0.0.155 timeout x comment "text message 155" -2.0.0.156 timeout x comment "text message 156" -2.0.0.157 timeout x comment "text message 157" -2.0.0.158 timeout x comment "text message 158" -2.0.0.159 timeout x comment "text message 159" -2.0.0.160 timeout x comment "text message 160" -2.0.0.161 timeout x comment "text message 161" -2.0.0.162 timeout x comment "text message 162" -2.0.0.163 timeout x comment "text message 163" -2.0.0.164 timeout x comment "text message 164" -2.0.0.165 timeout x comment "text message 165" -2.0.0.166 timeout x comment "text message 166" -2.0.0.167 timeout x comment "text message 167" -2.0.0.168 timeout x comment "text message 168" -2.0.0.169 timeout x comment "text message 169" -2.0.0.170 timeout x comment "text message 170" -2.0.0.171 timeout x comment "text message 171" -2.0.0.172 timeout x comment "text message 172" -2.0.0.173 timeout x comment "text message 173" -2.0.0.174 timeout x comment "text message 174" -2.0.0.175 timeout x comment "text message 175" -2.0.0.176 timeout x comment "text message 176" -2.0.0.177 timeout x comment "text message 177" -2.0.0.178 timeout x comment "text message 178" -2.0.0.179 timeout x comment "text message 179" -2.0.0.180 timeout x comment "text message 180" -2.0.0.181 timeout x comment "text message 181" -2.0.0.182 timeout x comment "text message 182" -2.0.0.183 timeout x comment "text message 183" -2.0.0.184 timeout x comment "text message 184" -2.0.0.185 timeout x comment "text message 185" -2.0.0.186 timeout x comment "text message 186" -2.0.0.187 timeout x comment "text message 187" -2.0.0.188 timeout x comment "text message 188" -2.0.0.189 timeout x comment "text message 189" -2.0.0.190 timeout x comment "text message 190" -2.0.0.191 timeout x comment "text message 191" -2.0.0.192 timeout x comment "text message 192" -2.0.0.193 timeout x comment "text message 193" -2.0.0.194 timeout x comment "text message 194" -2.0.0.195 timeout x comment "text message 195" -2.0.0.196 timeout x comment "text message 196" -2.0.0.197 timeout x comment "text message 197" -2.0.0.198 timeout x comment "text message 198" -2.0.0.199 timeout x comment "text message 199" -2.0.0.200 timeout x comment "text message 200" -2.0.0.201 timeout x comment "text message 201" -2.0.0.202 timeout x comment "text message 202" -2.0.0.203 timeout x comment "text message 203" -2.0.0.204 timeout x comment "text message 204" -2.0.0.205 timeout x comment "text message 205" -2.0.0.206 timeout x comment "text message 206" -2.0.0.207 timeout x comment "text message 207" -2.0.0.208 timeout x comment "text message 208" -2.0.0.209 timeout x comment "text message 209" -2.0.0.210 timeout x comment "text message 210" -2.0.0.211 timeout x comment "text message 211" -2.0.0.212 timeout x comment "text message 212" -2.0.0.213 timeout x comment "text message 213" -2.0.0.214 timeout x comment "text message 214" -2.0.0.215 timeout x comment "text message 215" -2.0.0.216 timeout x comment "text message 216" -2.0.0.217 timeout x comment "text message 217" -2.0.0.218 timeout x comment "text message 218" -2.0.0.219 timeout x comment "text message 219" -2.0.0.220 timeout x comment "text message 220" -2.0.0.221 timeout x comment "text message 221" -2.0.0.222 timeout x comment "text message 222" -2.0.0.223 timeout x comment "text message 223" -2.0.0.224 timeout x comment "text message 224" -2.0.0.225 timeout x comment "text message 225" -2.0.0.226 timeout x comment "text message 226" -2.0.0.227 timeout x comment "text message 227" -2.0.0.228 timeout x comment "text message 228" -2.0.0.229 timeout x comment "text message 229" -2.0.0.230 timeout x comment "text message 230" -2.0.0.231 timeout x comment "text message 231" -2.0.0.232 timeout x comment "text message 232" -2.0.0.233 timeout x comment "text message 233" -2.0.0.234 timeout x comment "text message 234" -2.0.0.235 timeout x comment "text message 235" -2.0.0.236 timeout x comment "text message 236" -2.0.0.237 timeout x comment "text message 237" -2.0.0.238 timeout x comment "text message 238" -2.0.0.239 timeout x comment "text message 239" -2.0.0.240 timeout x comment "text message 240" -2.0.0.241 timeout x comment "text message 241" -2.0.0.242 timeout x comment "text message 242" -2.0.0.243 timeout x comment "text message 243" -2.0.0.244 timeout x comment "text message 244" -2.0.0.245 timeout x comment "text message 245" -2.0.0.246 timeout x comment "text message 246" -2.0.0.247 timeout x comment "text message 247" -2.0.0.248 timeout x comment "text message 248" -2.0.0.249 timeout x comment "text message 249" -2.0.0.250 timeout x comment "text message 250" -2.0.0.251 timeout x comment "text message 251" -2.0.0.252 timeout x comment "text message 252" -2.0.0.253 timeout x comment "text message 253" -2.0.0.254 timeout x comment "text message 254" -2.0.0.255 timeout x comment "text message 255" -2.0.1.1 timeout x comment "text message 1" -2.0.1.2 timeout x comment "text message 2" -2.0.1.3 timeout x comment "text message 3" -2.0.1.4 timeout x comment "text message 4" -2.0.1.5 timeout x comment "text message 5" -2.0.1.6 timeout x comment "text message 6" -2.0.1.7 timeout x comment "text message 7" -2.0.1.8 timeout x comment "text message 8" -2.0.1.9 timeout x comment "text message 9" -2.0.1.10 timeout x comment "text message 10" -2.0.1.11 timeout x comment "text message 11" -2.0.1.12 timeout x comment "text message 12" -2.0.1.13 timeout x comment "text message 13" -2.0.1.14 timeout x comment "text message 14" -2.0.1.15 timeout x comment "text message 15" -2.0.1.16 timeout x comment "text message 16" -2.0.1.17 timeout x comment "text message 17" -2.0.1.18 timeout x comment "text message 18" -2.0.1.19 timeout x comment "text message 19" -2.0.1.20 timeout x comment "text message 20" -2.0.1.21 timeout x comment "text message 21" -2.0.1.22 timeout x comment "text message 22" -2.0.1.23 timeout x comment "text message 23" -2.0.1.24 timeout x comment "text message 24" -2.0.1.25 timeout x comment "text message 25" -2.0.1.26 timeout x comment "text message 26" -2.0.1.27 timeout x comment "text message 27" -2.0.1.28 timeout x comment "text message 28" -2.0.1.29 timeout x comment "text message 29" -2.0.1.30 timeout x comment "text message 30" -2.0.1.31 timeout x comment "text message 31" -2.0.1.32 timeout x comment "text message 32" -2.0.1.33 timeout x comment "text message 33" -2.0.1.34 timeout x comment "text message 34" -2.0.1.35 timeout x comment "text message 35" -2.0.1.36 timeout x comment "text message 36" -2.0.1.37 timeout x comment "text message 37" -2.0.1.38 timeout x comment "text message 38" -2.0.1.39 timeout x comment "text message 39" -2.0.1.40 timeout x comment "text message 40" -2.0.1.41 timeout x comment "text message 41" -2.0.1.42 timeout x comment "text message 42" -2.0.1.43 timeout x comment "text message 43" -2.0.1.44 timeout x comment "text message 44" -2.0.1.45 timeout x comment "text message 45" -2.0.1.46 timeout x comment "text message 46" -2.0.1.47 timeout x comment "text message 47" -2.0.1.48 timeout x comment "text message 48" -2.0.1.49 timeout x comment "text message 49" -2.0.1.50 timeout x comment "text message 50" -2.0.1.51 timeout x comment "text message 51" -2.0.1.52 timeout x comment "text message 52" -2.0.1.53 timeout x comment "text message 53" -2.0.1.54 timeout x comment "text message 54" -2.0.1.55 timeout x comment "text message 55" -2.0.1.56 timeout x comment "text message 56" -2.0.1.57 timeout x comment "text message 57" -2.0.1.58 timeout x comment "text message 58" -2.0.1.59 timeout x comment "text message 59" -2.0.1.60 timeout x comment "text message 60" -2.0.1.61 timeout x comment "text message 61" -2.0.1.62 timeout x comment "text message 62" -2.0.1.63 timeout x comment "text message 63" -2.0.1.64 timeout x comment "text message 64" -2.0.1.65 timeout x comment "text message 65" -2.0.1.66 timeout x comment "text message 66" -2.0.1.67 timeout x comment "text message 67" -2.0.1.68 timeout x comment "text message 68" -2.0.1.69 timeout x comment "text message 69" -2.0.1.70 timeout x comment "text message 70" -2.0.1.71 timeout x comment "text message 71" -2.0.1.72 timeout x comment "text message 72" -2.0.1.73 timeout x comment "text message 73" -2.0.1.74 timeout x comment "text message 74" -2.0.1.75 timeout x comment "text message 75" -2.0.1.76 timeout x comment "text message 76" -2.0.1.77 timeout x comment "text message 77" -2.0.1.78 timeout x comment "text message 78" -2.0.1.79 timeout x comment "text message 79" -2.0.1.80 timeout x comment "text message 80" -2.0.1.81 timeout x comment "text message 81" -2.0.1.82 timeout x comment "text message 82" -2.0.1.83 timeout x comment "text message 83" -2.0.1.84 timeout x comment "text message 84" -2.0.1.85 timeout x comment "text message 85" -2.0.1.86 timeout x comment "text message 86" -2.0.1.87 timeout x comment "text message 87" -2.0.1.88 timeout x comment "text message 88" -2.0.1.89 timeout x comment "text message 89" -2.0.1.90 timeout x comment "text message 90" -2.0.1.91 timeout x comment "text message 91" -2.0.1.92 timeout x comment "text message 92" -2.0.1.93 timeout x comment "text message 93" -2.0.1.94 timeout x comment "text message 94" -2.0.1.95 timeout x comment "text message 95" -2.0.1.96 timeout x comment "text message 96" -2.0.1.97 timeout x comment "text message 97" -2.0.1.98 timeout x comment "text message 98" -2.0.1.99 timeout x comment "text message 99" -2.0.1.100 timeout x comment "text message 100" -2.0.1.101 timeout x comment "text message 101" -2.0.1.102 timeout x comment "text message 102" -2.0.1.103 timeout x comment "text message 103" -2.0.1.104 timeout x comment "text message 104" -2.0.1.105 timeout x comment "text message 105" -2.0.1.106 timeout x comment "text message 106" -2.0.1.107 timeout x comment "text message 107" -2.0.1.108 timeout x comment "text message 108" -2.0.1.109 timeout x comment "text message 109" -2.0.1.110 timeout x comment "text message 110" -2.0.1.111 timeout x comment "text message 111" -2.0.1.112 timeout x comment "text message 112" -2.0.1.113 timeout x comment "text message 113" -2.0.1.114 timeout x comment "text message 114" -2.0.1.115 timeout x comment "text message 115" -2.0.1.116 timeout x comment "text message 116" -2.0.1.117 timeout x comment "text message 117" -2.0.1.118 timeout x comment "text message 118" -2.0.1.119 timeout x comment "text message 119" -2.0.1.120 timeout x comment "text message 120" -2.0.1.121 timeout x comment "text message 121" -2.0.1.122 timeout x comment "text message 122" -2.0.1.123 timeout x comment "text message 123" -2.0.1.124 timeout x comment "text message 124" -2.0.1.125 timeout x comment "text message 125" -2.0.1.126 timeout x comment "text message 126" -2.0.1.127 timeout x comment "text message 127" -2.0.1.128 timeout x comment "text message 128" -2.0.1.129 timeout x comment "text message 129" -2.0.1.130 timeout x comment "text message 130" -2.0.1.131 timeout x comment "text message 131" -2.0.1.132 timeout x comment "text message 132" -2.0.1.133 timeout x comment "text message 133" -2.0.1.134 timeout x comment "text message 134" -2.0.1.135 timeout x comment "text message 135" -2.0.1.136 timeout x comment "text message 136" -2.0.1.137 timeout x comment "text message 137" -2.0.1.138 timeout x comment "text message 138" -2.0.1.139 timeout x comment "text message 139" -2.0.1.140 timeout x comment "text message 140" -2.0.1.141 timeout x comment "text message 141" -2.0.1.142 timeout x comment "text message 142" -2.0.1.143 timeout x comment "text message 143" -2.0.1.144 timeout x comment "text message 144" -2.0.1.145 timeout x comment "text message 145" -2.0.1.146 timeout x comment "text message 146" -2.0.1.147 timeout x comment "text message 147" -2.0.1.148 timeout x comment "text message 148" -2.0.1.149 timeout x comment "text message 149" -2.0.1.150 timeout x comment "text message 150" -2.0.1.151 timeout x comment "text message 151" -2.0.1.152 timeout x comment "text message 152" -2.0.1.153 timeout x comment "text message 153" -2.0.1.154 timeout x comment "text message 154" -2.0.1.155 timeout x comment "text message 155" -2.0.1.156 timeout x comment "text message 156" -2.0.1.157 timeout x comment "text message 157" -2.0.1.158 timeout x comment "text message 158" -2.0.1.159 timeout x comment "text message 159" -2.0.1.160 timeout x comment "text message 160" -2.0.1.161 timeout x comment "text message 161" -2.0.1.162 timeout x comment "text message 162" -2.0.1.163 timeout x comment "text message 163" -2.0.1.164 timeout x comment "text message 164" -2.0.1.165 timeout x comment "text message 165" -2.0.1.166 timeout x comment "text message 166" -2.0.1.167 timeout x comment "text message 167" -2.0.1.168 timeout x comment "text message 168" -2.0.1.169 timeout x comment "text message 169" -2.0.1.170 timeout x comment "text message 170" -2.0.1.171 timeout x comment "text message 171" -2.0.1.172 timeout x comment "text message 172" -2.0.1.173 timeout x comment "text message 173" -2.0.1.174 timeout x comment "text message 174" -2.0.1.175 timeout x comment "text message 175" -2.0.1.176 timeout x comment "text message 176" -2.0.1.177 timeout x comment "text message 177" -2.0.1.178 timeout x comment "text message 178" -2.0.1.179 timeout x comment "text message 179" -2.0.1.180 timeout x comment "text message 180" -2.0.1.181 timeout x comment "text message 181" -2.0.1.182 timeout x comment "text message 182" -2.0.1.183 timeout x comment "text message 183" -2.0.1.184 timeout x comment "text message 184" -2.0.1.185 timeout x comment "text message 185" -2.0.1.186 timeout x comment "text message 186" -2.0.1.187 timeout x comment "text message 187" -2.0.1.188 timeout x comment "text message 188" -2.0.1.189 timeout x comment "text message 189" -2.0.1.190 timeout x comment "text message 190" -2.0.1.191 timeout x comment "text message 191" -2.0.1.192 timeout x comment "text message 192" -2.0.1.193 timeout x comment "text message 193" -2.0.1.194 timeout x comment "text message 194" -2.0.1.195 timeout x comment "text message 195" -2.0.1.196 timeout x comment "text message 196" -2.0.1.197 timeout x comment "text message 197" -2.0.1.198 timeout x comment "text message 198" -2.0.1.199 timeout x comment "text message 199" -2.0.1.200 timeout x comment "text message 200" -2.0.1.201 timeout x comment "text message 201" -2.0.1.202 timeout x comment "text message 202" -2.0.1.203 timeout x comment "text message 203" -2.0.1.204 timeout x comment "text message 204" -2.0.1.205 timeout x comment "text message 205" -2.0.1.206 timeout x comment "text message 206" -2.0.1.207 timeout x comment "text message 207" -2.0.1.208 timeout x comment "text message 208" -2.0.1.209 timeout x comment "text message 209" -2.0.1.210 timeout x comment "text message 210" -2.0.1.211 timeout x comment "text message 211" -2.0.1.212 timeout x comment "text message 212" -2.0.1.213 timeout x comment "text message 213" -2.0.1.214 timeout x comment "text message 214" -2.0.1.215 timeout x comment "text message 215" -2.0.1.216 timeout x comment "text message 216" -2.0.1.217 timeout x comment "text message 217" -2.0.1.218 timeout x comment "text message 218" -2.0.1.219 timeout x comment "text message 219" -2.0.1.220 timeout x comment "text message 220" -2.0.1.221 timeout x comment "text message 221" -2.0.1.222 timeout x comment "text message 222" -2.0.1.223 timeout x comment "text message 223" -2.0.1.224 timeout x comment "text message 224" -2.0.1.225 timeout x comment "text message 225" -2.0.1.226 timeout x comment "text message 226" -2.0.1.227 timeout x comment "text message 227" -2.0.1.228 timeout x comment "text message 228" -2.0.1.229 timeout x comment "text message 229" -2.0.1.230 timeout x comment "text message 230" -2.0.1.231 timeout x comment "text message 231" -2.0.1.232 timeout x comment "text message 232" -2.0.1.233 timeout x comment "text message 233" -2.0.1.234 timeout x comment "text message 234" -2.0.1.235 timeout x comment "text message 235" -2.0.1.236 timeout x comment "text message 236" -2.0.1.237 timeout x comment "text message 237" -2.0.1.238 timeout x comment "text message 238" -2.0.1.239 timeout x comment "text message 239" -2.0.1.240 timeout x comment "text message 240" -2.0.1.241 timeout x comment "text message 241" -2.0.1.242 timeout x comment "text message 242" -2.0.1.243 timeout x comment "text message 243" -2.0.1.244 timeout x comment "text message 244" -2.0.1.245 timeout x comment "text message 245" -2.0.1.246 timeout x comment "text message 246" -2.0.1.247 timeout x comment "text message 247" -2.0.1.248 timeout x comment "text message 248" -2.0.1.249 timeout x comment "text message 249" -2.0.1.250 timeout x comment "text message 250" -2.0.1.251 timeout x comment "text message 251" -2.0.1.252 timeout x comment "text message 252" -2.0.1.253 timeout x comment "text message 253" -2.0.1.254 timeout x comment "text message 254" -2.0.1.255 timeout x comment "text message 255" +2.0.0.1 timeout 2 comment "text message 1" +2.0.0.2 timeout 2 comment "text message 2" +2.0.0.3 timeout 2 comment "text message 3" +2.0.0.4 timeout 2 comment "text message 4" +2.0.0.5 timeout 2 comment "text message 5" +2.0.0.6 timeout 2 comment "text message 6" +2.0.0.7 timeout 2 comment "text message 7" +2.0.0.8 timeout 2 comment "text message 8" +2.0.0.9 timeout 2 comment "text message 9" +2.0.0.10 timeout 2 comment "text message 10" +2.0.0.11 timeout 2 comment "text message 11" +2.0.0.12 timeout 2 comment "text message 12" +2.0.0.13 timeout 2 comment "text message 13" +2.0.0.14 timeout 2 comment "text message 14" +2.0.0.15 timeout 2 comment "text message 15" +2.0.0.16 timeout 2 comment "text message 16" +2.0.0.17 timeout 2 comment "text message 17" +2.0.0.18 timeout 2 comment "text message 18" +2.0.0.19 timeout 2 comment "text message 19" +2.0.0.20 timeout 2 comment "text message 20" +2.0.0.21 timeout 2 comment "text message 21" +2.0.0.22 timeout 2 comment "text message 22" +2.0.0.23 timeout 2 comment "text message 23" +2.0.0.24 timeout 2 comment "text message 24" +2.0.0.25 timeout 2 comment "text message 25" +2.0.0.26 timeout 2 comment "text message 26" +2.0.0.27 timeout 2 comment "text message 27" +2.0.0.28 timeout 2 comment "text message 28" +2.0.0.29 timeout 2 comment "text message 29" +2.0.0.30 timeout 2 comment "text message 30" +2.0.0.31 timeout 2 comment "text message 31" +2.0.0.32 timeout 2 comment "text message 32" +2.0.0.33 timeout 2 comment "text message 33" +2.0.0.34 timeout 2 comment "text message 34" +2.0.0.35 timeout 2 comment "text message 35" +2.0.0.36 timeout 2 comment "text message 36" +2.0.0.37 timeout 2 comment "text message 37" +2.0.0.38 timeout 2 comment "text message 38" +2.0.0.39 timeout 2 comment "text message 39" +2.0.0.40 timeout 2 comment "text message 40" +2.0.0.41 timeout 2 comment "text message 41" +2.0.0.42 timeout 2 comment "text message 42" +2.0.0.43 timeout 2 comment "text message 43" +2.0.0.44 timeout 2 comment "text message 44" +2.0.0.45 timeout 2 comment "text message 45" +2.0.0.46 timeout 2 comment "text message 46" +2.0.0.47 timeout 2 comment "text message 47" +2.0.0.48 timeout 2 comment "text message 48" +2.0.0.49 timeout 2 comment "text message 49" +2.0.0.50 timeout 2 comment "text message 50" +2.0.0.51 timeout 2 comment "text message 51" +2.0.0.52 timeout 2 comment "text message 52" +2.0.0.53 timeout 2 comment "text message 53" +2.0.0.54 timeout 2 comment "text message 54" +2.0.0.55 timeout 2 comment "text message 55" +2.0.0.56 timeout 2 comment "text message 56" +2.0.0.57 timeout 2 comment "text message 57" +2.0.0.58 timeout 2 comment "text message 58" +2.0.0.59 timeout 2 comment "text message 59" +2.0.0.60 timeout 2 comment "text message 60" +2.0.0.61 timeout 2 comment "text message 61" +2.0.0.62 timeout 2 comment "text message 62" +2.0.0.63 timeout 2 comment "text message 63" +2.0.0.64 timeout 2 comment "text message 64" +2.0.0.65 timeout 2 comment "text message 65" +2.0.0.66 timeout 2 comment "text message 66" +2.0.0.67 timeout 2 comment "text message 67" +2.0.0.68 timeout 2 comment "text message 68" +2.0.0.69 timeout 2 comment "text message 69" +2.0.0.70 timeout 2 comment "text message 70" +2.0.0.71 timeout 2 comment "text message 71" +2.0.0.72 timeout 2 comment "text message 72" +2.0.0.73 timeout 2 comment "text message 73" +2.0.0.74 timeout 2 comment "text message 74" +2.0.0.75 timeout 2 comment "text message 75" +2.0.0.76 timeout 2 comment "text message 76" +2.0.0.77 timeout 2 comment "text message 77" +2.0.0.78 timeout 2 comment "text message 78" +2.0.0.79 timeout 2 comment "text message 79" +2.0.0.80 timeout 2 comment "text message 80" +2.0.0.81 timeout 2 comment "text message 81" +2.0.0.82 timeout 2 comment "text message 82" +2.0.0.83 timeout 2 comment "text message 83" +2.0.0.84 timeout 2 comment "text message 84" +2.0.0.85 timeout 2 comment "text message 85" +2.0.0.86 timeout 2 comment "text message 86" +2.0.0.87 timeout 2 comment "text message 87" +2.0.0.88 timeout 2 comment "text message 88" +2.0.0.89 timeout 2 comment "text message 89" +2.0.0.90 timeout 2 comment "text message 90" +2.0.0.91 timeout 2 comment "text message 91" +2.0.0.92 timeout 2 comment "text message 92" +2.0.0.93 timeout 2 comment "text message 93" +2.0.0.94 timeout 2 comment "text message 94" +2.0.0.95 timeout 2 comment "text message 95" +2.0.0.96 timeout 2 comment "text message 96" +2.0.0.97 timeout 2 comment "text message 97" +2.0.0.98 timeout 2 comment "text message 98" +2.0.0.99 timeout 2 comment "text message 99" +2.0.0.100 timeout 2 comment "text message 100" +2.0.0.101 timeout 2 comment "text message 101" +2.0.0.102 timeout 2 comment "text message 102" +2.0.0.103 timeout 2 comment "text message 103" +2.0.0.104 timeout 2 comment "text message 104" +2.0.0.105 timeout 2 comment "text message 105" +2.0.0.106 timeout 2 comment "text message 106" +2.0.0.107 timeout 2 comment "text message 107" +2.0.0.108 timeout 2 comment "text message 108" +2.0.0.109 timeout 2 comment "text message 109" +2.0.0.110 timeout 2 comment "text message 110" +2.0.0.111 timeout 2 comment "text message 111" +2.0.0.112 timeout 2 comment "text message 112" +2.0.0.113 timeout 2 comment "text message 113" +2.0.0.114 timeout 2 comment "text message 114" +2.0.0.115 timeout 2 comment "text message 115" +2.0.0.116 timeout 2 comment "text message 116" +2.0.0.117 timeout 2 comment "text message 117" +2.0.0.118 timeout 2 comment "text message 118" +2.0.0.119 timeout 2 comment "text message 119" +2.0.0.120 timeout 2 comment "text message 120" +2.0.0.121 timeout 2 comment "text message 121" +2.0.0.122 timeout 2 comment "text message 122" +2.0.0.123 timeout 2 comment "text message 123" +2.0.0.124 timeout 2 comment "text message 124" +2.0.0.125 timeout 2 comment "text message 125" +2.0.0.126 timeout 2 comment "text message 126" +2.0.0.127 timeout 2 comment "text message 127" +2.0.0.128 timeout 2 comment "text message 128" +2.0.0.129 timeout 2 comment "text message 129" +2.0.0.130 timeout 2 comment "text message 130" +2.0.0.131 timeout 2 comment "text message 131" +2.0.0.132 timeout 2 comment "text message 132" +2.0.0.133 timeout 2 comment "text message 133" +2.0.0.134 timeout 2 comment "text message 134" +2.0.0.135 timeout 2 comment "text message 135" +2.0.0.136 timeout 2 comment "text message 136" +2.0.0.137 timeout 2 comment "text message 137" +2.0.0.138 timeout 2 comment "text message 138" +2.0.0.139 timeout 2 comment "text message 139" +2.0.0.140 timeout 2 comment "text message 140" +2.0.0.141 timeout 2 comment "text message 141" +2.0.0.142 timeout 2 comment "text message 142" +2.0.0.143 timeout 2 comment "text message 143" +2.0.0.144 timeout 2 comment "text message 144" +2.0.0.145 timeout 2 comment "text message 145" +2.0.0.146 timeout 2 comment "text message 146" +2.0.0.147 timeout 2 comment "text message 147" +2.0.0.148 timeout 2 comment "text message 148" +2.0.0.149 timeout 2 comment "text message 149" +2.0.0.150 timeout 2 comment "text message 150" +2.0.0.151 timeout 2 comment "text message 151" +2.0.0.152 timeout 2 comment "text message 152" +2.0.0.153 timeout 2 comment "text message 153" +2.0.0.154 timeout 2 comment "text message 154" +2.0.0.155 timeout 2 comment "text message 155" +2.0.0.156 timeout 2 comment "text message 156" +2.0.0.157 timeout 2 comment "text message 157" +2.0.0.158 timeout 2 comment "text message 158" +2.0.0.159 timeout 2 comment "text message 159" +2.0.0.160 timeout 2 comment "text message 160" +2.0.0.161 timeout 2 comment "text message 161" +2.0.0.162 timeout 2 comment "text message 162" +2.0.0.163 timeout 2 comment "text message 163" +2.0.0.164 timeout 2 comment "text message 164" +2.0.0.165 timeout 2 comment "text message 165" +2.0.0.166 timeout 2 comment "text message 166" +2.0.0.167 timeout 2 comment "text message 167" +2.0.0.168 timeout 2 comment "text message 168" +2.0.0.169 timeout 2 comment "text message 169" +2.0.0.170 timeout 2 comment "text message 170" +2.0.0.171 timeout 2 comment "text message 171" +2.0.0.172 timeout 2 comment "text message 172" +2.0.0.173 timeout 2 comment "text message 173" +2.0.0.174 timeout 2 comment "text message 174" +2.0.0.175 timeout 2 comment "text message 175" +2.0.0.176 timeout 2 comment "text message 176" +2.0.0.177 timeout 2 comment "text message 177" +2.0.0.178 timeout 2 comment "text message 178" +2.0.0.179 timeout 2 comment "text message 179" +2.0.0.180 timeout 2 comment "text message 180" +2.0.0.181 timeout 2 comment "text message 181" +2.0.0.182 timeout 2 comment "text message 182" +2.0.0.183 timeout 2 comment "text message 183" +2.0.0.184 timeout 2 comment "text message 184" +2.0.0.185 timeout 2 comment "text message 185" +2.0.0.186 timeout 2 comment "text message 186" +2.0.0.187 timeout 2 comment "text message 187" +2.0.0.188 timeout 2 comment "text message 188" +2.0.0.189 timeout 2 comment "text message 189" +2.0.0.190 timeout 2 comment "text message 190" +2.0.0.191 timeout 2 comment "text message 191" +2.0.0.192 timeout 2 comment "text message 192" +2.0.0.193 timeout 2 comment "text message 193" +2.0.0.194 timeout 2 comment "text message 194" +2.0.0.195 timeout 2 comment "text message 195" +2.0.0.196 timeout 2 comment "text message 196" +2.0.0.197 timeout 2 comment "text message 197" +2.0.0.198 timeout 2 comment "text message 198" +2.0.0.199 timeout 2 comment "text message 199" +2.0.0.200 timeout 2 comment "text message 200" +2.0.0.201 timeout 2 comment "text message 201" +2.0.0.202 timeout 2 comment "text message 202" +2.0.0.203 timeout 2 comment "text message 203" +2.0.0.204 timeout 2 comment "text message 204" +2.0.0.205 timeout 2 comment "text message 205" +2.0.0.206 timeout 2 comment "text message 206" +2.0.0.207 timeout 2 comment "text message 207" +2.0.0.208 timeout 2 comment "text message 208" +2.0.0.209 timeout 2 comment "text message 209" +2.0.0.210 timeout 2 comment "text message 210" +2.0.0.211 timeout 2 comment "text message 211" +2.0.0.212 timeout 2 comment "text message 212" +2.0.0.213 timeout 2 comment "text message 213" +2.0.0.214 timeout 2 comment "text message 214" +2.0.0.215 timeout 2 comment "text message 215" +2.0.0.216 timeout 2 comment "text message 216" +2.0.0.217 timeout 2 comment "text message 217" +2.0.0.218 timeout 2 comment "text message 218" +2.0.0.219 timeout 2 comment "text message 219" +2.0.0.220 timeout 2 comment "text message 220" +2.0.0.221 timeout 2 comment "text message 221" +2.0.0.222 timeout 2 comment "text message 222" +2.0.0.223 timeout 2 comment "text message 223" +2.0.0.224 timeout 2 comment "text message 224" +2.0.0.225 timeout 2 comment "text message 225" +2.0.0.226 timeout 2 comment "text message 226" +2.0.0.227 timeout 2 comment "text message 227" +2.0.0.228 timeout 2 comment "text message 228" +2.0.0.229 timeout 2 comment "text message 229" +2.0.0.230 timeout 2 comment "text message 230" +2.0.0.231 timeout 2 comment "text message 231" +2.0.0.232 timeout 2 comment "text message 232" +2.0.0.233 timeout 2 comment "text message 233" +2.0.0.234 timeout 2 comment "text message 234" +2.0.0.235 timeout 2 comment "text message 235" +2.0.0.236 timeout 2 comment "text message 236" +2.0.0.237 timeout 2 comment "text message 237" +2.0.0.238 timeout 2 comment "text message 238" +2.0.0.239 timeout 2 comment "text message 239" +2.0.0.240 timeout 2 comment "text message 240" +2.0.0.241 timeout 2 comment "text message 241" +2.0.0.242 timeout 2 comment "text message 242" +2.0.0.243 timeout 2 comment "text message 243" +2.0.0.244 timeout 2 comment "text message 244" +2.0.0.245 timeout 2 comment "text message 245" +2.0.0.246 timeout 2 comment "text message 246" +2.0.0.247 timeout 2 comment "text message 247" +2.0.0.248 timeout 2 comment "text message 248" +2.0.0.249 timeout 2 comment "text message 249" +2.0.0.250 timeout 2 comment "text message 250" +2.0.0.251 timeout 2 comment "text message 251" +2.0.0.252 timeout 2 comment "text message 252" +2.0.0.253 timeout 2 comment "text message 253" +2.0.0.254 timeout 2 comment "text message 254" +2.0.0.255 timeout 2 comment "text message 255" +2.0.1.1 timeout 0 comment "text message 1" +2.0.1.2 timeout 0 comment "text message 2" +2.0.1.3 timeout 0 comment "text message 3" +2.0.1.4 timeout 0 comment "text message 4" +2.0.1.5 timeout 0 comment "text message 5" +2.0.1.6 timeout 0 comment "text message 6" +2.0.1.7 timeout 0 comment "text message 7" +2.0.1.8 timeout 0 comment "text message 8" +2.0.1.9 timeout 0 comment "text message 9" +2.0.1.10 timeout 0 comment "text message 10" +2.0.1.11 timeout 0 comment "text message 11" +2.0.1.12 timeout 0 comment "text message 12" +2.0.1.13 timeout 0 comment "text message 13" +2.0.1.14 timeout 0 comment "text message 14" +2.0.1.15 timeout 0 comment "text message 15" +2.0.1.16 timeout 0 comment "text message 16" +2.0.1.17 timeout 0 comment "text message 17" +2.0.1.18 timeout 0 comment "text message 18" +2.0.1.19 timeout 0 comment "text message 19" +2.0.1.20 timeout 0 comment "text message 20" +2.0.1.21 timeout 0 comment "text message 21" +2.0.1.22 timeout 0 comment "text message 22" +2.0.1.23 timeout 0 comment "text message 23" +2.0.1.24 timeout 0 comment "text message 24" +2.0.1.25 timeout 0 comment "text message 25" +2.0.1.26 timeout 0 comment "text message 26" +2.0.1.27 timeout 0 comment "text message 27" +2.0.1.28 timeout 0 comment "text message 28" +2.0.1.29 timeout 0 comment "text message 29" +2.0.1.30 timeout 0 comment "text message 30" +2.0.1.31 timeout 0 comment "text message 31" +2.0.1.32 timeout 0 comment "text message 32" +2.0.1.33 timeout 0 comment "text message 33" +2.0.1.34 timeout 0 comment "text message 34" +2.0.1.35 timeout 0 comment "text message 35" +2.0.1.36 timeout 0 comment "text message 36" +2.0.1.37 timeout 0 comment "text message 37" +2.0.1.38 timeout 0 comment "text message 38" +2.0.1.39 timeout 0 comment "text message 39" +2.0.1.40 timeout 0 comment "text message 40" +2.0.1.41 timeout 0 comment "text message 41" +2.0.1.42 timeout 0 comment "text message 42" +2.0.1.43 timeout 0 comment "text message 43" +2.0.1.44 timeout 0 comment "text message 44" +2.0.1.45 timeout 0 comment "text message 45" +2.0.1.46 timeout 0 comment "text message 46" +2.0.1.47 timeout 0 comment "text message 47" +2.0.1.48 timeout 0 comment "text message 48" +2.0.1.49 timeout 0 comment "text message 49" +2.0.1.50 timeout 0 comment "text message 50" +2.0.1.51 timeout 0 comment "text message 51" +2.0.1.52 timeout 0 comment "text message 52" +2.0.1.53 timeout 0 comment "text message 53" +2.0.1.54 timeout 0 comment "text message 54" +2.0.1.55 timeout 0 comment "text message 55" +2.0.1.56 timeout 0 comment "text message 56" +2.0.1.57 timeout 0 comment "text message 57" +2.0.1.58 timeout 0 comment "text message 58" +2.0.1.59 timeout 0 comment "text message 59" +2.0.1.60 timeout 0 comment "text message 60" +2.0.1.61 timeout 0 comment "text message 61" +2.0.1.62 timeout 0 comment "text message 62" +2.0.1.63 timeout 0 comment "text message 63" +2.0.1.64 timeout 0 comment "text message 64" +2.0.1.65 timeout 0 comment "text message 65" +2.0.1.66 timeout 0 comment "text message 66" +2.0.1.67 timeout 0 comment "text message 67" +2.0.1.68 timeout 0 comment "text message 68" +2.0.1.69 timeout 0 comment "text message 69" +2.0.1.70 timeout 0 comment "text message 70" +2.0.1.71 timeout 0 comment "text message 71" +2.0.1.72 timeout 0 comment "text message 72" +2.0.1.73 timeout 0 comment "text message 73" +2.0.1.74 timeout 0 comment "text message 74" +2.0.1.75 timeout 0 comment "text message 75" +2.0.1.76 timeout 0 comment "text message 76" +2.0.1.77 timeout 0 comment "text message 77" +2.0.1.78 timeout 0 comment "text message 78" +2.0.1.79 timeout 0 comment "text message 79" +2.0.1.80 timeout 0 comment "text message 80" +2.0.1.81 timeout 0 comment "text message 81" +2.0.1.82 timeout 0 comment "text message 82" +2.0.1.83 timeout 0 comment "text message 83" +2.0.1.84 timeout 0 comment "text message 84" +2.0.1.85 timeout 0 comment "text message 85" +2.0.1.86 timeout 0 comment "text message 86" +2.0.1.87 timeout 0 comment "text message 87" +2.0.1.88 timeout 0 comment "text message 88" +2.0.1.89 timeout 0 comment "text message 89" +2.0.1.90 timeout 0 comment "text message 90" +2.0.1.91 timeout 0 comment "text message 91" +2.0.1.92 timeout 0 comment "text message 92" +2.0.1.93 timeout 0 comment "text message 93" +2.0.1.94 timeout 0 comment "text message 94" +2.0.1.95 timeout 0 comment "text message 95" +2.0.1.96 timeout 0 comment "text message 96" +2.0.1.97 timeout 0 comment "text message 97" +2.0.1.98 timeout 0 comment "text message 98" +2.0.1.99 timeout 0 comment "text message 99" +2.0.1.100 timeout 0 comment "text message 100" +2.0.1.101 timeout 0 comment "text message 101" +2.0.1.102 timeout 0 comment "text message 102" +2.0.1.103 timeout 0 comment "text message 103" +2.0.1.104 timeout 0 comment "text message 104" +2.0.1.105 timeout 0 comment "text message 105" +2.0.1.106 timeout 0 comment "text message 106" +2.0.1.107 timeout 0 comment "text message 107" +2.0.1.108 timeout 0 comment "text message 108" +2.0.1.109 timeout 0 comment "text message 109" +2.0.1.110 timeout 0 comment "text message 110" +2.0.1.111 timeout 0 comment "text message 111" +2.0.1.112 timeout 0 comment "text message 112" +2.0.1.113 timeout 0 comment "text message 113" +2.0.1.114 timeout 0 comment "text message 114" +2.0.1.115 timeout 0 comment "text message 115" +2.0.1.116 timeout 0 comment "text message 116" +2.0.1.117 timeout 0 comment "text message 117" +2.0.1.118 timeout 0 comment "text message 118" +2.0.1.119 timeout 0 comment "text message 119" +2.0.1.120 timeout 0 comment "text message 120" +2.0.1.121 timeout 0 comment "text message 121" +2.0.1.122 timeout 0 comment "text message 122" +2.0.1.123 timeout 0 comment "text message 123" +2.0.1.124 timeout 0 comment "text message 124" +2.0.1.125 timeout 0 comment "text message 125" +2.0.1.126 timeout 0 comment "text message 126" +2.0.1.127 timeout 0 comment "text message 127" +2.0.1.128 timeout 0 comment "text message 128" +2.0.1.129 timeout 0 comment "text message 129" +2.0.1.130 timeout 0 comment "text message 130" +2.0.1.131 timeout 0 comment "text message 131" +2.0.1.132 timeout 0 comment "text message 132" +2.0.1.133 timeout 0 comment "text message 133" +2.0.1.134 timeout 0 comment "text message 134" +2.0.1.135 timeout 0 comment "text message 135" +2.0.1.136 timeout 0 comment "text message 136" +2.0.1.137 timeout 0 comment "text message 137" +2.0.1.138 timeout 0 comment "text message 138" +2.0.1.139 timeout 0 comment "text message 139" +2.0.1.140 timeout 0 comment "text message 140" +2.0.1.141 timeout 0 comment "text message 141" +2.0.1.142 timeout 0 comment "text message 142" +2.0.1.143 timeout 0 comment "text message 143" +2.0.1.144 timeout 0 comment "text message 144" +2.0.1.145 timeout 0 comment "text message 145" +2.0.1.146 timeout 0 comment "text message 146" +2.0.1.147 timeout 0 comment "text message 147" +2.0.1.148 timeout 0 comment "text message 148" +2.0.1.149 timeout 0 comment "text message 149" +2.0.1.150 timeout 0 comment "text message 150" +2.0.1.151 timeout 0 comment "text message 151" +2.0.1.152 timeout 0 comment "text message 152" +2.0.1.153 timeout 0 comment "text message 153" +2.0.1.154 timeout 0 comment "text message 154" +2.0.1.155 timeout 0 comment "text message 155" +2.0.1.156 timeout 0 comment "text message 156" +2.0.1.157 timeout 0 comment "text message 157" +2.0.1.158 timeout 0 comment "text message 158" +2.0.1.159 timeout 0 comment "text message 159" +2.0.1.160 timeout 0 comment "text message 160" +2.0.1.161 timeout 0 comment "text message 161" +2.0.1.162 timeout 0 comment "text message 162" +2.0.1.163 timeout 0 comment "text message 163" +2.0.1.164 timeout 0 comment "text message 164" +2.0.1.165 timeout 0 comment "text message 165" +2.0.1.166 timeout 0 comment "text message 166" +2.0.1.167 timeout 0 comment "text message 167" +2.0.1.168 timeout 0 comment "text message 168" +2.0.1.169 timeout 0 comment "text message 169" +2.0.1.170 timeout 0 comment "text message 170" +2.0.1.171 timeout 0 comment "text message 171" +2.0.1.172 timeout 0 comment "text message 172" +2.0.1.173 timeout 0 comment "text message 173" +2.0.1.174 timeout 0 comment "text message 174" +2.0.1.175 timeout 0 comment "text message 175" +2.0.1.176 timeout 0 comment "text message 176" +2.0.1.177 timeout 0 comment "text message 177" +2.0.1.178 timeout 0 comment "text message 178" +2.0.1.179 timeout 0 comment "text message 179" +2.0.1.180 timeout 0 comment "text message 180" +2.0.1.181 timeout 0 comment "text message 181" +2.0.1.182 timeout 0 comment "text message 182" +2.0.1.183 timeout 0 comment "text message 183" +2.0.1.184 timeout 0 comment "text message 184" +2.0.1.185 timeout 0 comment "text message 185" +2.0.1.186 timeout 0 comment "text message 186" +2.0.1.187 timeout 0 comment "text message 187" +2.0.1.188 timeout 0 comment "text message 188" +2.0.1.189 timeout 0 comment "text message 189" +2.0.1.190 timeout 0 comment "text message 190" +2.0.1.191 timeout 0 comment "text message 191" +2.0.1.192 timeout 0 comment "text message 192" +2.0.1.193 timeout 0 comment "text message 193" +2.0.1.194 timeout 0 comment "text message 194" +2.0.1.195 timeout 0 comment "text message 195" +2.0.1.196 timeout 0 comment "text message 196" +2.0.1.197 timeout 0 comment "text message 197" +2.0.1.198 timeout 0 comment "text message 198" +2.0.1.199 timeout 0 comment "text message 199" +2.0.1.200 timeout 0 comment "text message 200" +2.0.1.201 timeout 0 comment "text message 201" +2.0.1.202 timeout 0 comment "text message 202" +2.0.1.203 timeout 0 comment "text message 203" +2.0.1.204 timeout 0 comment "text message 204" +2.0.1.205 timeout 0 comment "text message 205" +2.0.1.206 timeout 0 comment "text message 206" +2.0.1.207 timeout 0 comment "text message 207" +2.0.1.208 timeout 0 comment "text message 208" +2.0.1.209 timeout 0 comment "text message 209" +2.0.1.210 timeout 0 comment "text message 210" +2.0.1.211 timeout 0 comment "text message 211" +2.0.1.212 timeout 0 comment "text message 212" +2.0.1.213 timeout 0 comment "text message 213" +2.0.1.214 timeout 0 comment "text message 214" +2.0.1.215 timeout 0 comment "text message 215" +2.0.1.216 timeout 0 comment "text message 216" +2.0.1.217 timeout 0 comment "text message 217" +2.0.1.218 timeout 0 comment "text message 218" +2.0.1.219 timeout 0 comment "text message 219" +2.0.1.220 timeout 0 comment "text message 220" +2.0.1.221 timeout 0 comment "text message 221" +2.0.1.222 timeout 0 comment "text message 222" +2.0.1.223 timeout 0 comment "text message 223" +2.0.1.224 timeout 0 comment "text message 224" +2.0.1.225 timeout 0 comment "text message 225" +2.0.1.226 timeout 0 comment "text message 226" +2.0.1.227 timeout 0 comment "text message 227" +2.0.1.228 timeout 0 comment "text message 228" +2.0.1.229 timeout 0 comment "text message 229" +2.0.1.230 timeout 0 comment "text message 230" +2.0.1.231 timeout 0 comment "text message 231" +2.0.1.232 timeout 0 comment "text message 232" +2.0.1.233 timeout 0 comment "text message 233" +2.0.1.234 timeout 0 comment "text message 234" +2.0.1.235 timeout 0 comment "text message 235" +2.0.1.236 timeout 0 comment "text message 236" +2.0.1.237 timeout 0 comment "text message 237" +2.0.1.238 timeout 0 comment "text message 238" +2.0.1.239 timeout 0 comment "text message 239" +2.0.1.240 timeout 0 comment "text message 240" +2.0.1.241 timeout 0 comment "text message 241" +2.0.1.242 timeout 0 comment "text message 242" +2.0.1.243 timeout 0 comment "text message 243" +2.0.1.244 timeout 0 comment "text message 244" +2.0.1.245 timeout 0 comment "text message 245" +2.0.1.246 timeout 0 comment "text message 246" +2.0.1.247 timeout 0 comment "text message 247" +2.0.1.248 timeout 0 comment "text message 248" +2.0.1.249 timeout 0 comment "text message 249" +2.0.1.250 timeout 0 comment "text message 250" +2.0.1.251 timeout 0 comment "text message 251" +2.0.1.252 timeout 0 comment "text message 252" +2.0.1.253 timeout 0 comment "text message 253" +2.0.1.254 timeout 0 comment "text message 254" +2.0.1.255 timeout 0 comment "text message 255" diff --git a/tests/comment.t.list12 b/tests/comment.t.list12 index 9440b75e..202c8416 100644 --- a/tests/comment.t.list12 +++ b/tests/comment.t.list12 @@ -1,262 +1,263 @@ Name: test Type: bitmap:ip -Header: range 2.0.0.1-2.1.0.0 timeout x comment -Size in memory: 1056928 +Revision: 3 +Header: range 2.0.0.1-2.1.0.0 timeout 3 comment +Size in memory: 1065203 References: 0 -Number of entries: 510 +Number of entries: 255 Members: -2.0.1.1 timeout x comment "text message 1" -2.0.1.2 timeout x comment "text message 2" -2.0.1.3 timeout x comment "text message 3" -2.0.1.4 timeout x comment "text message 4" -2.0.1.5 timeout x comment "text message 5" -2.0.1.6 timeout x comment "text message 6" -2.0.1.7 timeout x comment "text message 7" -2.0.1.8 timeout x comment "text message 8" -2.0.1.9 timeout x comment "text message 9" -2.0.1.10 timeout x comment "text message 10" -2.0.1.11 timeout x comment "text message 11" -2.0.1.12 timeout x comment "text message 12" -2.0.1.13 timeout x comment "text message 13" -2.0.1.14 timeout x comment "text message 14" -2.0.1.15 timeout x comment "text message 15" -2.0.1.16 timeout x comment "text message 16" -2.0.1.17 timeout x comment "text message 17" -2.0.1.18 timeout x comment "text message 18" -2.0.1.19 timeout x comment "text message 19" -2.0.1.20 timeout x comment "text message 20" -2.0.1.21 timeout x comment "text message 21" -2.0.1.22 timeout x comment "text message 22" -2.0.1.23 timeout x comment "text message 23" -2.0.1.24 timeout x comment "text message 24" -2.0.1.25 timeout x comment "text message 25" -2.0.1.26 timeout x comment "text message 26" -2.0.1.27 timeout x comment "text message 27" -2.0.1.28 timeout x comment "text message 28" -2.0.1.29 timeout x comment "text message 29" -2.0.1.30 timeout x comment "text message 30" -2.0.1.31 timeout x comment "text message 31" -2.0.1.32 timeout x comment "text message 32" -2.0.1.33 timeout x comment "text message 33" -2.0.1.34 timeout x comment "text message 34" -2.0.1.35 timeout x comment "text message 35" -2.0.1.36 timeout x comment "text message 36" -2.0.1.37 timeout x comment "text message 37" -2.0.1.38 timeout x comment "text message 38" -2.0.1.39 timeout x comment "text message 39" -2.0.1.40 timeout x comment "text message 40" -2.0.1.41 timeout x comment "text message 41" -2.0.1.42 timeout x comment "text message 42" -2.0.1.43 timeout x comment "text message 43" -2.0.1.44 timeout x comment "text message 44" -2.0.1.45 timeout x comment "text message 45" -2.0.1.46 timeout x comment "text message 46" -2.0.1.47 timeout x comment "text message 47" -2.0.1.48 timeout x comment "text message 48" -2.0.1.49 timeout x comment "text message 49" -2.0.1.50 timeout x comment "text message 50" -2.0.1.51 timeout x comment "text message 51" -2.0.1.52 timeout x comment "text message 52" -2.0.1.53 timeout x comment "text message 53" -2.0.1.54 timeout x comment "text message 54" -2.0.1.55 timeout x comment "text message 55" -2.0.1.56 timeout x comment "text message 56" -2.0.1.57 timeout x comment "text message 57" -2.0.1.58 timeout x comment "text message 58" -2.0.1.59 timeout x comment "text message 59" -2.0.1.60 timeout x comment "text message 60" -2.0.1.61 timeout x comment "text message 61" -2.0.1.62 timeout x comment "text message 62" -2.0.1.63 timeout x comment "text message 63" -2.0.1.64 timeout x comment "text message 64" -2.0.1.65 timeout x comment "text message 65" -2.0.1.66 timeout x comment "text message 66" -2.0.1.67 timeout x comment "text message 67" -2.0.1.68 timeout x comment "text message 68" -2.0.1.69 timeout x comment "text message 69" -2.0.1.70 timeout x comment "text message 70" -2.0.1.71 timeout x comment "text message 71" -2.0.1.72 timeout x comment "text message 72" -2.0.1.73 timeout x comment "text message 73" -2.0.1.74 timeout x comment "text message 74" -2.0.1.75 timeout x comment "text message 75" -2.0.1.76 timeout x comment "text message 76" -2.0.1.77 timeout x comment "text message 77" -2.0.1.78 timeout x comment "text message 78" -2.0.1.79 timeout x comment "text message 79" -2.0.1.80 timeout x comment "text message 80" -2.0.1.81 timeout x comment "text message 81" -2.0.1.82 timeout x comment "text message 82" -2.0.1.83 timeout x comment "text message 83" -2.0.1.84 timeout x comment "text message 84" -2.0.1.85 timeout x comment "text message 85" -2.0.1.86 timeout x comment "text message 86" -2.0.1.87 timeout x comment "text message 87" -2.0.1.88 timeout x comment "text message 88" -2.0.1.89 timeout x comment "text message 89" -2.0.1.90 timeout x comment "text message 90" -2.0.1.91 timeout x comment "text message 91" -2.0.1.92 timeout x comment "text message 92" -2.0.1.93 timeout x comment "text message 93" -2.0.1.94 timeout x comment "text message 94" -2.0.1.95 timeout x comment "text message 95" -2.0.1.96 timeout x comment "text message 96" -2.0.1.97 timeout x comment "text message 97" -2.0.1.98 timeout x comment "text message 98" -2.0.1.99 timeout x comment "text message 99" -2.0.1.100 timeout x comment "text message 100" -2.0.1.101 timeout x comment "text message 101" -2.0.1.102 timeout x comment "text message 102" -2.0.1.103 timeout x comment "text message 103" -2.0.1.104 timeout x comment "text message 104" -2.0.1.105 timeout x comment "text message 105" -2.0.1.106 timeout x comment "text message 106" -2.0.1.107 timeout x comment "text message 107" -2.0.1.108 timeout x comment "text message 108" -2.0.1.109 timeout x comment "text message 109" -2.0.1.110 timeout x comment "text message 110" -2.0.1.111 timeout x comment "text message 111" -2.0.1.112 timeout x comment "text message 112" -2.0.1.113 timeout x comment "text message 113" -2.0.1.114 timeout x comment "text message 114" -2.0.1.115 timeout x comment "text message 115" -2.0.1.116 timeout x comment "text message 116" -2.0.1.117 timeout x comment "text message 117" -2.0.1.118 timeout x comment "text message 118" -2.0.1.119 timeout x comment "text message 119" -2.0.1.120 timeout x comment "text message 120" -2.0.1.121 timeout x comment "text message 121" -2.0.1.122 timeout x comment "text message 122" -2.0.1.123 timeout x comment "text message 123" -2.0.1.124 timeout x comment "text message 124" -2.0.1.125 timeout x comment "text message 125" -2.0.1.126 timeout x comment "text message 126" -2.0.1.127 timeout x comment "text message 127" -2.0.1.128 timeout x comment "text message 128" -2.0.1.129 timeout x comment "text message 129" -2.0.1.130 timeout x comment "text message 130" -2.0.1.131 timeout x comment "text message 131" -2.0.1.132 timeout x comment "text message 132" -2.0.1.133 timeout x comment "text message 133" -2.0.1.134 timeout x comment "text message 134" -2.0.1.135 timeout x comment "text message 135" -2.0.1.136 timeout x comment "text message 136" -2.0.1.137 timeout x comment "text message 137" -2.0.1.138 timeout x comment "text message 138" -2.0.1.139 timeout x comment "text message 139" -2.0.1.140 timeout x comment "text message 140" -2.0.1.141 timeout x comment "text message 141" -2.0.1.142 timeout x comment "text message 142" -2.0.1.143 timeout x comment "text message 143" -2.0.1.144 timeout x comment "text message 144" -2.0.1.145 timeout x comment "text message 145" -2.0.1.146 timeout x comment "text message 146" -2.0.1.147 timeout x comment "text message 147" -2.0.1.148 timeout x comment "text message 148" -2.0.1.149 timeout x comment "text message 149" -2.0.1.150 timeout x comment "text message 150" -2.0.1.151 timeout x comment "text message 151" -2.0.1.152 timeout x comment "text message 152" -2.0.1.153 timeout x comment "text message 153" -2.0.1.154 timeout x comment "text message 154" -2.0.1.155 timeout x comment "text message 155" -2.0.1.156 timeout x comment "text message 156" -2.0.1.157 timeout x comment "text message 157" -2.0.1.158 timeout x comment "text message 158" -2.0.1.159 timeout x comment "text message 159" -2.0.1.160 timeout x comment "text message 160" -2.0.1.161 timeout x comment "text message 161" -2.0.1.162 timeout x comment "text message 162" -2.0.1.163 timeout x comment "text message 163" -2.0.1.164 timeout x comment "text message 164" -2.0.1.165 timeout x comment "text message 165" -2.0.1.166 timeout x comment "text message 166" -2.0.1.167 timeout x comment "text message 167" -2.0.1.168 timeout x comment "text message 168" -2.0.1.169 timeout x comment "text message 169" -2.0.1.170 timeout x comment "text message 170" -2.0.1.171 timeout x comment "text message 171" -2.0.1.172 timeout x comment "text message 172" -2.0.1.173 timeout x comment "text message 173" -2.0.1.174 timeout x comment "text message 174" -2.0.1.175 timeout x comment "text message 175" -2.0.1.176 timeout x comment "text message 176" -2.0.1.177 timeout x comment "text message 177" -2.0.1.178 timeout x comment "text message 178" -2.0.1.179 timeout x comment "text message 179" -2.0.1.180 timeout x comment "text message 180" -2.0.1.181 timeout x comment "text message 181" -2.0.1.182 timeout x comment "text message 182" -2.0.1.183 timeout x comment "text message 183" -2.0.1.184 timeout x comment "text message 184" -2.0.1.185 timeout x comment "text message 185" -2.0.1.186 timeout x comment "text message 186" -2.0.1.187 timeout x comment "text message 187" -2.0.1.188 timeout x comment "text message 188" -2.0.1.189 timeout x comment "text message 189" -2.0.1.190 timeout x comment "text message 190" -2.0.1.191 timeout x comment "text message 191" -2.0.1.192 timeout x comment "text message 192" -2.0.1.193 timeout x comment "text message 193" -2.0.1.194 timeout x comment "text message 194" -2.0.1.195 timeout x comment "text message 195" -2.0.1.196 timeout x comment "text message 196" -2.0.1.197 timeout x comment "text message 197" -2.0.1.198 timeout x comment "text message 198" -2.0.1.199 timeout x comment "text message 199" -2.0.1.200 timeout x comment "text message 200" -2.0.1.201 timeout x comment "text message 201" -2.0.1.202 timeout x comment "text message 202" -2.0.1.203 timeout x comment "text message 203" -2.0.1.204 timeout x comment "text message 204" -2.0.1.205 timeout x comment "text message 205" -2.0.1.206 timeout x comment "text message 206" -2.0.1.207 timeout x comment "text message 207" -2.0.1.208 timeout x comment "text message 208" -2.0.1.209 timeout x comment "text message 209" -2.0.1.210 timeout x comment "text message 210" -2.0.1.211 timeout x comment "text message 211" -2.0.1.212 timeout x comment "text message 212" -2.0.1.213 timeout x comment "text message 213" -2.0.1.214 timeout x comment "text message 214" -2.0.1.215 timeout x comment "text message 215" -2.0.1.216 timeout x comment "text message 216" -2.0.1.217 timeout x comment "text message 217" -2.0.1.218 timeout x comment "text message 218" -2.0.1.219 timeout x comment "text message 219" -2.0.1.220 timeout x comment "text message 220" -2.0.1.221 timeout x comment "text message 221" -2.0.1.222 timeout x comment "text message 222" -2.0.1.223 timeout x comment "text message 223" -2.0.1.224 timeout x comment "text message 224" -2.0.1.225 timeout x comment "text message 225" -2.0.1.226 timeout x comment "text message 226" -2.0.1.227 timeout x comment "text message 227" -2.0.1.228 timeout x comment "text message 228" -2.0.1.229 timeout x comment "text message 229" -2.0.1.230 timeout x comment "text message 230" -2.0.1.231 timeout x comment "text message 231" -2.0.1.232 timeout x comment "text message 232" -2.0.1.233 timeout x comment "text message 233" -2.0.1.234 timeout x comment "text message 234" -2.0.1.235 timeout x comment "text message 235" -2.0.1.236 timeout x comment "text message 236" -2.0.1.237 timeout x comment "text message 237" -2.0.1.238 timeout x comment "text message 238" -2.0.1.239 timeout x comment "text message 239" -2.0.1.240 timeout x comment "text message 240" -2.0.1.241 timeout x comment "text message 241" -2.0.1.242 timeout x comment "text message 242" -2.0.1.243 timeout x comment "text message 243" -2.0.1.244 timeout x comment "text message 244" -2.0.1.245 timeout x comment "text message 245" -2.0.1.246 timeout x comment "text message 246" -2.0.1.247 timeout x comment "text message 247" -2.0.1.248 timeout x comment "text message 248" -2.0.1.249 timeout x comment "text message 249" -2.0.1.250 timeout x comment "text message 250" -2.0.1.251 timeout x comment "text message 251" -2.0.1.252 timeout x comment "text message 252" -2.0.1.253 timeout x comment "text message 253" -2.0.1.254 timeout x comment "text message 254" -2.0.1.255 timeout x comment "text message 255" +2.0.1.1 timeout 0 comment "text message 1" +2.0.1.2 timeout 0 comment "text message 2" +2.0.1.3 timeout 0 comment "text message 3" +2.0.1.4 timeout 0 comment "text message 4" +2.0.1.5 timeout 0 comment "text message 5" +2.0.1.6 timeout 0 comment "text message 6" +2.0.1.7 timeout 0 comment "text message 7" +2.0.1.8 timeout 0 comment "text message 8" +2.0.1.9 timeout 0 comment "text message 9" +2.0.1.10 timeout 0 comment "text message 10" +2.0.1.11 timeout 0 comment "text message 11" +2.0.1.12 timeout 0 comment "text message 12" +2.0.1.13 timeout 0 comment "text message 13" +2.0.1.14 timeout 0 comment "text message 14" +2.0.1.15 timeout 0 comment "text message 15" +2.0.1.16 timeout 0 comment "text message 16" +2.0.1.17 timeout 0 comment "text message 17" +2.0.1.18 timeout 0 comment "text message 18" +2.0.1.19 timeout 0 comment "text message 19" +2.0.1.20 timeout 0 comment "text message 20" +2.0.1.21 timeout 0 comment "text message 21" +2.0.1.22 timeout 0 comment "text message 22" +2.0.1.23 timeout 0 comment "text message 23" +2.0.1.24 timeout 0 comment "text message 24" +2.0.1.25 timeout 0 comment "text message 25" +2.0.1.26 timeout 0 comment "text message 26" +2.0.1.27 timeout 0 comment "text message 27" +2.0.1.28 timeout 0 comment "text message 28" +2.0.1.29 timeout 0 comment "text message 29" +2.0.1.30 timeout 0 comment "text message 30" +2.0.1.31 timeout 0 comment "text message 31" +2.0.1.32 timeout 0 comment "text message 32" +2.0.1.33 timeout 0 comment "text message 33" +2.0.1.34 timeout 0 comment "text message 34" +2.0.1.35 timeout 0 comment "text message 35" +2.0.1.36 timeout 0 comment "text message 36" +2.0.1.37 timeout 0 comment "text message 37" +2.0.1.38 timeout 0 comment "text message 38" +2.0.1.39 timeout 0 comment "text message 39" +2.0.1.40 timeout 0 comment "text message 40" +2.0.1.41 timeout 0 comment "text message 41" +2.0.1.42 timeout 0 comment "text message 42" +2.0.1.43 timeout 0 comment "text message 43" +2.0.1.44 timeout 0 comment "text message 44" +2.0.1.45 timeout 0 comment "text message 45" +2.0.1.46 timeout 0 comment "text message 46" +2.0.1.47 timeout 0 comment "text message 47" +2.0.1.48 timeout 0 comment "text message 48" +2.0.1.49 timeout 0 comment "text message 49" +2.0.1.50 timeout 0 comment "text message 50" +2.0.1.51 timeout 0 comment "text message 51" +2.0.1.52 timeout 0 comment "text message 52" +2.0.1.53 timeout 0 comment "text message 53" +2.0.1.54 timeout 0 comment "text message 54" +2.0.1.55 timeout 0 comment "text message 55" +2.0.1.56 timeout 0 comment "text message 56" +2.0.1.57 timeout 0 comment "text message 57" +2.0.1.58 timeout 0 comment "text message 58" +2.0.1.59 timeout 0 comment "text message 59" +2.0.1.60 timeout 0 comment "text message 60" +2.0.1.61 timeout 0 comment "text message 61" +2.0.1.62 timeout 0 comment "text message 62" +2.0.1.63 timeout 0 comment "text message 63" +2.0.1.64 timeout 0 comment "text message 64" +2.0.1.65 timeout 0 comment "text message 65" +2.0.1.66 timeout 0 comment "text message 66" +2.0.1.67 timeout 0 comment "text message 67" +2.0.1.68 timeout 0 comment "text message 68" +2.0.1.69 timeout 0 comment "text message 69" +2.0.1.70 timeout 0 comment "text message 70" +2.0.1.71 timeout 0 comment "text message 71" +2.0.1.72 timeout 0 comment "text message 72" +2.0.1.73 timeout 0 comment "text message 73" +2.0.1.74 timeout 0 comment "text message 74" +2.0.1.75 timeout 0 comment "text message 75" +2.0.1.76 timeout 0 comment "text message 76" +2.0.1.77 timeout 0 comment "text message 77" +2.0.1.78 timeout 0 comment "text message 78" +2.0.1.79 timeout 0 comment "text message 79" +2.0.1.80 timeout 0 comment "text message 80" +2.0.1.81 timeout 0 comment "text message 81" +2.0.1.82 timeout 0 comment "text message 82" +2.0.1.83 timeout 0 comment "text message 83" +2.0.1.84 timeout 0 comment "text message 84" +2.0.1.85 timeout 0 comment "text message 85" +2.0.1.86 timeout 0 comment "text message 86" +2.0.1.87 timeout 0 comment "text message 87" +2.0.1.88 timeout 0 comment "text message 88" +2.0.1.89 timeout 0 comment "text message 89" +2.0.1.90 timeout 0 comment "text message 90" +2.0.1.91 timeout 0 comment "text message 91" +2.0.1.92 timeout 0 comment "text message 92" +2.0.1.93 timeout 0 comment "text message 93" +2.0.1.94 timeout 0 comment "text message 94" +2.0.1.95 timeout 0 comment "text message 95" +2.0.1.96 timeout 0 comment "text message 96" +2.0.1.97 timeout 0 comment "text message 97" +2.0.1.98 timeout 0 comment "text message 98" +2.0.1.99 timeout 0 comment "text message 99" +2.0.1.100 timeout 0 comment "text message 100" +2.0.1.101 timeout 0 comment "text message 101" +2.0.1.102 timeout 0 comment "text message 102" +2.0.1.103 timeout 0 comment "text message 103" +2.0.1.104 timeout 0 comment "text message 104" +2.0.1.105 timeout 0 comment "text message 105" +2.0.1.106 timeout 0 comment "text message 106" +2.0.1.107 timeout 0 comment "text message 107" +2.0.1.108 timeout 0 comment "text message 108" +2.0.1.109 timeout 0 comment "text message 109" +2.0.1.110 timeout 0 comment "text message 110" +2.0.1.111 timeout 0 comment "text message 111" +2.0.1.112 timeout 0 comment "text message 112" +2.0.1.113 timeout 0 comment "text message 113" +2.0.1.114 timeout 0 comment "text message 114" +2.0.1.115 timeout 0 comment "text message 115" +2.0.1.116 timeout 0 comment "text message 116" +2.0.1.117 timeout 0 comment "text message 117" +2.0.1.118 timeout 0 comment "text message 118" +2.0.1.119 timeout 0 comment "text message 119" +2.0.1.120 timeout 0 comment "text message 120" +2.0.1.121 timeout 0 comment "text message 121" +2.0.1.122 timeout 0 comment "text message 122" +2.0.1.123 timeout 0 comment "text message 123" +2.0.1.124 timeout 0 comment "text message 124" +2.0.1.125 timeout 0 comment "text message 125" +2.0.1.126 timeout 0 comment "text message 126" +2.0.1.127 timeout 0 comment "text message 127" +2.0.1.128 timeout 0 comment "text message 128" +2.0.1.129 timeout 0 comment "text message 129" +2.0.1.130 timeout 0 comment "text message 130" +2.0.1.131 timeout 0 comment "text message 131" +2.0.1.132 timeout 0 comment "text message 132" +2.0.1.133 timeout 0 comment "text message 133" +2.0.1.134 timeout 0 comment "text message 134" +2.0.1.135 timeout 0 comment "text message 135" +2.0.1.136 timeout 0 comment "text message 136" +2.0.1.137 timeout 0 comment "text message 137" +2.0.1.138 timeout 0 comment "text message 138" +2.0.1.139 timeout 0 comment "text message 139" +2.0.1.140 timeout 0 comment "text message 140" +2.0.1.141 timeout 0 comment "text message 141" +2.0.1.142 timeout 0 comment "text message 142" +2.0.1.143 timeout 0 comment "text message 143" +2.0.1.144 timeout 0 comment "text message 144" +2.0.1.145 timeout 0 comment "text message 145" +2.0.1.146 timeout 0 comment "text message 146" +2.0.1.147 timeout 0 comment "text message 147" +2.0.1.148 timeout 0 comment "text message 148" +2.0.1.149 timeout 0 comment "text message 149" +2.0.1.150 timeout 0 comment "text message 150" +2.0.1.151 timeout 0 comment "text message 151" +2.0.1.152 timeout 0 comment "text message 152" +2.0.1.153 timeout 0 comment "text message 153" +2.0.1.154 timeout 0 comment "text message 154" +2.0.1.155 timeout 0 comment "text message 155" +2.0.1.156 timeout 0 comment "text message 156" +2.0.1.157 timeout 0 comment "text message 157" +2.0.1.158 timeout 0 comment "text message 158" +2.0.1.159 timeout 0 comment "text message 159" +2.0.1.160 timeout 0 comment "text message 160" +2.0.1.161 timeout 0 comment "text message 161" +2.0.1.162 timeout 0 comment "text message 162" +2.0.1.163 timeout 0 comment "text message 163" +2.0.1.164 timeout 0 comment "text message 164" +2.0.1.165 timeout 0 comment "text message 165" +2.0.1.166 timeout 0 comment "text message 166" +2.0.1.167 timeout 0 comment "text message 167" +2.0.1.168 timeout 0 comment "text message 168" +2.0.1.169 timeout 0 comment "text message 169" +2.0.1.170 timeout 0 comment "text message 170" +2.0.1.171 timeout 0 comment "text message 171" +2.0.1.172 timeout 0 comment "text message 172" +2.0.1.173 timeout 0 comment "text message 173" +2.0.1.174 timeout 0 comment "text message 174" +2.0.1.175 timeout 0 comment "text message 175" +2.0.1.176 timeout 0 comment "text message 176" +2.0.1.177 timeout 0 comment "text message 177" +2.0.1.178 timeout 0 comment "text message 178" +2.0.1.179 timeout 0 comment "text message 179" +2.0.1.180 timeout 0 comment "text message 180" +2.0.1.181 timeout 0 comment "text message 181" +2.0.1.182 timeout 0 comment "text message 182" +2.0.1.183 timeout 0 comment "text message 183" +2.0.1.184 timeout 0 comment "text message 184" +2.0.1.185 timeout 0 comment "text message 185" +2.0.1.186 timeout 0 comment "text message 186" +2.0.1.187 timeout 0 comment "text message 187" +2.0.1.188 timeout 0 comment "text message 188" +2.0.1.189 timeout 0 comment "text message 189" +2.0.1.190 timeout 0 comment "text message 190" +2.0.1.191 timeout 0 comment "text message 191" +2.0.1.192 timeout 0 comment "text message 192" +2.0.1.193 timeout 0 comment "text message 193" +2.0.1.194 timeout 0 comment "text message 194" +2.0.1.195 timeout 0 comment "text message 195" +2.0.1.196 timeout 0 comment "text message 196" +2.0.1.197 timeout 0 comment "text message 197" +2.0.1.198 timeout 0 comment "text message 198" +2.0.1.199 timeout 0 comment "text message 199" +2.0.1.200 timeout 0 comment "text message 200" +2.0.1.201 timeout 0 comment "text message 201" +2.0.1.202 timeout 0 comment "text message 202" +2.0.1.203 timeout 0 comment "text message 203" +2.0.1.204 timeout 0 comment "text message 204" +2.0.1.205 timeout 0 comment "text message 205" +2.0.1.206 timeout 0 comment "text message 206" +2.0.1.207 timeout 0 comment "text message 207" +2.0.1.208 timeout 0 comment "text message 208" +2.0.1.209 timeout 0 comment "text message 209" +2.0.1.210 timeout 0 comment "text message 210" +2.0.1.211 timeout 0 comment "text message 211" +2.0.1.212 timeout 0 comment "text message 212" +2.0.1.213 timeout 0 comment "text message 213" +2.0.1.214 timeout 0 comment "text message 214" +2.0.1.215 timeout 0 comment "text message 215" +2.0.1.216 timeout 0 comment "text message 216" +2.0.1.217 timeout 0 comment "text message 217" +2.0.1.218 timeout 0 comment "text message 218" +2.0.1.219 timeout 0 comment "text message 219" +2.0.1.220 timeout 0 comment "text message 220" +2.0.1.221 timeout 0 comment "text message 221" +2.0.1.222 timeout 0 comment "text message 222" +2.0.1.223 timeout 0 comment "text message 223" +2.0.1.224 timeout 0 comment "text message 224" +2.0.1.225 timeout 0 comment "text message 225" +2.0.1.226 timeout 0 comment "text message 226" +2.0.1.227 timeout 0 comment "text message 227" +2.0.1.228 timeout 0 comment "text message 228" +2.0.1.229 timeout 0 comment "text message 229" +2.0.1.230 timeout 0 comment "text message 230" +2.0.1.231 timeout 0 comment "text message 231" +2.0.1.232 timeout 0 comment "text message 232" +2.0.1.233 timeout 0 comment "text message 233" +2.0.1.234 timeout 0 comment "text message 234" +2.0.1.235 timeout 0 comment "text message 235" +2.0.1.236 timeout 0 comment "text message 236" +2.0.1.237 timeout 0 comment "text message 237" +2.0.1.238 timeout 0 comment "text message 238" +2.0.1.239 timeout 0 comment "text message 239" +2.0.1.240 timeout 0 comment "text message 240" +2.0.1.241 timeout 0 comment "text message 241" +2.0.1.242 timeout 0 comment "text message 242" +2.0.1.243 timeout 0 comment "text message 243" +2.0.1.244 timeout 0 comment "text message 244" +2.0.1.245 timeout 0 comment "text message 245" +2.0.1.246 timeout 0 comment "text message 246" +2.0.1.247 timeout 0 comment "text message 247" +2.0.1.248 timeout 0 comment "text message 248" +2.0.1.249 timeout 0 comment "text message 249" +2.0.1.250 timeout 0 comment "text message 250" +2.0.1.251 timeout 0 comment "text message 251" +2.0.1.252 timeout 0 comment "text message 252" +2.0.1.253 timeout 0 comment "text message 253" +2.0.1.254 timeout 0 comment "text message 254" +2.0.1.255 timeout 0 comment "text message 255" diff --git a/tests/comment.t.list2 b/tests/comment.t.list2 index bf7837f7..8fc69f2a 100644 --- a/tests/comment.t.list2 +++ b/tests/comment.t.list2 @@ -1,6 +1,7 @@ Name: test Type: hash:net,net -Header: family inet hashsize 128 maxelem 65536 comment bucketsize 12 +Revision: 3 +Header: family inet hashsize 128 maxelem 65536 comment bucketsize 12 initval 0xa48336cf Size in memory: 1190 References: 0 Number of entries: 4 diff --git a/tests/comment.t.list21 b/tests/comment.t.list21 index 7a546f3e..416db404 100644 --- a/tests/comment.t.list21 +++ b/tests/comment.t.list21 @@ -1,519 +1,520 @@ Name: test Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 timeout x comment bucketsize 12 -Size in memory: 51092 +Revision: 5 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 comment bucketsize 12 initval 0x8a1632dd +Size in memory: 50132 References: 0 Number of entries: 512 Members: -2.0.0.0 timeout x comment "text message 0" -2.0.0.1 timeout x comment "text message 1" -2.0.0.10 timeout x comment "text message 10" -2.0.0.100 timeout x comment "text message 100" -2.0.0.101 timeout x comment "text message 101" -2.0.0.102 timeout x comment "text message 102" -2.0.0.103 timeout x comment "text message 103" -2.0.0.104 timeout x comment "text message 104" -2.0.0.105 timeout x comment "text message 105" -2.0.0.106 timeout x comment "text message 106" -2.0.0.107 timeout x comment "text message 107" -2.0.0.108 timeout x comment "text message 108" -2.0.0.109 timeout x comment "text message 109" -2.0.0.11 timeout x comment "text message 11" -2.0.0.110 timeout x comment "text message 110" -2.0.0.111 timeout x comment "text message 111" -2.0.0.112 timeout x comment "text message 112" -2.0.0.113 timeout x comment "text message 113" -2.0.0.114 timeout x comment "text message 114" -2.0.0.115 timeout x comment "text message 115" -2.0.0.116 timeout x comment "text message 116" -2.0.0.117 timeout x comment "text message 117" -2.0.0.118 timeout x comment "text message 118" -2.0.0.119 timeout x comment "text message 119" -2.0.0.12 timeout x comment "text message 12" -2.0.0.120 timeout x comment "text message 120" -2.0.0.121 timeout x comment "text message 121" -2.0.0.122 timeout x comment "text message 122" -2.0.0.123 timeout x comment "text message 123" -2.0.0.124 timeout x comment "text message 124" -2.0.0.125 timeout x comment "text message 125" -2.0.0.126 timeout x comment "text message 126" -2.0.0.127 timeout x comment "text message 127" -2.0.0.128 timeout x comment "text message 128" -2.0.0.129 timeout x comment "text message 129" -2.0.0.13 timeout x comment "text message 13" -2.0.0.130 timeout x comment "text message 130" -2.0.0.131 timeout x comment "text message 131" -2.0.0.132 timeout x comment "text message 132" -2.0.0.133 timeout x comment "text message 133" -2.0.0.134 timeout x comment "text message 134" -2.0.0.135 timeout x comment "text message 135" -2.0.0.136 timeout x comment "text message 136" -2.0.0.137 timeout x comment "text message 137" -2.0.0.138 timeout x comment "text message 138" -2.0.0.139 timeout x comment "text message 139" -2.0.0.14 timeout x comment "text message 14" -2.0.0.140 timeout x comment "text message 140" -2.0.0.141 timeout x comment "text message 141" -2.0.0.142 timeout x comment "text message 142" -2.0.0.143 timeout x comment "text message 143" -2.0.0.144 timeout x comment "text message 144" -2.0.0.145 timeout x comment "text message 145" -2.0.0.146 timeout x comment "text message 146" -2.0.0.147 timeout x comment "text message 147" -2.0.0.148 timeout x comment "text message 148" -2.0.0.149 timeout x comment "text message 149" -2.0.0.15 timeout x comment "text message 15" -2.0.0.150 timeout x comment "text message 150" -2.0.0.151 timeout x comment "text message 151" -2.0.0.152 timeout x comment "text message 152" -2.0.0.153 timeout x comment "text message 153" -2.0.0.154 timeout x comment "text message 154" -2.0.0.155 timeout x comment "text message 155" -2.0.0.156 timeout x comment "text message 156" -2.0.0.157 timeout x comment "text message 157" -2.0.0.158 timeout x comment "text message 158" -2.0.0.159 timeout x comment "text message 159" -2.0.0.16 timeout x comment "text message 16" -2.0.0.160 timeout x comment "text message 160" -2.0.0.161 timeout x comment "text message 161" -2.0.0.162 timeout x comment "text message 162" -2.0.0.163 timeout x comment "text message 163" -2.0.0.164 timeout x comment "text message 164" -2.0.0.165 timeout x comment "text message 165" -2.0.0.166 timeout x comment "text message 166" -2.0.0.167 timeout x comment "text message 167" -2.0.0.168 timeout x comment "text message 168" -2.0.0.169 timeout x comment "text message 169" -2.0.0.17 timeout x comment "text message 17" -2.0.0.170 timeout x comment "text message 170" -2.0.0.171 timeout x comment "text message 171" -2.0.0.172 timeout x comment "text message 172" -2.0.0.173 timeout x comment "text message 173" -2.0.0.174 timeout x comment "text message 174" -2.0.0.175 timeout x comment "text message 175" -2.0.0.176 timeout x comment "text message 176" -2.0.0.177 timeout x comment "text message 177" -2.0.0.178 timeout x comment "text message 178" -2.0.0.179 timeout x comment "text message 179" -2.0.0.18 timeout x comment "text message 18" -2.0.0.180 timeout x comment "text message 180" -2.0.0.181 timeout x comment "text message 181" -2.0.0.182 timeout x comment "text message 182" -2.0.0.183 timeout x comment "text message 183" -2.0.0.184 timeout x comment "text message 184" -2.0.0.185 timeout x comment "text message 185" -2.0.0.186 timeout x comment "text message 186" -2.0.0.187 timeout x comment "text message 187" -2.0.0.188 timeout x comment "text message 188" -2.0.0.189 timeout x comment "text message 189" -2.0.0.19 timeout x comment "text message 19" -2.0.0.190 timeout x comment "text message 190" -2.0.0.191 timeout x comment "text message 191" -2.0.0.192 timeout x comment "text message 192" -2.0.0.193 timeout x comment "text message 193" -2.0.0.194 timeout x comment "text message 194" -2.0.0.195 timeout x comment "text message 195" -2.0.0.196 timeout x comment "text message 196" -2.0.0.197 timeout x comment "text message 197" -2.0.0.198 timeout x comment "text message 198" -2.0.0.199 timeout x comment "text message 199" -2.0.0.2 timeout x comment "text message 2" -2.0.0.20 timeout x comment "text message 20" -2.0.0.200 timeout x comment "text message 200" -2.0.0.201 timeout x comment "text message 201" -2.0.0.202 timeout x comment "text message 202" -2.0.0.203 timeout x comment "text message 203" -2.0.0.204 timeout x comment "text message 204" -2.0.0.205 timeout x comment "text message 205" -2.0.0.206 timeout x comment "text message 206" -2.0.0.207 timeout x comment "text message 207" -2.0.0.208 timeout x comment "text message 208" -2.0.0.209 timeout x comment "text message 209" -2.0.0.21 timeout x comment "text message 21" -2.0.0.210 timeout x comment "text message 210" -2.0.0.211 timeout x comment "text message 211" -2.0.0.212 timeout x comment "text message 212" -2.0.0.213 timeout x comment "text message 213" -2.0.0.214 timeout x comment "text message 214" -2.0.0.215 timeout x comment "text message 215" -2.0.0.216 timeout x comment "text message 216" -2.0.0.217 timeout x comment "text message 217" -2.0.0.218 timeout x comment "text message 218" -2.0.0.219 timeout x comment "text message 219" -2.0.0.22 timeout x comment "text message 22" -2.0.0.220 timeout x comment "text message 220" -2.0.0.221 timeout x comment "text message 221" -2.0.0.222 timeout x comment "text message 222" -2.0.0.223 timeout x comment "text message 223" -2.0.0.224 timeout x comment "text message 224" -2.0.0.225 timeout x comment "text message 225" -2.0.0.226 timeout x comment "text message 226" -2.0.0.227 timeout x comment "text message 227" -2.0.0.228 timeout x comment "text message 228" -2.0.0.229 timeout x comment "text message 229" -2.0.0.23 timeout x comment "text message 23" -2.0.0.230 timeout x comment "text message 230" -2.0.0.231 timeout x comment "text message 231" -2.0.0.232 timeout x comment "text message 232" -2.0.0.233 timeout x comment "text message 233" -2.0.0.234 timeout x comment "text message 234" -2.0.0.235 timeout x comment "text message 235" -2.0.0.236 timeout x comment "text message 236" -2.0.0.237 timeout x comment "text message 237" -2.0.0.238 timeout x comment "text message 238" -2.0.0.239 timeout x comment "text message 239" -2.0.0.24 timeout x comment "text message 24" -2.0.0.240 timeout x comment "text message 240" -2.0.0.241 timeout x comment "text message 241" -2.0.0.242 timeout x comment "text message 242" -2.0.0.243 timeout x comment "text message 243" -2.0.0.244 timeout x comment "text message 244" -2.0.0.245 timeout x comment "text message 245" -2.0.0.246 timeout x comment "text message 246" -2.0.0.247 timeout x comment "text message 247" -2.0.0.248 timeout x comment "text message 248" -2.0.0.249 timeout x comment "text message 249" -2.0.0.25 timeout x comment "text message 25" -2.0.0.250 timeout x comment "text message 250" -2.0.0.251 timeout x comment "text message 251" -2.0.0.252 timeout x comment "text message 252" -2.0.0.253 timeout x comment "text message 253" -2.0.0.254 timeout x comment "text message 254" -2.0.0.255 timeout x comment "text message 255" -2.0.0.26 timeout x comment "text message 26" -2.0.0.27 timeout x comment "text message 27" -2.0.0.28 timeout x comment "text message 28" -2.0.0.29 timeout x comment "text message 29" -2.0.0.3 timeout x comment "text message 3" -2.0.0.30 timeout x comment "text message 30" -2.0.0.31 timeout x comment "text message 31" -2.0.0.32 timeout x comment "text message 32" -2.0.0.33 timeout x comment "text message 33" -2.0.0.34 timeout x comment "text message 34" -2.0.0.35 timeout x comment "text message 35" -2.0.0.36 timeout x comment "text message 36" -2.0.0.37 timeout x comment "text message 37" -2.0.0.38 timeout x comment "text message 38" -2.0.0.39 timeout x comment "text message 39" -2.0.0.4 timeout x comment "text message 4" -2.0.0.40 timeout x comment "text message 40" -2.0.0.41 timeout x comment "text message 41" -2.0.0.42 timeout x comment "text message 42" -2.0.0.43 timeout x comment "text message 43" -2.0.0.44 timeout x comment "text message 44" -2.0.0.45 timeout x comment "text message 45" -2.0.0.46 timeout x comment "text message 46" -2.0.0.47 timeout x comment "text message 47" -2.0.0.48 timeout x comment "text message 48" -2.0.0.49 timeout x comment "text message 49" -2.0.0.5 timeout x comment "text message 5" -2.0.0.50 timeout x comment "text message 50" -2.0.0.51 timeout x comment "text message 51" -2.0.0.52 timeout x comment "text message 52" -2.0.0.53 timeout x comment "text message 53" -2.0.0.54 timeout x comment "text message 54" -2.0.0.55 timeout x comment "text message 55" -2.0.0.56 timeout x comment "text message 56" -2.0.0.57 timeout x comment "text message 57" -2.0.0.58 timeout x comment "text message 58" -2.0.0.59 timeout x comment "text message 59" -2.0.0.6 timeout x comment "text message 6" -2.0.0.60 timeout x comment "text message 60" -2.0.0.61 timeout x comment "text message 61" -2.0.0.62 timeout x comment "text message 62" -2.0.0.63 timeout x comment "text message 63" -2.0.0.64 timeout x comment "text message 64" -2.0.0.65 timeout x comment "text message 65" -2.0.0.66 timeout x comment "text message 66" -2.0.0.67 timeout x comment "text message 67" -2.0.0.68 timeout x comment "text message 68" -2.0.0.69 timeout x comment "text message 69" -2.0.0.7 timeout x comment "text message 7" -2.0.0.70 timeout x comment "text message 70" -2.0.0.71 timeout x comment "text message 71" -2.0.0.72 timeout x comment "text message 72" -2.0.0.73 timeout x comment "text message 73" -2.0.0.74 timeout x comment "text message 74" -2.0.0.75 timeout x comment "text message 75" -2.0.0.76 timeout x comment "text message 76" -2.0.0.77 timeout x comment "text message 77" -2.0.0.78 timeout x comment "text message 78" -2.0.0.79 timeout x comment "text message 79" -2.0.0.8 timeout x comment "text message 8" -2.0.0.80 timeout x comment "text message 80" -2.0.0.81 timeout x comment "text message 81" -2.0.0.82 timeout x comment "text message 82" -2.0.0.83 timeout x comment "text message 83" -2.0.0.84 timeout x comment "text message 84" -2.0.0.85 timeout x comment "text message 85" -2.0.0.86 timeout x comment "text message 86" -2.0.0.87 timeout x comment "text message 87" -2.0.0.88 timeout x comment "text message 88" -2.0.0.89 timeout x comment "text message 89" -2.0.0.9 timeout x comment "text message 9" -2.0.0.90 timeout x comment "text message 90" -2.0.0.91 timeout x comment "text message 91" -2.0.0.92 timeout x comment "text message 92" -2.0.0.93 timeout x comment "text message 93" -2.0.0.94 timeout x comment "text message 94" -2.0.0.95 timeout x comment "text message 95" -2.0.0.96 timeout x comment "text message 96" -2.0.0.97 timeout x comment "text message 97" -2.0.0.98 timeout x comment "text message 98" -2.0.0.99 timeout x comment "text message 99" -2.0.1.0 timeout x comment "text message 0" -2.0.1.1 timeout x comment "text message 1" -2.0.1.10 timeout x comment "text message 10" -2.0.1.100 timeout x comment "text message 100" -2.0.1.101 timeout x comment "text message 101" -2.0.1.102 timeout x comment "text message 102" -2.0.1.103 timeout x comment "text message 103" -2.0.1.104 timeout x comment "text message 104" -2.0.1.105 timeout x comment "text message 105" -2.0.1.106 timeout x comment "text message 106" -2.0.1.107 timeout x comment "text message 107" -2.0.1.108 timeout x comment "text message 108" -2.0.1.109 timeout x comment "text message 109" -2.0.1.11 timeout x comment "text message 11" -2.0.1.110 timeout x comment "text message 110" -2.0.1.111 timeout x comment "text message 111" -2.0.1.112 timeout x comment "text message 112" -2.0.1.113 timeout x comment "text message 113" -2.0.1.114 timeout x comment "text message 114" -2.0.1.115 timeout x comment "text message 115" -2.0.1.116 timeout x comment "text message 116" -2.0.1.117 timeout x comment "text message 117" -2.0.1.118 timeout x comment "text message 118" -2.0.1.119 timeout x comment "text message 119" -2.0.1.12 timeout x comment "text message 12" -2.0.1.120 timeout x comment "text message 120" -2.0.1.121 timeout x comment "text message 121" -2.0.1.122 timeout x comment "text message 122" -2.0.1.123 timeout x comment "text message 123" -2.0.1.124 timeout x comment "text message 124" -2.0.1.125 timeout x comment "text message 125" -2.0.1.126 timeout x comment "text message 126" -2.0.1.127 timeout x comment "text message 127" -2.0.1.128 timeout x comment "text message 128" -2.0.1.129 timeout x comment "text message 129" -2.0.1.13 timeout x comment "text message 13" -2.0.1.130 timeout x comment "text message 130" -2.0.1.131 timeout x comment "text message 131" -2.0.1.132 timeout x comment "text message 132" -2.0.1.133 timeout x comment "text message 133" -2.0.1.134 timeout x comment "text message 134" -2.0.1.135 timeout x comment "text message 135" -2.0.1.136 timeout x comment "text message 136" -2.0.1.137 timeout x comment "text message 137" -2.0.1.138 timeout x comment "text message 138" -2.0.1.139 timeout x comment "text message 139" -2.0.1.14 timeout x comment "text message 14" -2.0.1.140 timeout x comment "text message 140" -2.0.1.141 timeout x comment "text message 141" -2.0.1.142 timeout x comment "text message 142" -2.0.1.143 timeout x comment "text message 143" -2.0.1.144 timeout x comment "text message 144" -2.0.1.145 timeout x comment "text message 145" -2.0.1.146 timeout x comment "text message 146" -2.0.1.147 timeout x comment "text message 147" -2.0.1.148 timeout x comment "text message 148" -2.0.1.149 timeout x comment "text message 149" -2.0.1.15 timeout x comment "text message 15" -2.0.1.150 timeout x comment "text message 150" -2.0.1.151 timeout x comment "text message 151" -2.0.1.152 timeout x comment "text message 152" -2.0.1.153 timeout x comment "text message 153" -2.0.1.154 timeout x comment "text message 154" -2.0.1.155 timeout x comment "text message 155" -2.0.1.156 timeout x comment "text message 156" -2.0.1.157 timeout x comment "text message 157" -2.0.1.158 timeout x comment "text message 158" -2.0.1.159 timeout x comment "text message 159" -2.0.1.16 timeout x comment "text message 16" -2.0.1.160 timeout x comment "text message 160" -2.0.1.161 timeout x comment "text message 161" -2.0.1.162 timeout x comment "text message 162" -2.0.1.163 timeout x comment "text message 163" -2.0.1.164 timeout x comment "text message 164" -2.0.1.165 timeout x comment "text message 165" -2.0.1.166 timeout x comment "text message 166" -2.0.1.167 timeout x comment "text message 167" -2.0.1.168 timeout x comment "text message 168" -2.0.1.169 timeout x comment "text message 169" -2.0.1.17 timeout x comment "text message 17" -2.0.1.170 timeout x comment "text message 170" -2.0.1.171 timeout x comment "text message 171" -2.0.1.172 timeout x comment "text message 172" -2.0.1.173 timeout x comment "text message 173" -2.0.1.174 timeout x comment "text message 174" -2.0.1.175 timeout x comment "text message 175" -2.0.1.176 timeout x comment "text message 176" -2.0.1.177 timeout x comment "text message 177" -2.0.1.178 timeout x comment "text message 178" -2.0.1.179 timeout x comment "text message 179" -2.0.1.18 timeout x comment "text message 18" -2.0.1.180 timeout x comment "text message 180" -2.0.1.181 timeout x comment "text message 181" -2.0.1.182 timeout x comment "text message 182" -2.0.1.183 timeout x comment "text message 183" -2.0.1.184 timeout x comment "text message 184" -2.0.1.185 timeout x comment "text message 185" -2.0.1.186 timeout x comment "text message 186" -2.0.1.187 timeout x comment "text message 187" -2.0.1.188 timeout x comment "text message 188" -2.0.1.189 timeout x comment "text message 189" -2.0.1.19 timeout x comment "text message 19" -2.0.1.190 timeout x comment "text message 190" -2.0.1.191 timeout x comment "text message 191" -2.0.1.192 timeout x comment "text message 192" -2.0.1.193 timeout x comment "text message 193" -2.0.1.194 timeout x comment "text message 194" -2.0.1.195 timeout x comment "text message 195" -2.0.1.196 timeout x comment "text message 196" -2.0.1.197 timeout x comment "text message 197" -2.0.1.198 timeout x comment "text message 198" -2.0.1.199 timeout x comment "text message 199" -2.0.1.2 timeout x comment "text message 2" -2.0.1.20 timeout x comment "text message 20" -2.0.1.200 timeout x comment "text message 200" -2.0.1.201 timeout x comment "text message 201" -2.0.1.202 timeout x comment "text message 202" -2.0.1.203 timeout x comment "text message 203" -2.0.1.204 timeout x comment "text message 204" -2.0.1.205 timeout x comment "text message 205" -2.0.1.206 timeout x comment "text message 206" -2.0.1.207 timeout x comment "text message 207" -2.0.1.208 timeout x comment "text message 208" -2.0.1.209 timeout x comment "text message 209" -2.0.1.21 timeout x comment "text message 21" -2.0.1.210 timeout x comment "text message 210" -2.0.1.211 timeout x comment "text message 211" -2.0.1.212 timeout x comment "text message 212" -2.0.1.213 timeout x comment "text message 213" -2.0.1.214 timeout x comment "text message 214" -2.0.1.215 timeout x comment "text message 215" -2.0.1.216 timeout x comment "text message 216" -2.0.1.217 timeout x comment "text message 217" -2.0.1.218 timeout x comment "text message 218" -2.0.1.219 timeout x comment "text message 219" -2.0.1.22 timeout x comment "text message 22" -2.0.1.220 timeout x comment "text message 220" -2.0.1.221 timeout x comment "text message 221" -2.0.1.222 timeout x comment "text message 222" -2.0.1.223 timeout x comment "text message 223" -2.0.1.224 timeout x comment "text message 224" -2.0.1.225 timeout x comment "text message 225" -2.0.1.226 timeout x comment "text message 226" -2.0.1.227 timeout x comment "text message 227" -2.0.1.228 timeout x comment "text message 228" -2.0.1.229 timeout x comment "text message 229" -2.0.1.23 timeout x comment "text message 23" -2.0.1.230 timeout x comment "text message 230" -2.0.1.231 timeout x comment "text message 231" -2.0.1.232 timeout x comment "text message 232" -2.0.1.233 timeout x comment "text message 233" -2.0.1.234 timeout x comment "text message 234" -2.0.1.235 timeout x comment "text message 235" -2.0.1.236 timeout x comment "text message 236" -2.0.1.237 timeout x comment "text message 237" -2.0.1.238 timeout x comment "text message 238" -2.0.1.239 timeout x comment "text message 239" -2.0.1.24 timeout x comment "text message 24" -2.0.1.240 timeout x comment "text message 240" -2.0.1.241 timeout x comment "text message 241" -2.0.1.242 timeout x comment "text message 242" -2.0.1.243 timeout x comment "text message 243" -2.0.1.244 timeout x comment "text message 244" -2.0.1.245 timeout x comment "text message 245" -2.0.1.246 timeout x comment "text message 246" -2.0.1.247 timeout x comment "text message 247" -2.0.1.248 timeout x comment "text message 248" -2.0.1.249 timeout x comment "text message 249" -2.0.1.25 timeout x comment "text message 25" -2.0.1.250 timeout x comment "text message 250" -2.0.1.251 timeout x comment "text message 251" -2.0.1.252 timeout x comment "text message 252" -2.0.1.253 timeout x comment "text message 253" -2.0.1.254 timeout x comment "text message 254" -2.0.1.255 timeout x comment "text message 255" -2.0.1.26 timeout x comment "text message 26" -2.0.1.27 timeout x comment "text message 27" -2.0.1.28 timeout x comment "text message 28" -2.0.1.29 timeout x comment "text message 29" -2.0.1.3 timeout x comment "text message 3" -2.0.1.30 timeout x comment "text message 30" -2.0.1.31 timeout x comment "text message 31" -2.0.1.32 timeout x comment "text message 32" -2.0.1.33 timeout x comment "text message 33" -2.0.1.34 timeout x comment "text message 34" -2.0.1.35 timeout x comment "text message 35" -2.0.1.36 timeout x comment "text message 36" -2.0.1.37 timeout x comment "text message 37" -2.0.1.38 timeout x comment "text message 38" -2.0.1.39 timeout x comment "text message 39" -2.0.1.4 timeout x comment "text message 4" -2.0.1.40 timeout x comment "text message 40" -2.0.1.41 timeout x comment "text message 41" -2.0.1.42 timeout x comment "text message 42" -2.0.1.43 timeout x comment "text message 43" -2.0.1.44 timeout x comment "text message 44" -2.0.1.45 timeout x comment "text message 45" -2.0.1.46 timeout x comment "text message 46" -2.0.1.47 timeout x comment "text message 47" -2.0.1.48 timeout x comment "text message 48" -2.0.1.49 timeout x comment "text message 49" -2.0.1.5 timeout x comment "text message 5" -2.0.1.50 timeout x comment "text message 50" -2.0.1.51 timeout x comment "text message 51" -2.0.1.52 timeout x comment "text message 52" -2.0.1.53 timeout x comment "text message 53" -2.0.1.54 timeout x comment "text message 54" -2.0.1.55 timeout x comment "text message 55" -2.0.1.56 timeout x comment "text message 56" -2.0.1.57 timeout x comment "text message 57" -2.0.1.58 timeout x comment "text message 58" -2.0.1.59 timeout x comment "text message 59" -2.0.1.6 timeout x comment "text message 6" -2.0.1.60 timeout x comment "text message 60" -2.0.1.61 timeout x comment "text message 61" -2.0.1.62 timeout x comment "text message 62" -2.0.1.63 timeout x comment "text message 63" -2.0.1.64 timeout x comment "text message 64" -2.0.1.65 timeout x comment "text message 65" -2.0.1.66 timeout x comment "text message 66" -2.0.1.67 timeout x comment "text message 67" -2.0.1.68 timeout x comment "text message 68" -2.0.1.69 timeout x comment "text message 69" -2.0.1.7 timeout x comment "text message 7" -2.0.1.70 timeout x comment "text message 70" -2.0.1.71 timeout x comment "text message 71" -2.0.1.72 timeout x comment "text message 72" -2.0.1.73 timeout x comment "text message 73" -2.0.1.74 timeout x comment "text message 74" -2.0.1.75 timeout x comment "text message 75" -2.0.1.76 timeout x comment "text message 76" -2.0.1.77 timeout x comment "text message 77" -2.0.1.78 timeout x comment "text message 78" -2.0.1.79 timeout x comment "text message 79" -2.0.1.8 timeout x comment "text message 8" -2.0.1.80 timeout x comment "text message 80" -2.0.1.81 timeout x comment "text message 81" -2.0.1.82 timeout x comment "text message 82" -2.0.1.83 timeout x comment "text message 83" -2.0.1.84 timeout x comment "text message 84" -2.0.1.85 timeout x comment "text message 85" -2.0.1.86 timeout x comment "text message 86" -2.0.1.87 timeout x comment "text message 87" -2.0.1.88 timeout x comment "text message 88" -2.0.1.89 timeout x comment "text message 89" -2.0.1.9 timeout x comment "text message 9" -2.0.1.90 timeout x comment "text message 90" -2.0.1.91 timeout x comment "text message 91" -2.0.1.92 timeout x comment "text message 92" -2.0.1.93 timeout x comment "text message 93" -2.0.1.94 timeout x comment "text message 94" -2.0.1.95 timeout x comment "text message 95" -2.0.1.96 timeout x comment "text message 96" -2.0.1.97 timeout x comment "text message 97" -2.0.1.98 timeout x comment "text message 98" -2.0.1.99 timeout x comment "text message 99" +2.0.0.0 timeout 3 comment "text message 0" +2.0.0.1 timeout 3 comment "text message 1" +2.0.0.10 timeout 3 comment "text message 10" +2.0.0.100 timeout 3 comment "text message 100" +2.0.0.101 timeout 3 comment "text message 101" +2.0.0.102 timeout 3 comment "text message 102" +2.0.0.103 timeout 3 comment "text message 103" +2.0.0.104 timeout 3 comment "text message 104" +2.0.0.105 timeout 3 comment "text message 105" +2.0.0.106 timeout 3 comment "text message 106" +2.0.0.107 timeout 3 comment "text message 107" +2.0.0.108 timeout 3 comment "text message 108" +2.0.0.109 timeout 3 comment "text message 109" +2.0.0.11 timeout 3 comment "text message 11" +2.0.0.110 timeout 3 comment "text message 110" +2.0.0.111 timeout 3 comment "text message 111" +2.0.0.112 timeout 3 comment "text message 112" +2.0.0.113 timeout 3 comment "text message 113" +2.0.0.114 timeout 3 comment "text message 114" +2.0.0.115 timeout 3 comment "text message 115" +2.0.0.116 timeout 3 comment "text message 116" +2.0.0.117 timeout 3 comment "text message 117" +2.0.0.118 timeout 3 comment "text message 118" +2.0.0.119 timeout 3 comment "text message 119" +2.0.0.12 timeout 3 comment "text message 12" +2.0.0.120 timeout 3 comment "text message 120" +2.0.0.121 timeout 3 comment "text message 121" +2.0.0.122 timeout 3 comment "text message 122" +2.0.0.123 timeout 3 comment "text message 123" +2.0.0.124 timeout 3 comment "text message 124" +2.0.0.125 timeout 3 comment "text message 125" +2.0.0.126 timeout 3 comment "text message 126" +2.0.0.127 timeout 3 comment "text message 127" +2.0.0.128 timeout 3 comment "text message 128" +2.0.0.129 timeout 3 comment "text message 129" +2.0.0.13 timeout 3 comment "text message 13" +2.0.0.130 timeout 3 comment "text message 130" +2.0.0.131 timeout 3 comment "text message 131" +2.0.0.132 timeout 3 comment "text message 132" +2.0.0.133 timeout 3 comment "text message 133" +2.0.0.134 timeout 3 comment "text message 134" +2.0.0.135 timeout 3 comment "text message 135" +2.0.0.136 timeout 3 comment "text message 136" +2.0.0.137 timeout 3 comment "text message 137" +2.0.0.138 timeout 3 comment "text message 138" +2.0.0.139 timeout 3 comment "text message 139" +2.0.0.14 timeout 3 comment "text message 14" +2.0.0.140 timeout 3 comment "text message 140" +2.0.0.141 timeout 3 comment "text message 141" +2.0.0.142 timeout 3 comment "text message 142" +2.0.0.143 timeout 3 comment "text message 143" +2.0.0.144 timeout 3 comment "text message 144" +2.0.0.145 timeout 3 comment "text message 145" +2.0.0.146 timeout 3 comment "text message 146" +2.0.0.147 timeout 3 comment "text message 147" +2.0.0.148 timeout 3 comment "text message 148" +2.0.0.149 timeout 3 comment "text message 149" +2.0.0.15 timeout 3 comment "text message 15" +2.0.0.150 timeout 3 comment "text message 150" +2.0.0.151 timeout 3 comment "text message 151" +2.0.0.152 timeout 3 comment "text message 152" +2.0.0.153 timeout 3 comment "text message 153" +2.0.0.154 timeout 3 comment "text message 154" +2.0.0.155 timeout 3 comment "text message 155" +2.0.0.156 timeout 3 comment "text message 156" +2.0.0.157 timeout 3 comment "text message 157" +2.0.0.158 timeout 3 comment "text message 158" +2.0.0.159 timeout 3 comment "text message 159" +2.0.0.16 timeout 3 comment "text message 16" +2.0.0.160 timeout 3 comment "text message 160" +2.0.0.161 timeout 3 comment "text message 161" +2.0.0.162 timeout 3 comment "text message 162" +2.0.0.163 timeout 3 comment "text message 163" +2.0.0.164 timeout 3 comment "text message 164" +2.0.0.165 timeout 3 comment "text message 165" +2.0.0.166 timeout 3 comment "text message 166" +2.0.0.167 timeout 3 comment "text message 167" +2.0.0.168 timeout 3 comment "text message 168" +2.0.0.169 timeout 3 comment "text message 169" +2.0.0.17 timeout 3 comment "text message 17" +2.0.0.170 timeout 3 comment "text message 170" +2.0.0.171 timeout 3 comment "text message 171" +2.0.0.172 timeout 3 comment "text message 172" +2.0.0.173 timeout 3 comment "text message 173" +2.0.0.174 timeout 3 comment "text message 174" +2.0.0.175 timeout 3 comment "text message 175" +2.0.0.176 timeout 3 comment "text message 176" +2.0.0.177 timeout 3 comment "text message 177" +2.0.0.178 timeout 3 comment "text message 178" +2.0.0.179 timeout 3 comment "text message 179" +2.0.0.18 timeout 3 comment "text message 18" +2.0.0.180 timeout 3 comment "text message 180" +2.0.0.181 timeout 3 comment "text message 181" +2.0.0.182 timeout 3 comment "text message 182" +2.0.0.183 timeout 3 comment "text message 183" +2.0.0.184 timeout 3 comment "text message 184" +2.0.0.185 timeout 3 comment "text message 185" +2.0.0.186 timeout 3 comment "text message 186" +2.0.0.187 timeout 3 comment "text message 187" +2.0.0.188 timeout 3 comment "text message 188" +2.0.0.189 timeout 3 comment "text message 189" +2.0.0.19 timeout 3 comment "text message 19" +2.0.0.190 timeout 3 comment "text message 190" +2.0.0.191 timeout 3 comment "text message 191" +2.0.0.192 timeout 3 comment "text message 192" +2.0.0.193 timeout 3 comment "text message 193" +2.0.0.194 timeout 3 comment "text message 194" +2.0.0.195 timeout 3 comment "text message 195" +2.0.0.196 timeout 3 comment "text message 196" +2.0.0.197 timeout 3 comment "text message 197" +2.0.0.198 timeout 3 comment "text message 198" +2.0.0.199 timeout 3 comment "text message 199" +2.0.0.2 timeout 3 comment "text message 2" +2.0.0.20 timeout 3 comment "text message 20" +2.0.0.200 timeout 3 comment "text message 200" +2.0.0.201 timeout 3 comment "text message 201" +2.0.0.202 timeout 3 comment "text message 202" +2.0.0.203 timeout 3 comment "text message 203" +2.0.0.204 timeout 3 comment "text message 204" +2.0.0.205 timeout 3 comment "text message 205" +2.0.0.206 timeout 3 comment "text message 206" +2.0.0.207 timeout 3 comment "text message 207" +2.0.0.208 timeout 3 comment "text message 208" +2.0.0.209 timeout 3 comment "text message 209" +2.0.0.21 timeout 3 comment "text message 21" +2.0.0.210 timeout 3 comment "text message 210" +2.0.0.211 timeout 3 comment "text message 211" +2.0.0.212 timeout 3 comment "text message 212" +2.0.0.213 timeout 3 comment "text message 213" +2.0.0.214 timeout 3 comment "text message 214" +2.0.0.215 timeout 3 comment "text message 215" +2.0.0.216 timeout 3 comment "text message 216" +2.0.0.217 timeout 3 comment "text message 217" +2.0.0.218 timeout 3 comment "text message 218" +2.0.0.219 timeout 3 comment "text message 219" +2.0.0.22 timeout 3 comment "text message 22" +2.0.0.220 timeout 3 comment "text message 220" +2.0.0.221 timeout 3 comment "text message 221" +2.0.0.222 timeout 3 comment "text message 222" +2.0.0.223 timeout 3 comment "text message 223" +2.0.0.224 timeout 3 comment "text message 224" +2.0.0.225 timeout 3 comment "text message 225" +2.0.0.226 timeout 3 comment "text message 226" +2.0.0.227 timeout 3 comment "text message 227" +2.0.0.228 timeout 3 comment "text message 228" +2.0.0.229 timeout 3 comment "text message 229" +2.0.0.23 timeout 3 comment "text message 23" +2.0.0.230 timeout 3 comment "text message 230" +2.0.0.231 timeout 3 comment "text message 231" +2.0.0.232 timeout 3 comment "text message 232" +2.0.0.233 timeout 3 comment "text message 233" +2.0.0.234 timeout 3 comment "text message 234" +2.0.0.235 timeout 3 comment "text message 235" +2.0.0.236 timeout 3 comment "text message 236" +2.0.0.237 timeout 3 comment "text message 237" +2.0.0.238 timeout 3 comment "text message 238" +2.0.0.239 timeout 3 comment "text message 239" +2.0.0.24 timeout 3 comment "text message 24" +2.0.0.240 timeout 3 comment "text message 240" +2.0.0.241 timeout 3 comment "text message 241" +2.0.0.242 timeout 3 comment "text message 242" +2.0.0.243 timeout 3 comment "text message 243" +2.0.0.244 timeout 3 comment "text message 244" +2.0.0.245 timeout 3 comment "text message 245" +2.0.0.246 timeout 3 comment "text message 246" +2.0.0.247 timeout 3 comment "text message 247" +2.0.0.248 timeout 3 comment "text message 248" +2.0.0.249 timeout 3 comment "text message 249" +2.0.0.25 timeout 3 comment "text message 25" +2.0.0.250 timeout 3 comment "text message 250" +2.0.0.251 timeout 3 comment "text message 251" +2.0.0.252 timeout 3 comment "text message 252" +2.0.0.253 timeout 3 comment "text message 253" +2.0.0.254 timeout 3 comment "text message 254" +2.0.0.255 timeout 3 comment "text message 255" +2.0.0.26 timeout 3 comment "text message 26" +2.0.0.27 timeout 3 comment "text message 27" +2.0.0.28 timeout 3 comment "text message 28" +2.0.0.29 timeout 3 comment "text message 29" +2.0.0.3 timeout 3 comment "text message 3" +2.0.0.30 timeout 3 comment "text message 30" +2.0.0.31 timeout 3 comment "text message 31" +2.0.0.32 timeout 3 comment "text message 32" +2.0.0.33 timeout 3 comment "text message 33" +2.0.0.34 timeout 3 comment "text message 34" +2.0.0.35 timeout 3 comment "text message 35" +2.0.0.36 timeout 3 comment "text message 36" +2.0.0.37 timeout 3 comment "text message 37" +2.0.0.38 timeout 3 comment "text message 38" +2.0.0.39 timeout 3 comment "text message 39" +2.0.0.4 timeout 3 comment "text message 4" +2.0.0.40 timeout 3 comment "text message 40" +2.0.0.41 timeout 3 comment "text message 41" +2.0.0.42 timeout 3 comment "text message 42" +2.0.0.43 timeout 3 comment "text message 43" +2.0.0.44 timeout 3 comment "text message 44" +2.0.0.45 timeout 3 comment "text message 45" +2.0.0.46 timeout 3 comment "text message 46" +2.0.0.47 timeout 3 comment "text message 47" +2.0.0.48 timeout 3 comment "text message 48" +2.0.0.49 timeout 3 comment "text message 49" +2.0.0.5 timeout 3 comment "text message 5" +2.0.0.50 timeout 3 comment "text message 50" +2.0.0.51 timeout 3 comment "text message 51" +2.0.0.52 timeout 3 comment "text message 52" +2.0.0.53 timeout 3 comment "text message 53" +2.0.0.54 timeout 3 comment "text message 54" +2.0.0.55 timeout 3 comment "text message 55" +2.0.0.56 timeout 3 comment "text message 56" +2.0.0.57 timeout 3 comment "text message 57" +2.0.0.58 timeout 3 comment "text message 58" +2.0.0.59 timeout 3 comment "text message 59" +2.0.0.6 timeout 3 comment "text message 6" +2.0.0.60 timeout 3 comment "text message 60" +2.0.0.61 timeout 3 comment "text message 61" +2.0.0.62 timeout 3 comment "text message 62" +2.0.0.63 timeout 3 comment "text message 63" +2.0.0.64 timeout 3 comment "text message 64" +2.0.0.65 timeout 3 comment "text message 65" +2.0.0.66 timeout 3 comment "text message 66" +2.0.0.67 timeout 3 comment "text message 67" +2.0.0.68 timeout 3 comment "text message 68" +2.0.0.69 timeout 3 comment "text message 69" +2.0.0.7 timeout 3 comment "text message 7" +2.0.0.70 timeout 3 comment "text message 70" +2.0.0.71 timeout 3 comment "text message 71" +2.0.0.72 timeout 3 comment "text message 72" +2.0.0.73 timeout 3 comment "text message 73" +2.0.0.74 timeout 3 comment "text message 74" +2.0.0.75 timeout 3 comment "text message 75" +2.0.0.76 timeout 3 comment "text message 76" +2.0.0.77 timeout 3 comment "text message 77" +2.0.0.78 timeout 3 comment "text message 78" +2.0.0.79 timeout 3 comment "text message 79" +2.0.0.8 timeout 3 comment "text message 8" +2.0.0.80 timeout 3 comment "text message 80" +2.0.0.81 timeout 3 comment "text message 81" +2.0.0.82 timeout 3 comment "text message 82" +2.0.0.83 timeout 3 comment "text message 83" +2.0.0.84 timeout 3 comment "text message 84" +2.0.0.85 timeout 3 comment "text message 85" +2.0.0.86 timeout 3 comment "text message 86" +2.0.0.87 timeout 3 comment "text message 87" +2.0.0.88 timeout 3 comment "text message 88" +2.0.0.89 timeout 3 comment "text message 89" +2.0.0.9 timeout 3 comment "text message 9" +2.0.0.90 timeout 3 comment "text message 90" +2.0.0.91 timeout 3 comment "text message 91" +2.0.0.92 timeout 3 comment "text message 92" +2.0.0.93 timeout 3 comment "text message 93" +2.0.0.94 timeout 3 comment "text message 94" +2.0.0.95 timeout 3 comment "text message 95" +2.0.0.96 timeout 3 comment "text message 96" +2.0.0.97 timeout 3 comment "text message 97" +2.0.0.98 timeout 3 comment "text message 98" +2.0.0.99 timeout 3 comment "text message 99" +2.0.1.0 timeout 0 comment "text message 0" +2.0.1.1 timeout 0 comment "text message 1" +2.0.1.10 timeout 0 comment "text message 10" +2.0.1.100 timeout 0 comment "text message 100" +2.0.1.101 timeout 0 comment "text message 101" +2.0.1.102 timeout 0 comment "text message 102" +2.0.1.103 timeout 0 comment "text message 103" +2.0.1.104 timeout 0 comment "text message 104" +2.0.1.105 timeout 0 comment "text message 105" +2.0.1.106 timeout 0 comment "text message 106" +2.0.1.107 timeout 0 comment "text message 107" +2.0.1.108 timeout 0 comment "text message 108" +2.0.1.109 timeout 0 comment "text message 109" +2.0.1.11 timeout 0 comment "text message 11" +2.0.1.110 timeout 0 comment "text message 110" +2.0.1.111 timeout 0 comment "text message 111" +2.0.1.112 timeout 0 comment "text message 112" +2.0.1.113 timeout 0 comment "text message 113" +2.0.1.114 timeout 0 comment "text message 114" +2.0.1.115 timeout 0 comment "text message 115" +2.0.1.116 timeout 0 comment "text message 116" +2.0.1.117 timeout 0 comment "text message 117" +2.0.1.118 timeout 0 comment "text message 118" +2.0.1.119 timeout 0 comment "text message 119" +2.0.1.12 timeout 0 comment "text message 12" +2.0.1.120 timeout 0 comment "text message 120" +2.0.1.121 timeout 0 comment "text message 121" +2.0.1.122 timeout 0 comment "text message 122" +2.0.1.123 timeout 0 comment "text message 123" +2.0.1.124 timeout 0 comment "text message 124" +2.0.1.125 timeout 0 comment "text message 125" +2.0.1.126 timeout 0 comment "text message 126" +2.0.1.127 timeout 0 comment "text message 127" +2.0.1.128 timeout 0 comment "text message 128" +2.0.1.129 timeout 0 comment "text message 129" +2.0.1.13 timeout 0 comment "text message 13" +2.0.1.130 timeout 0 comment "text message 130" +2.0.1.131 timeout 0 comment "text message 131" +2.0.1.132 timeout 0 comment "text message 132" +2.0.1.133 timeout 0 comment "text message 133" +2.0.1.134 timeout 0 comment "text message 134" +2.0.1.135 timeout 0 comment "text message 135" +2.0.1.136 timeout 0 comment "text message 136" +2.0.1.137 timeout 0 comment "text message 137" +2.0.1.138 timeout 0 comment "text message 138" +2.0.1.139 timeout 0 comment "text message 139" +2.0.1.14 timeout 0 comment "text message 14" +2.0.1.140 timeout 0 comment "text message 140" +2.0.1.141 timeout 0 comment "text message 141" +2.0.1.142 timeout 0 comment "text message 142" +2.0.1.143 timeout 0 comment "text message 143" +2.0.1.144 timeout 0 comment "text message 144" +2.0.1.145 timeout 0 comment "text message 145" +2.0.1.146 timeout 0 comment "text message 146" +2.0.1.147 timeout 0 comment "text message 147" +2.0.1.148 timeout 0 comment "text message 148" +2.0.1.149 timeout 0 comment "text message 149" +2.0.1.15 timeout 0 comment "text message 15" +2.0.1.150 timeout 0 comment "text message 150" +2.0.1.151 timeout 0 comment "text message 151" +2.0.1.152 timeout 0 comment "text message 152" +2.0.1.153 timeout 0 comment "text message 153" +2.0.1.154 timeout 0 comment "text message 154" +2.0.1.155 timeout 0 comment "text message 155" +2.0.1.156 timeout 0 comment "text message 156" +2.0.1.157 timeout 0 comment "text message 157" +2.0.1.158 timeout 0 comment "text message 158" +2.0.1.159 timeout 0 comment "text message 159" +2.0.1.16 timeout 0 comment "text message 16" +2.0.1.160 timeout 0 comment "text message 160" +2.0.1.161 timeout 0 comment "text message 161" +2.0.1.162 timeout 0 comment "text message 162" +2.0.1.163 timeout 0 comment "text message 163" +2.0.1.164 timeout 0 comment "text message 164" +2.0.1.165 timeout 0 comment "text message 165" +2.0.1.166 timeout 0 comment "text message 166" +2.0.1.167 timeout 0 comment "text message 167" +2.0.1.168 timeout 0 comment "text message 168" +2.0.1.169 timeout 0 comment "text message 169" +2.0.1.17 timeout 0 comment "text message 17" +2.0.1.170 timeout 0 comment "text message 170" +2.0.1.171 timeout 0 comment "text message 171" +2.0.1.172 timeout 0 comment "text message 172" +2.0.1.173 timeout 0 comment "text message 173" +2.0.1.174 timeout 0 comment "text message 174" +2.0.1.175 timeout 0 comment "text message 175" +2.0.1.176 timeout 0 comment "text message 176" +2.0.1.177 timeout 0 comment "text message 177" +2.0.1.178 timeout 0 comment "text message 178" +2.0.1.179 timeout 0 comment "text message 179" +2.0.1.18 timeout 0 comment "text message 18" +2.0.1.180 timeout 0 comment "text message 180" +2.0.1.181 timeout 0 comment "text message 181" +2.0.1.182 timeout 0 comment "text message 182" +2.0.1.183 timeout 0 comment "text message 183" +2.0.1.184 timeout 0 comment "text message 184" +2.0.1.185 timeout 0 comment "text message 185" +2.0.1.186 timeout 0 comment "text message 186" +2.0.1.187 timeout 0 comment "text message 187" +2.0.1.188 timeout 0 comment "text message 188" +2.0.1.189 timeout 0 comment "text message 189" +2.0.1.19 timeout 0 comment "text message 19" +2.0.1.190 timeout 0 comment "text message 190" +2.0.1.191 timeout 0 comment "text message 191" +2.0.1.192 timeout 0 comment "text message 192" +2.0.1.193 timeout 0 comment "text message 193" +2.0.1.194 timeout 0 comment "text message 194" +2.0.1.195 timeout 0 comment "text message 195" +2.0.1.196 timeout 0 comment "text message 196" +2.0.1.197 timeout 0 comment "text message 197" +2.0.1.198 timeout 0 comment "text message 198" +2.0.1.199 timeout 0 comment "text message 199" +2.0.1.2 timeout 0 comment "text message 2" +2.0.1.20 timeout 0 comment "text message 20" +2.0.1.200 timeout 0 comment "text message 200" +2.0.1.201 timeout 0 comment "text message 201" +2.0.1.202 timeout 0 comment "text message 202" +2.0.1.203 timeout 0 comment "text message 203" +2.0.1.204 timeout 0 comment "text message 204" +2.0.1.205 timeout 0 comment "text message 205" +2.0.1.206 timeout 0 comment "text message 206" +2.0.1.207 timeout 0 comment "text message 207" +2.0.1.208 timeout 0 comment "text message 208" +2.0.1.209 timeout 0 comment "text message 209" +2.0.1.21 timeout 0 comment "text message 21" +2.0.1.210 timeout 0 comment "text message 210" +2.0.1.211 timeout 0 comment "text message 211" +2.0.1.212 timeout 0 comment "text message 212" +2.0.1.213 timeout 0 comment "text message 213" +2.0.1.214 timeout 0 comment "text message 214" +2.0.1.215 timeout 0 comment "text message 215" +2.0.1.216 timeout 0 comment "text message 216" +2.0.1.217 timeout 0 comment "text message 217" +2.0.1.218 timeout 0 comment "text message 218" +2.0.1.219 timeout 0 comment "text message 219" +2.0.1.22 timeout 0 comment "text message 22" +2.0.1.220 timeout 0 comment "text message 220" +2.0.1.221 timeout 0 comment "text message 221" +2.0.1.222 timeout 0 comment "text message 222" +2.0.1.223 timeout 0 comment "text message 223" +2.0.1.224 timeout 0 comment "text message 224" +2.0.1.225 timeout 0 comment "text message 225" +2.0.1.226 timeout 0 comment "text message 226" +2.0.1.227 timeout 0 comment "text message 227" +2.0.1.228 timeout 0 comment "text message 228" +2.0.1.229 timeout 0 comment "text message 229" +2.0.1.23 timeout 0 comment "text message 23" +2.0.1.230 timeout 0 comment "text message 230" +2.0.1.231 timeout 0 comment "text message 231" +2.0.1.232 timeout 0 comment "text message 232" +2.0.1.233 timeout 0 comment "text message 233" +2.0.1.234 timeout 0 comment "text message 234" +2.0.1.235 timeout 0 comment "text message 235" +2.0.1.236 timeout 0 comment "text message 236" +2.0.1.237 timeout 0 comment "text message 237" +2.0.1.238 timeout 0 comment "text message 238" +2.0.1.239 timeout 0 comment "text message 239" +2.0.1.24 timeout 0 comment "text message 24" +2.0.1.240 timeout 0 comment "text message 240" +2.0.1.241 timeout 0 comment "text message 241" +2.0.1.242 timeout 0 comment "text message 242" +2.0.1.243 timeout 0 comment "text message 243" +2.0.1.244 timeout 0 comment "text message 244" +2.0.1.245 timeout 0 comment "text message 245" +2.0.1.246 timeout 0 comment "text message 246" +2.0.1.247 timeout 0 comment "text message 247" +2.0.1.248 timeout 0 comment "text message 248" +2.0.1.249 timeout 0 comment "text message 249" +2.0.1.25 timeout 0 comment "text message 25" +2.0.1.250 timeout 0 comment "text message 250" +2.0.1.251 timeout 0 comment "text message 251" +2.0.1.252 timeout 0 comment "text message 252" +2.0.1.253 timeout 0 comment "text message 253" +2.0.1.254 timeout 0 comment "text message 254" +2.0.1.255 timeout 0 comment "text message 255" +2.0.1.26 timeout 0 comment "text message 26" +2.0.1.27 timeout 0 comment "text message 27" +2.0.1.28 timeout 0 comment "text message 28" +2.0.1.29 timeout 0 comment "text message 29" +2.0.1.3 timeout 0 comment "text message 3" +2.0.1.30 timeout 0 comment "text message 30" +2.0.1.31 timeout 0 comment "text message 31" +2.0.1.32 timeout 0 comment "text message 32" +2.0.1.33 timeout 0 comment "text message 33" +2.0.1.34 timeout 0 comment "text message 34" +2.0.1.35 timeout 0 comment "text message 35" +2.0.1.36 timeout 0 comment "text message 36" +2.0.1.37 timeout 0 comment "text message 37" +2.0.1.38 timeout 0 comment "text message 38" +2.0.1.39 timeout 0 comment "text message 39" +2.0.1.4 timeout 0 comment "text message 4" +2.0.1.40 timeout 0 comment "text message 40" +2.0.1.41 timeout 0 comment "text message 41" +2.0.1.42 timeout 0 comment "text message 42" +2.0.1.43 timeout 0 comment "text message 43" +2.0.1.44 timeout 0 comment "text message 44" +2.0.1.45 timeout 0 comment "text message 45" +2.0.1.46 timeout 0 comment "text message 46" +2.0.1.47 timeout 0 comment "text message 47" +2.0.1.48 timeout 0 comment "text message 48" +2.0.1.49 timeout 0 comment "text message 49" +2.0.1.5 timeout 0 comment "text message 5" +2.0.1.50 timeout 0 comment "text message 50" +2.0.1.51 timeout 0 comment "text message 51" +2.0.1.52 timeout 0 comment "text message 52" +2.0.1.53 timeout 0 comment "text message 53" +2.0.1.54 timeout 0 comment "text message 54" +2.0.1.55 timeout 0 comment "text message 55" +2.0.1.56 timeout 0 comment "text message 56" +2.0.1.57 timeout 0 comment "text message 57" +2.0.1.58 timeout 0 comment "text message 58" +2.0.1.59 timeout 0 comment "text message 59" +2.0.1.6 timeout 0 comment "text message 6" +2.0.1.60 timeout 0 comment "text message 60" +2.0.1.61 timeout 0 comment "text message 61" +2.0.1.62 timeout 0 comment "text message 62" +2.0.1.63 timeout 0 comment "text message 63" +2.0.1.64 timeout 0 comment "text message 64" +2.0.1.65 timeout 0 comment "text message 65" +2.0.1.66 timeout 0 comment "text message 66" +2.0.1.67 timeout 0 comment "text message 67" +2.0.1.68 timeout 0 comment "text message 68" +2.0.1.69 timeout 0 comment "text message 69" +2.0.1.7 timeout 0 comment "text message 7" +2.0.1.70 timeout 0 comment "text message 70" +2.0.1.71 timeout 0 comment "text message 71" +2.0.1.72 timeout 0 comment "text message 72" +2.0.1.73 timeout 0 comment "text message 73" +2.0.1.74 timeout 0 comment "text message 74" +2.0.1.75 timeout 0 comment "text message 75" +2.0.1.76 timeout 0 comment "text message 76" +2.0.1.77 timeout 0 comment "text message 77" +2.0.1.78 timeout 0 comment "text message 78" +2.0.1.79 timeout 0 comment "text message 79" +2.0.1.8 timeout 0 comment "text message 8" +2.0.1.80 timeout 0 comment "text message 80" +2.0.1.81 timeout 0 comment "text message 81" +2.0.1.82 timeout 0 comment "text message 82" +2.0.1.83 timeout 0 comment "text message 83" +2.0.1.84 timeout 0 comment "text message 84" +2.0.1.85 timeout 0 comment "text message 85" +2.0.1.86 timeout 0 comment "text message 86" +2.0.1.87 timeout 0 comment "text message 87" +2.0.1.88 timeout 0 comment "text message 88" +2.0.1.89 timeout 0 comment "text message 89" +2.0.1.9 timeout 0 comment "text message 9" +2.0.1.90 timeout 0 comment "text message 90" +2.0.1.91 timeout 0 comment "text message 91" +2.0.1.92 timeout 0 comment "text message 92" +2.0.1.93 timeout 0 comment "text message 93" +2.0.1.94 timeout 0 comment "text message 94" +2.0.1.95 timeout 0 comment "text message 95" +2.0.1.96 timeout 0 comment "text message 96" +2.0.1.97 timeout 0 comment "text message 97" +2.0.1.98 timeout 0 comment "text message 98" +2.0.1.99 timeout 0 comment "text message 99" diff --git a/tests/comment.t.list22 b/tests/comment.t.list22 index f24319ec..4cfdabee 100644 --- a/tests/comment.t.list22 +++ b/tests/comment.t.list22 @@ -1,263 +1,264 @@ Name: test Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 timeout x comment bucketsize 12 -Size in memory: 40034 +Revision: 5 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 comment bucketsize 12 initval 0x8e7fb9de +Size in memory: 40834 References: 0 Number of entries: 256 Members: -2.0.1.0 timeout x comment "text message 0" -2.0.1.1 timeout x comment "text message 1" -2.0.1.10 timeout x comment "text message 10" -2.0.1.100 timeout x comment "text message 100" -2.0.1.101 timeout x comment "text message 101" -2.0.1.102 timeout x comment "text message 102" -2.0.1.103 timeout x comment "text message 103" -2.0.1.104 timeout x comment "text message 104" -2.0.1.105 timeout x comment "text message 105" -2.0.1.106 timeout x comment "text message 106" -2.0.1.107 timeout x comment "text message 107" -2.0.1.108 timeout x comment "text message 108" -2.0.1.109 timeout x comment "text message 109" -2.0.1.11 timeout x comment "text message 11" -2.0.1.110 timeout x comment "text message 110" -2.0.1.111 timeout x comment "text message 111" -2.0.1.112 timeout x comment "text message 112" -2.0.1.113 timeout x comment "text message 113" -2.0.1.114 timeout x comment "text message 114" -2.0.1.115 timeout x comment "text message 115" -2.0.1.116 timeout x comment "text message 116" -2.0.1.117 timeout x comment "text message 117" -2.0.1.118 timeout x comment "text message 118" -2.0.1.119 timeout x comment "text message 119" -2.0.1.12 timeout x comment "text message 12" -2.0.1.120 timeout x comment "text message 120" -2.0.1.121 timeout x comment "text message 121" -2.0.1.122 timeout x comment "text message 122" -2.0.1.123 timeout x comment "text message 123" -2.0.1.124 timeout x comment "text message 124" -2.0.1.125 timeout x comment "text message 125" -2.0.1.126 timeout x comment "text message 126" -2.0.1.127 timeout x comment "text message 127" -2.0.1.128 timeout x comment "text message 128" -2.0.1.129 timeout x comment "text message 129" -2.0.1.13 timeout x comment "text message 13" -2.0.1.130 timeout x comment "text message 130" -2.0.1.131 timeout x comment "text message 131" -2.0.1.132 timeout x comment "text message 132" -2.0.1.133 timeout x comment "text message 133" -2.0.1.134 timeout x comment "text message 134" -2.0.1.135 timeout x comment "text message 135" -2.0.1.136 timeout x comment "text message 136" -2.0.1.137 timeout x comment "text message 137" -2.0.1.138 timeout x comment "text message 138" -2.0.1.139 timeout x comment "text message 139" -2.0.1.14 timeout x comment "text message 14" -2.0.1.140 timeout x comment "text message 140" -2.0.1.141 timeout x comment "text message 141" -2.0.1.142 timeout x comment "text message 142" -2.0.1.143 timeout x comment "text message 143" -2.0.1.144 timeout x comment "text message 144" -2.0.1.145 timeout x comment "text message 145" -2.0.1.146 timeout x comment "text message 146" -2.0.1.147 timeout x comment "text message 147" -2.0.1.148 timeout x comment "text message 148" -2.0.1.149 timeout x comment "text message 149" -2.0.1.15 timeout x comment "text message 15" -2.0.1.150 timeout x comment "text message 150" -2.0.1.151 timeout x comment "text message 151" -2.0.1.152 timeout x comment "text message 152" -2.0.1.153 timeout x comment "text message 153" -2.0.1.154 timeout x comment "text message 154" -2.0.1.155 timeout x comment "text message 155" -2.0.1.156 timeout x comment "text message 156" -2.0.1.157 timeout x comment "text message 157" -2.0.1.158 timeout x comment "text message 158" -2.0.1.159 timeout x comment "text message 159" -2.0.1.16 timeout x comment "text message 16" -2.0.1.160 timeout x comment "text message 160" -2.0.1.161 timeout x comment "text message 161" -2.0.1.162 timeout x comment "text message 162" -2.0.1.163 timeout x comment "text message 163" -2.0.1.164 timeout x comment "text message 164" -2.0.1.165 timeout x comment "text message 165" -2.0.1.166 timeout x comment "text message 166" -2.0.1.167 timeout x comment "text message 167" -2.0.1.168 timeout x comment "text message 168" -2.0.1.169 timeout x comment "text message 169" -2.0.1.17 timeout x comment "text message 17" -2.0.1.170 timeout x comment "text message 170" -2.0.1.171 timeout x comment "text message 171" -2.0.1.172 timeout x comment "text message 172" -2.0.1.173 timeout x comment "text message 173" -2.0.1.174 timeout x comment "text message 174" -2.0.1.175 timeout x comment "text message 175" -2.0.1.176 timeout x comment "text message 176" -2.0.1.177 timeout x comment "text message 177" -2.0.1.178 timeout x comment "text message 178" -2.0.1.179 timeout x comment "text message 179" -2.0.1.18 timeout x comment "text message 18" -2.0.1.180 timeout x comment "text message 180" -2.0.1.181 timeout x comment "text message 181" -2.0.1.182 timeout x comment "text message 182" -2.0.1.183 timeout x comment "text message 183" -2.0.1.184 timeout x comment "text message 184" -2.0.1.185 timeout x comment "text message 185" -2.0.1.186 timeout x comment "text message 186" -2.0.1.187 timeout x comment "text message 187" -2.0.1.188 timeout x comment "text message 188" -2.0.1.189 timeout x comment "text message 189" -2.0.1.19 timeout x comment "text message 19" -2.0.1.190 timeout x comment "text message 190" -2.0.1.191 timeout x comment "text message 191" -2.0.1.192 timeout x comment "text message 192" -2.0.1.193 timeout x comment "text message 193" -2.0.1.194 timeout x comment "text message 194" -2.0.1.195 timeout x comment "text message 195" -2.0.1.196 timeout x comment "text message 196" -2.0.1.197 timeout x comment "text message 197" -2.0.1.198 timeout x comment "text message 198" -2.0.1.199 timeout x comment "text message 199" -2.0.1.2 timeout x comment "text message 2" -2.0.1.20 timeout x comment "text message 20" -2.0.1.200 timeout x comment "text message 200" -2.0.1.201 timeout x comment "text message 201" -2.0.1.202 timeout x comment "text message 202" -2.0.1.203 timeout x comment "text message 203" -2.0.1.204 timeout x comment "text message 204" -2.0.1.205 timeout x comment "text message 205" -2.0.1.206 timeout x comment "text message 206" -2.0.1.207 timeout x comment "text message 207" -2.0.1.208 timeout x comment "text message 208" -2.0.1.209 timeout x comment "text message 209" -2.0.1.21 timeout x comment "text message 21" -2.0.1.210 timeout x comment "text message 210" -2.0.1.211 timeout x comment "text message 211" -2.0.1.212 timeout x comment "text message 212" -2.0.1.213 timeout x comment "text message 213" -2.0.1.214 timeout x comment "text message 214" -2.0.1.215 timeout x comment "text message 215" -2.0.1.216 timeout x comment "text message 216" -2.0.1.217 timeout x comment "text message 217" -2.0.1.218 timeout x comment "text message 218" -2.0.1.219 timeout x comment "text message 219" -2.0.1.22 timeout x comment "text message 22" -2.0.1.220 timeout x comment "text message 220" -2.0.1.221 timeout x comment "text message 221" -2.0.1.222 timeout x comment "text message 222" -2.0.1.223 timeout x comment "text message 223" -2.0.1.224 timeout x comment "text message 224" -2.0.1.225 timeout x comment "text message 225" -2.0.1.226 timeout x comment "text message 226" -2.0.1.227 timeout x comment "text message 227" -2.0.1.228 timeout x comment "text message 228" -2.0.1.229 timeout x comment "text message 229" -2.0.1.23 timeout x comment "text message 23" -2.0.1.230 timeout x comment "text message 230" -2.0.1.231 timeout x comment "text message 231" -2.0.1.232 timeout x comment "text message 232" -2.0.1.233 timeout x comment "text message 233" -2.0.1.234 timeout x comment "text message 234" -2.0.1.235 timeout x comment "text message 235" -2.0.1.236 timeout x comment "text message 236" -2.0.1.237 timeout x comment "text message 237" -2.0.1.238 timeout x comment "text message 238" -2.0.1.239 timeout x comment "text message 239" -2.0.1.24 timeout x comment "text message 24" -2.0.1.240 timeout x comment "text message 240" -2.0.1.241 timeout x comment "text message 241" -2.0.1.242 timeout x comment "text message 242" -2.0.1.243 timeout x comment "text message 243" -2.0.1.244 timeout x comment "text message 244" -2.0.1.245 timeout x comment "text message 245" -2.0.1.246 timeout x comment "text message 246" -2.0.1.247 timeout x comment "text message 247" -2.0.1.248 timeout x comment "text message 248" -2.0.1.249 timeout x comment "text message 249" -2.0.1.25 timeout x comment "text message 25" -2.0.1.250 timeout x comment "text message 250" -2.0.1.251 timeout x comment "text message 251" -2.0.1.252 timeout x comment "text message 252" -2.0.1.253 timeout x comment "text message 253" -2.0.1.254 timeout x comment "text message 254" -2.0.1.255 timeout x comment "text message 255" -2.0.1.26 timeout x comment "text message 26" -2.0.1.27 timeout x comment "text message 27" -2.0.1.28 timeout x comment "text message 28" -2.0.1.29 timeout x comment "text message 29" -2.0.1.3 timeout x comment "text message 3" -2.0.1.30 timeout x comment "text message 30" -2.0.1.31 timeout x comment "text message 31" -2.0.1.32 timeout x comment "text message 32" -2.0.1.33 timeout x comment "text message 33" -2.0.1.34 timeout x comment "text message 34" -2.0.1.35 timeout x comment "text message 35" -2.0.1.36 timeout x comment "text message 36" -2.0.1.37 timeout x comment "text message 37" -2.0.1.38 timeout x comment "text message 38" -2.0.1.39 timeout x comment "text message 39" -2.0.1.4 timeout x comment "text message 4" -2.0.1.40 timeout x comment "text message 40" -2.0.1.41 timeout x comment "text message 41" -2.0.1.42 timeout x comment "text message 42" -2.0.1.43 timeout x comment "text message 43" -2.0.1.44 timeout x comment "text message 44" -2.0.1.45 timeout x comment "text message 45" -2.0.1.46 timeout x comment "text message 46" -2.0.1.47 timeout x comment "text message 47" -2.0.1.48 timeout x comment "text message 48" -2.0.1.49 timeout x comment "text message 49" -2.0.1.5 timeout x comment "text message 5" -2.0.1.50 timeout x comment "text message 50" -2.0.1.51 timeout x comment "text message 51" -2.0.1.52 timeout x comment "text message 52" -2.0.1.53 timeout x comment "text message 53" -2.0.1.54 timeout x comment "text message 54" -2.0.1.55 timeout x comment "text message 55" -2.0.1.56 timeout x comment "text message 56" -2.0.1.57 timeout x comment "text message 57" -2.0.1.58 timeout x comment "text message 58" -2.0.1.59 timeout x comment "text message 59" -2.0.1.6 timeout x comment "text message 6" -2.0.1.60 timeout x comment "text message 60" -2.0.1.61 timeout x comment "text message 61" -2.0.1.62 timeout x comment "text message 62" -2.0.1.63 timeout x comment "text message 63" -2.0.1.64 timeout x comment "text message 64" -2.0.1.65 timeout x comment "text message 65" -2.0.1.66 timeout x comment "text message 66" -2.0.1.67 timeout x comment "text message 67" -2.0.1.68 timeout x comment "text message 68" -2.0.1.69 timeout x comment "text message 69" -2.0.1.7 timeout x comment "text message 7" -2.0.1.70 timeout x comment "text message 70" -2.0.1.71 timeout x comment "text message 71" -2.0.1.72 timeout x comment "text message 72" -2.0.1.73 timeout x comment "text message 73" -2.0.1.74 timeout x comment "text message 74" -2.0.1.75 timeout x comment "text message 75" -2.0.1.76 timeout x comment "text message 76" -2.0.1.77 timeout x comment "text message 77" -2.0.1.78 timeout x comment "text message 78" -2.0.1.79 timeout x comment "text message 79" -2.0.1.8 timeout x comment "text message 8" -2.0.1.80 timeout x comment "text message 80" -2.0.1.81 timeout x comment "text message 81" -2.0.1.82 timeout x comment "text message 82" -2.0.1.83 timeout x comment "text message 83" -2.0.1.84 timeout x comment "text message 84" -2.0.1.85 timeout x comment "text message 85" -2.0.1.86 timeout x comment "text message 86" -2.0.1.87 timeout x comment "text message 87" -2.0.1.88 timeout x comment "text message 88" -2.0.1.89 timeout x comment "text message 89" -2.0.1.9 timeout x comment "text message 9" -2.0.1.90 timeout x comment "text message 90" -2.0.1.91 timeout x comment "text message 91" -2.0.1.92 timeout x comment "text message 92" -2.0.1.93 timeout x comment "text message 93" -2.0.1.94 timeout x comment "text message 94" -2.0.1.95 timeout x comment "text message 95" -2.0.1.96 timeout x comment "text message 96" -2.0.1.97 timeout x comment "text message 97" -2.0.1.98 timeout x comment "text message 98" -2.0.1.99 timeout x comment "text message 99" +2.0.1.0 timeout 0 comment "text message 0" +2.0.1.1 timeout 0 comment "text message 1" +2.0.1.10 timeout 0 comment "text message 10" +2.0.1.100 timeout 0 comment "text message 100" +2.0.1.101 timeout 0 comment "text message 101" +2.0.1.102 timeout 0 comment "text message 102" +2.0.1.103 timeout 0 comment "text message 103" +2.0.1.104 timeout 0 comment "text message 104" +2.0.1.105 timeout 0 comment "text message 105" +2.0.1.106 timeout 0 comment "text message 106" +2.0.1.107 timeout 0 comment "text message 107" +2.0.1.108 timeout 0 comment "text message 108" +2.0.1.109 timeout 0 comment "text message 109" +2.0.1.11 timeout 0 comment "text message 11" +2.0.1.110 timeout 0 comment "text message 110" +2.0.1.111 timeout 0 comment "text message 111" +2.0.1.112 timeout 0 comment "text message 112" +2.0.1.113 timeout 0 comment "text message 113" +2.0.1.114 timeout 0 comment "text message 114" +2.0.1.115 timeout 0 comment "text message 115" +2.0.1.116 timeout 0 comment "text message 116" +2.0.1.117 timeout 0 comment "text message 117" +2.0.1.118 timeout 0 comment "text message 118" +2.0.1.119 timeout 0 comment "text message 119" +2.0.1.12 timeout 0 comment "text message 12" +2.0.1.120 timeout 0 comment "text message 120" +2.0.1.121 timeout 0 comment "text message 121" +2.0.1.122 timeout 0 comment "text message 122" +2.0.1.123 timeout 0 comment "text message 123" +2.0.1.124 timeout 0 comment "text message 124" +2.0.1.125 timeout 0 comment "text message 125" +2.0.1.126 timeout 0 comment "text message 126" +2.0.1.127 timeout 0 comment "text message 127" +2.0.1.128 timeout 0 comment "text message 128" +2.0.1.129 timeout 0 comment "text message 129" +2.0.1.13 timeout 0 comment "text message 13" +2.0.1.130 timeout 0 comment "text message 130" +2.0.1.131 timeout 0 comment "text message 131" +2.0.1.132 timeout 0 comment "text message 132" +2.0.1.133 timeout 0 comment "text message 133" +2.0.1.134 timeout 0 comment "text message 134" +2.0.1.135 timeout 0 comment "text message 135" +2.0.1.136 timeout 0 comment "text message 136" +2.0.1.137 timeout 0 comment "text message 137" +2.0.1.138 timeout 0 comment "text message 138" +2.0.1.139 timeout 0 comment "text message 139" +2.0.1.14 timeout 0 comment "text message 14" +2.0.1.140 timeout 0 comment "text message 140" +2.0.1.141 timeout 0 comment "text message 141" +2.0.1.142 timeout 0 comment "text message 142" +2.0.1.143 timeout 0 comment "text message 143" +2.0.1.144 timeout 0 comment "text message 144" +2.0.1.145 timeout 0 comment "text message 145" +2.0.1.146 timeout 0 comment "text message 146" +2.0.1.147 timeout 0 comment "text message 147" +2.0.1.148 timeout 0 comment "text message 148" +2.0.1.149 timeout 0 comment "text message 149" +2.0.1.15 timeout 0 comment "text message 15" +2.0.1.150 timeout 0 comment "text message 150" +2.0.1.151 timeout 0 comment "text message 151" +2.0.1.152 timeout 0 comment "text message 152" +2.0.1.153 timeout 0 comment "text message 153" +2.0.1.154 timeout 0 comment "text message 154" +2.0.1.155 timeout 0 comment "text message 155" +2.0.1.156 timeout 0 comment "text message 156" +2.0.1.157 timeout 0 comment "text message 157" +2.0.1.158 timeout 0 comment "text message 158" +2.0.1.159 timeout 0 comment "text message 159" +2.0.1.16 timeout 0 comment "text message 16" +2.0.1.160 timeout 0 comment "text message 160" +2.0.1.161 timeout 0 comment "text message 161" +2.0.1.162 timeout 0 comment "text message 162" +2.0.1.163 timeout 0 comment "text message 163" +2.0.1.164 timeout 0 comment "text message 164" +2.0.1.165 timeout 0 comment "text message 165" +2.0.1.166 timeout 0 comment "text message 166" +2.0.1.167 timeout 0 comment "text message 167" +2.0.1.168 timeout 0 comment "text message 168" +2.0.1.169 timeout 0 comment "text message 169" +2.0.1.17 timeout 0 comment "text message 17" +2.0.1.170 timeout 0 comment "text message 170" +2.0.1.171 timeout 0 comment "text message 171" +2.0.1.172 timeout 0 comment "text message 172" +2.0.1.173 timeout 0 comment "text message 173" +2.0.1.174 timeout 0 comment "text message 174" +2.0.1.175 timeout 0 comment "text message 175" +2.0.1.176 timeout 0 comment "text message 176" +2.0.1.177 timeout 0 comment "text message 177" +2.0.1.178 timeout 0 comment "text message 178" +2.0.1.179 timeout 0 comment "text message 179" +2.0.1.18 timeout 0 comment "text message 18" +2.0.1.180 timeout 0 comment "text message 180" +2.0.1.181 timeout 0 comment "text message 181" +2.0.1.182 timeout 0 comment "text message 182" +2.0.1.183 timeout 0 comment "text message 183" +2.0.1.184 timeout 0 comment "text message 184" +2.0.1.185 timeout 0 comment "text message 185" +2.0.1.186 timeout 0 comment "text message 186" +2.0.1.187 timeout 0 comment "text message 187" +2.0.1.188 timeout 0 comment "text message 188" +2.0.1.189 timeout 0 comment "text message 189" +2.0.1.19 timeout 0 comment "text message 19" +2.0.1.190 timeout 0 comment "text message 190" +2.0.1.191 timeout 0 comment "text message 191" +2.0.1.192 timeout 0 comment "text message 192" +2.0.1.193 timeout 0 comment "text message 193" +2.0.1.194 timeout 0 comment "text message 194" +2.0.1.195 timeout 0 comment "text message 195" +2.0.1.196 timeout 0 comment "text message 196" +2.0.1.197 timeout 0 comment "text message 197" +2.0.1.198 timeout 0 comment "text message 198" +2.0.1.199 timeout 0 comment "text message 199" +2.0.1.2 timeout 0 comment "text message 2" +2.0.1.20 timeout 0 comment "text message 20" +2.0.1.200 timeout 0 comment "text message 200" +2.0.1.201 timeout 0 comment "text message 201" +2.0.1.202 timeout 0 comment "text message 202" +2.0.1.203 timeout 0 comment "text message 203" +2.0.1.204 timeout 0 comment "text message 204" +2.0.1.205 timeout 0 comment "text message 205" +2.0.1.206 timeout 0 comment "text message 206" +2.0.1.207 timeout 0 comment "text message 207" +2.0.1.208 timeout 0 comment "text message 208" +2.0.1.209 timeout 0 comment "text message 209" +2.0.1.21 timeout 0 comment "text message 21" +2.0.1.210 timeout 0 comment "text message 210" +2.0.1.211 timeout 0 comment "text message 211" +2.0.1.212 timeout 0 comment "text message 212" +2.0.1.213 timeout 0 comment "text message 213" +2.0.1.214 timeout 0 comment "text message 214" +2.0.1.215 timeout 0 comment "text message 215" +2.0.1.216 timeout 0 comment "text message 216" +2.0.1.217 timeout 0 comment "text message 217" +2.0.1.218 timeout 0 comment "text message 218" +2.0.1.219 timeout 0 comment "text message 219" +2.0.1.22 timeout 0 comment "text message 22" +2.0.1.220 timeout 0 comment "text message 220" +2.0.1.221 timeout 0 comment "text message 221" +2.0.1.222 timeout 0 comment "text message 222" +2.0.1.223 timeout 0 comment "text message 223" +2.0.1.224 timeout 0 comment "text message 224" +2.0.1.225 timeout 0 comment "text message 225" +2.0.1.226 timeout 0 comment "text message 226" +2.0.1.227 timeout 0 comment "text message 227" +2.0.1.228 timeout 0 comment "text message 228" +2.0.1.229 timeout 0 comment "text message 229" +2.0.1.23 timeout 0 comment "text message 23" +2.0.1.230 timeout 0 comment "text message 230" +2.0.1.231 timeout 0 comment "text message 231" +2.0.1.232 timeout 0 comment "text message 232" +2.0.1.233 timeout 0 comment "text message 233" +2.0.1.234 timeout 0 comment "text message 234" +2.0.1.235 timeout 0 comment "text message 235" +2.0.1.236 timeout 0 comment "text message 236" +2.0.1.237 timeout 0 comment "text message 237" +2.0.1.238 timeout 0 comment "text message 238" +2.0.1.239 timeout 0 comment "text message 239" +2.0.1.24 timeout 0 comment "text message 24" +2.0.1.240 timeout 0 comment "text message 240" +2.0.1.241 timeout 0 comment "text message 241" +2.0.1.242 timeout 0 comment "text message 242" +2.0.1.243 timeout 0 comment "text message 243" +2.0.1.244 timeout 0 comment "text message 244" +2.0.1.245 timeout 0 comment "text message 245" +2.0.1.246 timeout 0 comment "text message 246" +2.0.1.247 timeout 0 comment "text message 247" +2.0.1.248 timeout 0 comment "text message 248" +2.0.1.249 timeout 0 comment "text message 249" +2.0.1.25 timeout 0 comment "text message 25" +2.0.1.250 timeout 0 comment "text message 250" +2.0.1.251 timeout 0 comment "text message 251" +2.0.1.252 timeout 0 comment "text message 252" +2.0.1.253 timeout 0 comment "text message 253" +2.0.1.254 timeout 0 comment "text message 254" +2.0.1.255 timeout 0 comment "text message 255" +2.0.1.26 timeout 0 comment "text message 26" +2.0.1.27 timeout 0 comment "text message 27" +2.0.1.28 timeout 0 comment "text message 28" +2.0.1.29 timeout 0 comment "text message 29" +2.0.1.3 timeout 0 comment "text message 3" +2.0.1.30 timeout 0 comment "text message 30" +2.0.1.31 timeout 0 comment "text message 31" +2.0.1.32 timeout 0 comment "text message 32" +2.0.1.33 timeout 0 comment "text message 33" +2.0.1.34 timeout 0 comment "text message 34" +2.0.1.35 timeout 0 comment "text message 35" +2.0.1.36 timeout 0 comment "text message 36" +2.0.1.37 timeout 0 comment "text message 37" +2.0.1.38 timeout 0 comment "text message 38" +2.0.1.39 timeout 0 comment "text message 39" +2.0.1.4 timeout 0 comment "text message 4" +2.0.1.40 timeout 0 comment "text message 40" +2.0.1.41 timeout 0 comment "text message 41" +2.0.1.42 timeout 0 comment "text message 42" +2.0.1.43 timeout 0 comment "text message 43" +2.0.1.44 timeout 0 comment "text message 44" +2.0.1.45 timeout 0 comment "text message 45" +2.0.1.46 timeout 0 comment "text message 46" +2.0.1.47 timeout 0 comment "text message 47" +2.0.1.48 timeout 0 comment "text message 48" +2.0.1.49 timeout 0 comment "text message 49" +2.0.1.5 timeout 0 comment "text message 5" +2.0.1.50 timeout 0 comment "text message 50" +2.0.1.51 timeout 0 comment "text message 51" +2.0.1.52 timeout 0 comment "text message 52" +2.0.1.53 timeout 0 comment "text message 53" +2.0.1.54 timeout 0 comment "text message 54" +2.0.1.55 timeout 0 comment "text message 55" +2.0.1.56 timeout 0 comment "text message 56" +2.0.1.57 timeout 0 comment "text message 57" +2.0.1.58 timeout 0 comment "text message 58" +2.0.1.59 timeout 0 comment "text message 59" +2.0.1.6 timeout 0 comment "text message 6" +2.0.1.60 timeout 0 comment "text message 60" +2.0.1.61 timeout 0 comment "text message 61" +2.0.1.62 timeout 0 comment "text message 62" +2.0.1.63 timeout 0 comment "text message 63" +2.0.1.64 timeout 0 comment "text message 64" +2.0.1.65 timeout 0 comment "text message 65" +2.0.1.66 timeout 0 comment "text message 66" +2.0.1.67 timeout 0 comment "text message 67" +2.0.1.68 timeout 0 comment "text message 68" +2.0.1.69 timeout 0 comment "text message 69" +2.0.1.7 timeout 0 comment "text message 7" +2.0.1.70 timeout 0 comment "text message 70" +2.0.1.71 timeout 0 comment "text message 71" +2.0.1.72 timeout 0 comment "text message 72" +2.0.1.73 timeout 0 comment "text message 73" +2.0.1.74 timeout 0 comment "text message 74" +2.0.1.75 timeout 0 comment "text message 75" +2.0.1.76 timeout 0 comment "text message 76" +2.0.1.77 timeout 0 comment "text message 77" +2.0.1.78 timeout 0 comment "text message 78" +2.0.1.79 timeout 0 comment "text message 79" +2.0.1.8 timeout 0 comment "text message 8" +2.0.1.80 timeout 0 comment "text message 80" +2.0.1.81 timeout 0 comment "text message 81" +2.0.1.82 timeout 0 comment "text message 82" +2.0.1.83 timeout 0 comment "text message 83" +2.0.1.84 timeout 0 comment "text message 84" +2.0.1.85 timeout 0 comment "text message 85" +2.0.1.86 timeout 0 comment "text message 86" +2.0.1.87 timeout 0 comment "text message 87" +2.0.1.88 timeout 0 comment "text message 88" +2.0.1.89 timeout 0 comment "text message 89" +2.0.1.9 timeout 0 comment "text message 9" +2.0.1.90 timeout 0 comment "text message 90" +2.0.1.91 timeout 0 comment "text message 91" +2.0.1.92 timeout 0 comment "text message 92" +2.0.1.93 timeout 0 comment "text message 93" +2.0.1.94 timeout 0 comment "text message 94" +2.0.1.95 timeout 0 comment "text message 95" +2.0.1.96 timeout 0 comment "text message 96" +2.0.1.97 timeout 0 comment "text message 97" +2.0.1.98 timeout 0 comment "text message 98" +2.0.1.99 timeout 0 comment "text message 99" diff --git a/tests/comment.t.list3 b/tests/comment.t.list3 index 528796f2..b6eab326 100644 --- a/tests/comment.t.list3 +++ b/tests/comment.t.list3 @@ -1,6 +1,7 @@ Name: a Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0xe2558329 Size in memory: 336 References: 1 Number of entries: 0 @@ -8,7 +9,8 @@ Members: Name: b Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x0dfa7d5d Size in memory: 336 References: 1 Number of entries: 0 @@ -16,7 +18,8 @@ Members: Name: c Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x8fada201 Size in memory: 336 References: 1 Number of entries: 0 @@ -24,6 +27,7 @@ Members: Name: test Type: list:set +Revision: 3 Header: size 8 comment Size in memory: 378 References: 0 diff --git a/tests/diff.sh b/tests/diff.sh new file mode 100755 index 00000000..a364a28b --- /dev/null +++ b/tests/diff.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +diff -u -I 'Revision: .*' -I 'Size in memory.*' \ + <(sed -e 's/timeout [0-9]*/timeout x/' -e 's/initval 0x[0-9a-fA-F]\{8\}/initval 0x00000000/' $1) \ + <(sed -e 's/timeout [0-9]*/timeout x/' -e 's/initval 0x[0-9a-fA-F]\{8\}/initval 0x00000000/' $2) + + diff --git a/tests/hash:ip,mark.t b/tests/hash:ip,mark.t index 9c51201f..ce94efc4 100644 --- a/tests/hash:ip,mark.t +++ b/tests/hash:ip,mark.t @@ -27,15 +27,15 @@ # Try to add value after second random value 0 ipset add test 2.1.0.1,0x80 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip,mark.t.list0 +0 ./diff.sh .foo hash:ip,mark.t.list0 # Sleep 5s so that elements can time out 0 sleep 5 # List set -0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip,mark.t.list1 +0 ./diff.sh .foo hash:ip,mark.t.list1 # Flush test set 0 ipset flush test # Add multiple elements in one step diff --git a/tests/hash:ip,mark.t.list0 b/tests/hash:ip,mark.t.list0 index 865ac1e4..1df024fd 100644 --- a/tests/hash:ip,mark.t.list0 +++ b/tests/hash:ip,mark.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Revision: 3 +Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x30edb64c Size in memory: 592 References: 0 Number of entries: 4 Members: -2.0.0.0,0x00000005 timeout x -2.0.0.1,0x00000005 timeout x -2.1.0.0,0x00000080 timeout x -2.1.0.1,0x00000080 timeout x +2.0.0.0,0x00000005 timeout 3 +2.0.0.1,0x00000005 timeout 3 +2.1.0.0,0x00000080 timeout 3 +2.1.0.1,0x00000080 timeout 3 diff --git a/tests/hash:ip,mark.t.list1 b/tests/hash:ip,mark.t.list1 index 9c6a87da..34fafcce 100644 --- a/tests/hash:ip,mark.t.list1 +++ b/tests/hash:ip,mark.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Revision: 3 +Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x139cd632 Size in memory: 592 References: 0 Number of entries: 0 diff --git a/tests/hash:ip,port,ip.t b/tests/hash:ip,port,ip.t index 8a6954e7..fcd6985a 100644 --- a/tests/hash:ip,port,ip.t +++ b/tests/hash:ip,port,ip.t @@ -35,15 +35,15 @@ # Try to add value after second random value 0 ipset add test 2.1.0.1,128,2.2.2.2 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip,port,ip.t.list0 +0 ./diff.sh .foo hash:ip,port,ip.t.list0 # Sleep 5s so that elements can time out 0 sleep 5 # List set -0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip,port,ip.t.list1 +0 ./diff.sh .foo hash:ip,port,ip.t.list1 # Flush test set 0 ipset flush test # Add multiple elements in one step diff --git a/tests/hash:ip,port,ip.t.list0 b/tests/hash:ip,port,ip.t.list0 index ab68f024..f34c24a9 100644 --- a/tests/hash:ip,port,ip.t.list0 +++ b/tests/hash:ip,port,ip.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Revision: 6 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x7713f039 Size in memory: 664 References: 0 Number of entries: 4 Members: -2.0.0.0,tcp:5,1.1.1.1 timeout x -2.0.0.1,tcp:5,1.1.1.1 timeout x -2.1.0.0,tcp:128,2.2.2.2 timeout x -2.1.0.1,tcp:128,2.2.2.2 timeout x +2.0.0.0,tcp:5,1.1.1.1 timeout 3 +2.0.0.1,tcp:5,1.1.1.1 timeout 3 +2.1.0.0,tcp:128,2.2.2.2 timeout 3 +2.1.0.1,tcp:128,2.2.2.2 timeout 3 diff --git a/tests/hash:ip,port,ip.t.list1 b/tests/hash:ip,port,ip.t.list1 index 9011673b..e81e0ec6 100644 --- a/tests/hash:ip,port,ip.t.list1 +++ b/tests/hash:ip,port,ip.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Revision: 6 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x87fc0d22 Size in memory: 664 References: 0 Number of entries: 0 diff --git a/tests/hash:ip,port,net.t b/tests/hash:ip,port,net.t index 487f5639..67d20b04 100644 --- a/tests/hash:ip,port,net.t +++ b/tests/hash:ip,port,net.t @@ -27,9 +27,9 @@ # Try to add value after second random value 0 ipset add test 2.1.0.1,128,10.0.0.0/17 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip,port,net.t.list0 +0 ./diff.sh .foo hash:ip,port,net.t.list0 # Sleep 5s so that elements can time out 0 sleep 5 # List set diff --git a/tests/hash:ip,port,net.t.list0 b/tests/hash:ip,port,net.t.list0 index ea46beb1..45ab21cb 100644 --- a/tests/hash:ip,port,net.t.list0 +++ b/tests/hash:ip,port,net.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:ip,port,net -Header: family inet hashsize 1024 maxelem 65536 timeout x bucketsize 12 -Size in memory: 840 +Revision: 8 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x882e1e10 +Size in memory: 920 References: 0 Number of entries: 4 Members: -2.0.0.0,tcp:5,192.168.0.0/25 timeout x -2.0.0.1,tcp:5,192.168.0.0/24 timeout x -2.1.0.0,tcp:128,10.0.0.0/16 timeout x -2.1.0.1,tcp:128,10.0.0.0/17 timeout x +2.0.0.0,tcp:5,192.168.0.0/25 timeout 3 +2.0.0.1,tcp:5,192.168.0.0/24 timeout 3 +2.1.0.0,tcp:128,10.0.0.0/16 timeout 3 +2.1.0.1,tcp:128,10.0.0.0/17 timeout 3 diff --git a/tests/hash:ip,port.t b/tests/hash:ip,port.t index aba8fdcf..7a0e8214 100644 --- a/tests/hash:ip,port.t +++ b/tests/hash:ip,port.t @@ -31,15 +31,15 @@ # Delete port by number 0 ipset del test 2.1.0.3,25 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip,port.t.list0 +0 ./diff.sh .foo hash:ip,port.t.list0 # Sleep 5s so that elements can time out 0 sleep 5 # List set -0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip,port.t.list1 +0 ./diff.sh .foo hash:ip,port.t.list1 # Flush test set 0 ipset flush test # Add multiple elements in one step @@ -73,9 +73,9 @@ # Delete element with sctp 0 ipset del test 2.0.0.1,sctp:80 # List set -0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip,port.t.list2 +0 ./diff.sh .foo hash:ip,port.t.list2 # Delete set 0 ipset destroy test # Create set to add a range diff --git a/tests/hash:ip,port.t.list0 b/tests/hash:ip,port.t.list0 index 1693e855..b1541f5f 100644 --- a/tests/hash:ip,port.t.list0 +++ b/tests/hash:ip,port.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Revision: 6 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0xf8e65168 Size in memory: 592 References: 0 Number of entries: 4 Members: -2.0.0.0,tcp:5 timeout x -2.0.0.1,tcp:5 timeout x -2.1.0.0,tcp:128 timeout x -2.1.0.1,tcp:128 timeout x +2.0.0.0,tcp:5 timeout 3 +2.0.0.1,tcp:5 timeout 3 +2.1.0.0,tcp:128 timeout 3 +2.1.0.1,tcp:128 timeout 3 diff --git a/tests/hash:ip,port.t.list1 b/tests/hash:ip,port.t.list1 index eaf7ff5e..4471ce6a 100644 --- a/tests/hash:ip,port.t.list1 +++ b/tests/hash:ip,port.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Revision: 6 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x881c5fa0 Size in memory: 592 References: 0 Number of entries: 0 diff --git a/tests/hash:ip,port.t.list2 b/tests/hash:ip,port.t.list2 index 75a5d235..ffaedb56 100644 --- a/tests/hash:ip,port.t.list2 +++ b/tests/hash:ip,port.t.list2 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 6 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x819addf6 Size in memory: 480 References: 0 Number of entries: 3 diff --git a/tests/hash:ip.t b/tests/hash:ip.t index 36b82f9c..32397015 100644 --- a/tests/hash:ip.t +++ b/tests/hash:ip.t @@ -19,15 +19,15 @@ # IP: Delete the same value 0 ipset -D test 200.100.0.12 # IP: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip.t.list2 +0 ./diff.sh .foo hash:ip.t.list2 # Sleep 5s so that element can time out 0 sleep 5 # IP: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip.t.list0 +0 ./diff.sh .foo hash:ip.t.list0 # IP: Flush test set 0 ipset -F test # IP: Add multiple elements in one step @@ -97,15 +97,15 @@ # Network: Delete the same network 0 ipset -D test 200.100.0.12 # Network: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Network: Check listing -0 diff -u -I 'Size in memory.*' -I 'Size in memory.*' .foo hash:ip.t.list3 +0 ./diff.sh .foo hash:ip.t.list3 # Sleep 5s so that elements can time out 0 sleep 5 # Network: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip.t.list1 +0 ./diff.sh .foo hash:ip.t.list1 # Network: Flush test set 0 ipset -F test # Network: add element with 1s timeout diff --git a/tests/hash:ip.t.list0 b/tests/hash:ip.t.list0 index 908cd188..efa642f4 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 4 bucketsize 12 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x00000000 Size in memory: 464 References: 0 Number of entries: 1 diff --git a/tests/hash:ip.t.list1 b/tests/hash:ip.t.list1 index f67ec085..5b832d9f 100644 --- a/tests/hash:ip.t.list1 +++ b/tests/hash:ip.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 4 bucketsize 12 +Revision: 5 +Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 4 bucketsize 12 initval 0xbc66e38a Size in memory: 528 References: 0 Number of entries: 1 diff --git a/tests/hash:ip.t.list2 b/tests/hash:ip.t.list2 index 9446f21c..3198a720 100644 --- a/tests/hash:ip.t.list2 +++ b/tests/hash:ip.t.list2 @@ -1,9 +1,10 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 timeout x bucketsize 12 +Revision: 5 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x3723bb8f Size in memory: 464 References: 0 Number of entries: 2 Members: -192.168.68.69 timeout x -2.0.0.1 timeout x +192.168.68.69 timeout 0 +2.0.0.1 timeout 3 diff --git a/tests/hash:ip.t.list3 b/tests/hash:ip.t.list3 index 661fcf48..a68b7311 100644 --- a/tests/hash:ip.t.list3 +++ b/tests/hash:ip.t.list3 @@ -1,10 +1,11 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout x bucketsize 12 +Revision: 5 +Header: family inet hashsize 128 maxelem 65536 netmask 24 timeout 4 bucketsize 12 initval 0xfe970e91 Size in memory: 528 References: 0 Number of entries: 3 Members: -192.168.68.0 timeout x -2.0.0.0 timeout x -200.100.10.0 timeout x +192.168.68.0 timeout 3 +2.0.0.0 timeout 3 +200.100.10.0 timeout 0 diff --git a/tests/hash:ip6,mark.t b/tests/hash:ip6,mark.t index 8f50acfd..af46d97e 100644 --- a/tests/hash:ip6,mark.t +++ b/tests/hash:ip6,mark.t @@ -27,15 +27,15 @@ # Try to add value after second random value 0 ipset add test 2:1:0::1,0x80 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6,mark.t.list0 +0 ./diff.sh .foo hash:ip6,mark.t.list0 # Sleep 5s so that elements can time out 0 sleep 5 # List set -0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6,mark.t.list1 +0 ./diff.sh .foo hash:ip6,mark.t.list1 # Delete test set 0 ipset destroy test # Create set to add a range diff --git a/tests/hash:ip6,mark.t.list0 b/tests/hash:ip6,mark.t.list0 index 1a644878..39a48f60 100644 --- a/tests/hash:ip6,mark.t.list0 +++ b/tests/hash:ip6,mark.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:ip,mark -Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Revision: 3 +Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x861e4c6a Size in memory: 736 References: 0 Number of entries: 4 Members: -2:1::,0x00000080 timeout x -2:1::1,0x00000080 timeout x -2::,0x00000005 timeout x -2::1,0x00000005 timeout x +2:1::,0x00000080 timeout 3 +2:1::1,0x00000080 timeout 3 +2::,0x00000005 timeout 3 +2::1,0x00000005 timeout 3 diff --git a/tests/hash:ip6,mark.t.list1 b/tests/hash:ip6,mark.t.list1 index 7fef4a94..b2c4dd23 100644 --- a/tests/hash:ip6,mark.t.list1 +++ b/tests/hash:ip6,mark.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Revision: 3 +Header: family inet6 markmask 0xffffffff hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x8e5240e7 Size in memory: 736 References: 0 Number of entries: 0 diff --git a/tests/hash:ip6,port,ip6.t b/tests/hash:ip6,port,ip6.t index e8a75f03..aaf6530a 100644 --- a/tests/hash:ip6,port,ip6.t +++ b/tests/hash:ip6,port,ip6.t @@ -35,15 +35,15 @@ # Try to add value after second random value 0 ipset add test 2:1:0::1,128,2:2:2::2 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6,port,ip6.t.list0 +0 ./diff.sh .foo hash:ip6,port,ip6.t.list0 # Sleep 5s so that elements can time out 0 sleep 5 # List set -0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6,port,ip6.t.list1 +0 ./diff.sh .foo hash:ip6,port,ip6.t.list1 # Flush test set 0 ipset flush test # Add multiple elements in one step diff --git a/tests/hash:ip6,port,ip6.t.list0 b/tests/hash:ip6,port,ip6.t.list0 index 1594411c..a7aaced1 100644 --- a/tests/hash:ip6,port,ip6.t.list0 +++ b/tests/hash:ip6,port,ip6.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:ip,port,ip -Header: family inet6 hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Revision: 6 +Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0xae2818a9 Size in memory: 880 References: 0 Number of entries: 4 Members: -2:1::,tcp:128,2:2:2::2 timeout x -2:1::1,tcp:128,2:2:2::2 timeout x -2::,tcp:5,1:1:1::1 timeout x -2::1,tcp:5,1:1:1::1 timeout x +2:1::,tcp:128,2:2:2::2 timeout 3 +2:1::1,tcp:128,2:2:2::2 timeout 3 +2::,tcp:5,1:1:1::1 timeout 3 +2::1,tcp:5,1:1:1::1 timeout 3 diff --git a/tests/hash:ip6,port,ip6.t.list1 b/tests/hash:ip6,port,ip6.t.list1 index afd5f681..1e735c1f 100644 --- a/tests/hash:ip6,port,ip6.t.list1 +++ b/tests/hash:ip6,port,ip6.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port,ip -Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Revision: 6 +Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0xb9a9f4a5 Size in memory: 880 References: 0 Number of entries: 0 diff --git a/tests/hash:ip6,port,net6.t b/tests/hash:ip6,port,net6.t index 23a5da04..71dfa619 100644 --- a/tests/hash:ip6,port,net6.t +++ b/tests/hash:ip6,port,net6.t @@ -35,9 +35,9 @@ # Range: Try to add value after second random value 0 ipset -A test 2:1:0::1,128,2:2:2::2/12 # Range: List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6,port,net6.t.list0 +0 ./diff.sh .foo hash:ip6,port,net6.t.list0 # Range: Flush test set 0 ipset -F test # Range: Delete test set diff --git a/tests/hash:ip6,port,net6.t.list0 b/tests/hash:ip6,port,net6.t.list0 index e18056b5..3e92bee6 100644 --- a/tests/hash:ip6,port,net6.t.list0 +++ b/tests/hash:ip6,port,net6.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port,net -Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 8 +Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 initval 0xa5d3d0fa Size in memory: 1808 References: 0 Number of entries: 4 diff --git a/tests/hash:ip6,port.t b/tests/hash:ip6,port.t index a47ca6e5..e56e39c5 100644 --- a/tests/hash:ip6,port.t +++ b/tests/hash:ip6,port.t @@ -27,15 +27,15 @@ # Try to add value after second random value 0 ipset add test 2:1:0::1,128 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6,port.t.list0 +0 ./diff.sh .foo hash:ip6,port.t.list0 # Sleep 5s so that elements can time out 0 sleep 5 # List set -0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6,port.t.list1 +0 ./diff.sh .foo hash:ip6,port.t.list1 # Flush test set 0 ipset flush test # Add multiple elements in one step diff --git a/tests/hash:ip6,port.t.list0 b/tests/hash:ip6,port.t.list0 index 13a94eb9..9fca34ae 100644 --- a/tests/hash:ip6,port.t.list0 +++ b/tests/hash:ip6,port.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:ip,port -Header: family inet6 hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Revision: 6 +Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x013bd339 Size in memory: 736 References: 0 Number of entries: 4 Members: -2:1::,tcp:128 timeout x -2:1::1,tcp:128 timeout x -2::,tcp:5 timeout x -2::1,tcp:5 timeout x +2:1::,tcp:128 timeout 3 +2:1::1,tcp:128 timeout 3 +2::,tcp:5 timeout 3 +2::1,tcp:5 timeout 3 diff --git a/tests/hash:ip6,port.t.list1 b/tests/hash:ip6,port.t.list1 index f956f3e1..46fdea20 100644 --- a/tests/hash:ip6,port.t.list1 +++ b/tests/hash:ip6,port.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 +Revision: 6 +Header: family inet6 hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0x9f983aa9 Size in memory: 736 References: 0 Number of entries: 0 diff --git a/tests/hash:ip6.t b/tests/hash:ip6.t index 5edc267f..52175a5a 100644 --- a/tests/hash:ip6.t +++ b/tests/hash:ip6.t @@ -21,25 +21,25 @@ # IP: Delete the same value 0 ipset -D test 200:100:0::12 # IP: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list2 +0 ./diff.sh .foo hash:ip6.t.list2 # IP: Save set 0 ipset save test > hash:ip6.t.restore # Sleep 5s so that element can time out 0 sleep 5 # IP: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list0 +0 ./diff.sh .foo hash:ip6.t.list0 # IP: Destroy set 0 ipset x test # IP: Restore saved set 0 ipset restore < hash:ip6.t.restore && rm hash:ip6.t.restore # IP: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list2 +0 ./diff.sh .foo hash:ip6.t.list2 # IP: Flush test set 0 ipset -F test # IP: Try to add multiple elements in one step @@ -73,15 +73,15 @@ # Network: Test the deleted network 1 ipset -T test 200:101:0::12 # Network: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list3 +0 ./diff.sh .foo hash:ip6.t.list3 # Sleep 5s so that elements can time out 0 sleep 5 # Network: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:ip6.t.list1 +0 ./diff.sh .foo hash:ip6.t.list1 # Network: Flush test set 0 ipset -F test # Network: Delete test set @@ -89,13 +89,13 @@ # Check more complex restore commands 0 ipset restore < restore.t.restore # List restored set a -0 ipset l a | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset l a > .foo0 && ./sort.sh .foo0 # Check listing of set a -0 diff -u -I 'Size in memory.*' .foo restore.t.list0 +0 ./diff.sh .foo restore.t.list0 # List restored set b -0 ipset l b | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset l b > .foo0 && ./sort.sh .foo0 # Check listing of set b -0 diff -u -I 'Size in memory.*' .foo restore.t.list1 +0 ./diff.sh .foo restore.t.list1 # Destroy by restore 0 ipset restore < restore.t.destroy # Timeout: Check that resizing keeps timeout values diff --git a/tests/hash:ip6.t.list0 b/tests/hash:ip6.t.list0 index 8c8958a4..7dbe3ddc 100644 --- a/tests/hash:ip6.t.list0 +++ b/tests/hash:ip6.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Revision: 5 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0xb377cb25 Size in memory: 504 References: 0 Number of entries: 1 diff --git a/tests/hash:ip6.t.list1 b/tests/hash:ip6.t.list1 index 432f5804..c839bea6 100644 --- a/tests/hash:ip6.t.list1 +++ b/tests/hash:ip6.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 4 bucketsize 12 +Revision: 5 +Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 4 bucketsize 12 initval 0xc4b28af2 Size in memory: 584 References: 0 Number of entries: 1 diff --git a/tests/hash:ip6.t.list2 b/tests/hash:ip6.t.list2 index f1636970..d3045ea1 100644 --- a/tests/hash:ip6.t.list2 +++ b/tests/hash:ip6.t.list2 @@ -1,9 +1,10 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 timeout x bucketsize 12 +Revision: 5 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x4f3db7cd Size in memory: 504 References: 0 Number of entries: 2 Members: -192:168:68::69 timeout x -2::1 timeout x +192:168:68::69 timeout 0 +2::1 timeout 3 diff --git a/tests/hash:ip6.t.list3 b/tests/hash:ip6.t.list3 index 574ebc12..9becbe50 100644 --- a/tests/hash:ip6.t.list3 +++ b/tests/hash:ip6.t.list3 @@ -1,10 +1,11 @@ Name: test Type: hash:ip -Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout x bucketsize 12 -Size in memory: 584 +Revision: 5 +Header: family inet6 hashsize 128 maxelem 65536 netmask 64 timeout 4 bucketsize 12 initval 0xcc03ae18 +Size in memory: 504 References: 0 Number of entries: 3 Members: -192:168:68:: timeout x -200:100:10:: timeout x -2:: timeout x +192:168:68:: timeout 3 +200:100:10:: timeout 0 +2:: timeout 3 diff --git a/tests/hash:mac.t b/tests/hash:mac.t index 361bf589..9192af06 100644 --- a/tests/hash:mac.t +++ b/tests/hash:mac.t @@ -19,15 +19,15 @@ # MAC: Delete the same value 0 ipset -D test 1:2:3:4:a:b # MAC: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # MAC: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:mac.t.list2 +0 ./diff.sh .foo hash:mac.t.list2 # Sleep 5s so that element can time out 0 sleep 5 # MAC: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # MAC: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:mac.t.list0 +0 ./diff.sh .foo hash:mac.t.list0 # MAC: Destroy test set 0 ipset -X test # MAC: Create a set with skbinfo extension @@ -45,9 +45,9 @@ # MAC: Add element with mark, skbprio and skbqueue 0 ipset a test 1:2:3:4:5:11 skbmark 0x11223344/0xffff0000 skbprio 2:1 skbqueue 8 # MAC: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # MAC: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:mac.t.list1 +0 ./diff.sh .foo hash:mac.t.list1 # MAC: Destroy test set 0 ipset -X test # MAC: Create a set with small maxelem parameter @@ -63,9 +63,9 @@ # MAC: Add second element with another extension value 0 ipset -! a test 1:2:3:4:5:7 skbprio 1:12 skbqueue 8 # MAC: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # MAC: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:mac.t.list3 +0 ./diff.sh .foo hash:mac.t.list3 # MAC: Destroy test set 0 ipset x test # eof diff --git a/tests/hash:mac.t.list0 b/tests/hash:mac.t.list0 index e444c48f..2c381ff1 100644 --- a/tests/hash:mac.t.list0 +++ b/tests/hash:mac.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:mac -Header: hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Revision: 1 +Header: hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x851b9eb1 Size in memory: 464 References: 0 Number of entries: 1 diff --git a/tests/hash:mac.t.list1 b/tests/hash:mac.t.list1 index 1760e553..d464f74a 100644 --- a/tests/hash:mac.t.list1 +++ b/tests/hash:mac.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:mac -Header: hashsize 1024 maxelem 65536 skbinfo bucketsize 12 +Revision: 1 +Header: hashsize 1024 maxelem 65536 skbinfo bucketsize 12 initval 0x5698af00 Size in memory: 816 References: 0 Number of entries: 6 diff --git a/tests/hash:mac.t.list2 b/tests/hash:mac.t.list2 index 4c3707cc..bc7ecb02 100644 --- a/tests/hash:mac.t.list2 +++ b/tests/hash:mac.t.list2 @@ -1,9 +1,10 @@ Name: test Type: hash:mac -Header: hashsize 128 maxelem 65536 timeout x bucketsize 12 +Revision: 1 +Header: hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x60a630a7 Size in memory: 464 References: 0 Number of entries: 2 Members: -00:00:00:00:02:00 timeout x -00:0A:00:00:00:00 timeout x +00:00:00:00:02:00 timeout 3 +00:0A:00:00:00:00 timeout 0 diff --git a/tests/hash:mac.t.list3 b/tests/hash:mac.t.list3 index 233a56d4..cc023143 100644 --- a/tests/hash:mac.t.list3 +++ b/tests/hash:mac.t.list3 @@ -1,6 +1,7 @@ Name: test Type: hash:mac -Header: hashsize 1024 maxelem 2 skbinfo bucketsize 12 +Revision: 1 +Header: hashsize 1024 maxelem 2 skbinfo bucketsize 12 initval 0x7c818884 Size in memory: 496 References: 0 Number of entries: 2 diff --git a/tests/hash:net,iface.t b/tests/hash:net,iface.t index a847357a..e594ccaf 100644 --- a/tests/hash:net,iface.t +++ b/tests/hash:net,iface.t @@ -41,9 +41,9 @@ # Try to add IP address 0 ipset add test 2.0.0.1,eth0 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,iface.t.list0 +0 ./diff.sh .foo hash:net,iface.t.list0 # Flush test set 0 ipset flush test # Delete test set @@ -53,9 +53,9 @@ # Add networks in range notation 0 ipset add test 10.2.0.0-10.2.1.12,eth0 # List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,iface.t.list2 +0 ./diff.sh .foo hash:net,iface.t.list2 # Flush test set 0 ipset flush test # Add 0/0,eth0 @@ -117,9 +117,9 @@ # Add overlapping networks from /4 to /30 0 (set -e; for x in `seq 4 30`; do ipset add test 192.0.0.0/$x,eth$x; done) # List test set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,iface.t.list1 +0 ./diff.sh .foo hash:net,iface.t.list1 # Test matching elements in all added networks from /30 to /24 0 (set -e; y=2; for x in `seq 24 30 | tac`; do ipset test test 192.0.0.$y,eth$x; y=$((y*2)); done) # Test non-matching elements in all added networks from /30 to /24 diff --git a/tests/hash:net,iface.t.list0 b/tests/hash:net,iface.t.list0 index fa2e5ef6..aeb3c520 100644 --- a/tests/hash:net,iface.t.list0 +++ b/tests/hash:net,iface.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:net,iface -Header: family inet hashsize 128 maxelem 65536 bucketsize 12 +Revision: 8 +Header: family inet hashsize 128 maxelem 65536 bucketsize 12 initval 0x9b9671af Size in memory: 976 References: 0 Number of entries: 4 diff --git a/tests/hash:net,iface.t.list1 b/tests/hash:net,iface.t.list1 index fabc3a72..bf07a732 100644 --- a/tests/hash:net,iface.t.list1 +++ b/tests/hash:net,iface.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:net,iface -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 8 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x79761aac Size in memory: 3000 References: 0 Number of entries: 27 diff --git a/tests/hash:net,iface.t.list2 b/tests/hash:net,iface.t.list2 index 6185742d..5dc128aa 100644 --- a/tests/hash:net,iface.t.list2 +++ b/tests/hash:net,iface.t.list2 @@ -1,6 +1,7 @@ Name: test Type: hash:net,iface -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 8 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0xb61bc401 Size in memory: 976 References: 0 Number of entries: 4 diff --git a/tests/hash:net,net.t b/tests/hash:net,net.t index 13f11981..feb13d96 100644 --- a/tests/hash:net,net.t +++ b/tests/hash:net,net.t @@ -33,15 +33,15 @@ # Try to add IP address 0 ipset add test 2.0.0.1,2.0.0.2 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,net.t.list0 +0 ./diff.sh .foo hash:net,net.t.list0 # Sleep 5s so that element can time out 0 sleep 5 # List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,net.t.list1 +0 ./diff.sh .foo hash:net,net.t.list1 # Flush test set 0 ipset flush test # Delete test set @@ -51,9 +51,9 @@ # Add networks in range notation 0 ipset add test 10.2.0.0-10.2.1.12,10.3.0.0-10.3.1.12 # List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,net.t.list2 +0 ./diff.sh .foo hash:net,net.t.list2 # Delete test set 0 ipset destroy test # Stress test with range notation diff --git a/tests/hash:net,net.t.list0 b/tests/hash:net,net.t.list0 index c2d00ade..14be3c21 100644 --- a/tests/hash:net,net.t.list0 +++ b/tests/hash:net,net.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:net,net -Header: family inet hashsize 128 maxelem 65536 timeout x bucketsize 12 +Revision: 3 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x24629b16 Size in memory: 1048 References: 0 Number of entries: 4 Members: -1.1.1.1,1.1.1.2 timeout x -192.168.68.64/27,192.168.129.64/27 timeout x -2.0.0.0/24,2.0.1.0/24 timeout x -2.0.0.1,2.0.0.2 timeout x +1.1.1.1,1.1.1.2 timeout 3 +192.168.68.64/27,192.168.129.64/27 timeout 3 +2.0.0.0/24,2.0.1.0/24 timeout 3 +2.0.0.1,2.0.0.2 timeout 3 diff --git a/tests/hash:net,net.t.list1 b/tests/hash:net,net.t.list1 index 8e974860..7f1a1b61 100644 --- a/tests/hash:net,net.t.list1 +++ b/tests/hash:net,net.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:net,net -Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Revision: 3 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0xff0645fb Size in memory: 1048 References: 0 Number of entries: 0 diff --git a/tests/hash:net,net.t.list2 b/tests/hash:net,net.t.list2 index f47a7f55..bb8d6636 100644 --- a/tests/hash:net,net.t.list2 +++ b/tests/hash:net,net.t.list2 @@ -1,6 +1,7 @@ Name: test Type: hash:net,net -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 3 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x957a74a3 Size in memory: 1752 References: 0 Number of entries: 16 diff --git a/tests/hash:net,port,net.t b/tests/hash:net,port,net.t index 0e92f5ba..f5a578ab 100644 --- a/tests/hash:net,port,net.t +++ b/tests/hash:net,port,net.t @@ -27,9 +27,9 @@ # Try to add value after second random value 0 ipset add test 2.1.0.1,128,10.0.0.0/17 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,port,net.t.list0 +0 ./diff.sh .foo hash:net,port,net.t.list0 # Sleep 5s so that elements can time out 0 sleep 5 # List set diff --git a/tests/hash:net,port,net.t.list0 b/tests/hash:net,port,net.t.list0 index bc3e7fa1..166b6021 100644 --- a/tests/hash:net,port,net.t.list0 +++ b/tests/hash:net,port,net.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:net,port,net -Header: family inet hashsize 1024 maxelem 65536 timeout x bucketsize 12 +Revision: 3 +Header: family inet hashsize 1024 maxelem 65536 timeout 4 bucketsize 12 initval 0xf441dd10 Size in memory: 1048 References: 0 Number of entries: 4 Members: -2.0.0.0/24,tcp:5,192.168.0.0/24 timeout x -2.0.0.0/24,tcp:5,192.168.0.0/25 timeout x -2.1.0.0/24,tcp:128,10.0.0.0/16 timeout x -2.1.0.1,tcp:128,10.0.0.0/17 timeout x +2.0.0.0/24,tcp:5,192.168.0.0/24 timeout 3 +2.0.0.0/24,tcp:5,192.168.0.0/25 timeout 3 +2.1.0.0/24,tcp:128,10.0.0.0/16 timeout 3 +2.1.0.1,tcp:128,10.0.0.0/17 timeout 3 diff --git a/tests/hash:net,port.t b/tests/hash:net,port.t index 5424ff7f..5a850e63 100644 --- a/tests/hash:net,port.t +++ b/tests/hash:net,port.t @@ -41,15 +41,15 @@ # Test ICMP by name 0 ipset test test 2.0.0.255,icmp:host-prohibited # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,port.t.list0 +0 ./diff.sh .foo hash:net,port.t.list0 # Sleep 5s so that element can time out 0 sleep 5 # IP: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net,port.t.list1 +0 ./diff.sh .foo hash:net,port.t.list1 # Flush test set 0 ipset flush test # Add multiple elements in one step diff --git a/tests/hash:net,port.t.list0 b/tests/hash:net,port.t.list0 index 727f07f1..afb7215c 100644 --- a/tests/hash:net,port.t.list0 +++ b/tests/hash:net,port.t.list0 @@ -1,12 +1,13 @@ Name: test Type: hash:net,port -Header: family inet hashsize 128 maxelem 65536 timeout x bucketsize 12 +Revision: 8 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x34b03146 Size in memory: 912 References: 0 Number of entries: 5 Members: -1.1.1.1,tcp:5 timeout x -192.168.68.64/27,tcp:8 timeout x -2.0.0.0/24,icmp:echo-request timeout x -2.0.0.1,icmp:echo-request timeout x -2.0.0.255,icmp:host-prohibited timeout x +1.1.1.1,tcp:5 timeout 3 +192.168.68.64/27,tcp:8 timeout 3 +2.0.0.0/24,icmp:echo-request timeout 3 +2.0.0.1,icmp:echo-request timeout 2 +2.0.0.255,icmp:host-prohibited timeout 3 diff --git a/tests/hash:net,port.t.list1 b/tests/hash:net,port.t.list1 index 4f17cf4e..4ee3e5ba 100644 --- a/tests/hash:net,port.t.list1 +++ b/tests/hash:net,port.t.list1 @@ -1,7 +1,8 @@ Name: test Type: hash:net,port -Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 -Size in memory: 912 +Revision: 8 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0xad2d00b2 +Size in memory: 784 References: 0 Number of entries: 0 Members: diff --git a/tests/hash:net.t b/tests/hash:net.t index 501f63eb..c74ace1e 100644 --- a/tests/hash:net.t +++ b/tests/hash:net.t @@ -33,15 +33,15 @@ # Try to add IP address 0 ipset add test 2.0.0.1 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net.t.list0 +0 ./diff.sh .foo hash:net.t.list0 # Sleep 5s so that element can time out 0 sleep 5 # List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net.t.list1 +0 ./diff.sh .foo hash:net.t.list1 # Flush test set 0 ipset flush test # Delete test set @@ -51,9 +51,9 @@ # Add networks in range notation 0 ipset add test 10.2.0.0-10.2.1.12 # List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net.t.list2 +0 ./diff.sh .foo hash:net.t.list2 # Delete test set 0 ipset destroy test # Stress test with range notation @@ -127,9 +127,9 @@ # Add more than 2^31 elements in a range 0 ipset a test 0.0.0.0-128.0.0.1 # List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net.t.list3 +0 ./diff.sh .foo hash:net.t.list3 # Delete test set 0 ipset destroy test # Counters: create set diff --git a/tests/hash:net.t.list0 b/tests/hash:net.t.list0 index 60fc10ae..fbab9612 100644 --- a/tests/hash:net.t.list0 +++ b/tests/hash:net.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 timeout x bucketsize 12 +Revision: 7 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0xb6f1b3fa Size in memory: 848 References: 0 Number of entries: 4 Members: -1.1.1.1 timeout x -192.168.68.64/27 timeout x -2.0.0.0/24 timeout x -2.0.0.1 timeout x +1.1.1.1 timeout 3 +192.168.68.64/27 timeout 3 +2.0.0.0/24 timeout 3 +2.0.0.1 timeout 3 diff --git a/tests/hash:net.t.list1 b/tests/hash:net.t.list1 index 6409a7c0..afa8f0e4 100644 --- a/tests/hash:net.t.list1 +++ b/tests/hash:net.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Revision: 7 +Header: family inet hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x9d02405f Size in memory: 848 References: 0 Number of entries: 0 diff --git a/tests/hash:net.t.list2 b/tests/hash:net.t.list2 index 1ebef49d..94bb184d 100644 --- a/tests/hash:net.t.list2 +++ b/tests/hash:net.t.list2 @@ -1,6 +1,7 @@ Name: test Type: hash:net -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 7 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0xadbf55c3 Size in memory: 784 References: 0 Number of entries: 4 diff --git a/tests/hash:net.t.list3 b/tests/hash:net.t.list3 index 8f3e6d8e..7b211853 100644 --- a/tests/hash:net.t.list3 +++ b/tests/hash:net.t.list3 @@ -1,6 +1,7 @@ Name: test Type: hash:net -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 7 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0xb5f93250 Size in memory: 688 References: 0 Number of entries: 2 diff --git a/tests/hash:net6,net6.t b/tests/hash:net6,net6.t index 57f8b2a3..257d142d 100644 --- a/tests/hash:net6,net6.t +++ b/tests/hash:net6,net6.t @@ -33,15 +33,15 @@ # Try to add IP address 0 ipset add test 3:0:0::1,8:0:0::1 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net6,net6.t.list0 +0 ./diff.sh .foo hash:net6,net6.t.list0 # Sleep 5s so that element can time out 0 sleep 5 # IP: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net6,net6.t.list1 +0 ./diff.sh .foo hash:net6,net6.t.list1 # Flush test set 0 ipset flush test # Add matching IP address entry diff --git a/tests/hash:net6,net6.t.list0 b/tests/hash:net6,net6.t.list0 index 7456b6b6..93d3aeb6 100644 --- a/tests/hash:net6,net6.t.list0 +++ b/tests/hash:net6,net6.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:net,net -Header: family inet6 hashsize 128 maxelem 65536 timeout x bucketsize 12 +Revision: 3 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x4f7b512c Size in memory: 2416 References: 0 Number of entries: 4 Members: -192:160::/27,172:16:68::/48 timeout x -1:1:1::1,2:2:2::2 timeout x -2::/24,4::/32 timeout x -3::1,8::1 timeout x +192:160::/27,172:16:68::/48 timeout 3 +1:1:1::1,2:2:2::2 timeout 3 +2::/24,4::/32 timeout 3 +3::1,8::1 timeout 3 diff --git a/tests/hash:net6,net6.t.list1 b/tests/hash:net6,net6.t.list1 index 2fde68c8..3aad97e4 100644 --- a/tests/hash:net6,net6.t.list1 +++ b/tests/hash:net6,net6.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:net,net -Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Revision: 3 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x3ab35d63 Size in memory: 2416 References: 0 Number of entries: 0 diff --git a/tests/hash:net6,port,net6.t b/tests/hash:net6,port,net6.t index 5793b2d4..7ec737ec 100644 --- a/tests/hash:net6,port,net6.t +++ b/tests/hash:net6,port,net6.t @@ -41,9 +41,9 @@ # Range: Try to add value after second random value 0 ipset -A test 2:1:0::1,128,2:2:2::2/12 # Range: List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net6,port,net6.t.list0 +0 ./diff.sh .foo hash:net6,port,net6.t.list0 # Range: Flush test set 0 ipset -F test # Range: Delete test set diff --git a/tests/hash:net6,port,net6.t.list0 b/tests/hash:net6,port,net6.t.list0 index f8e091e7..3777d545 100644 --- a/tests/hash:net6,port,net6.t.list0 +++ b/tests/hash:net6,port,net6.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:net,port,net -Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 3 +Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 initval 0x5b5fdcc8 Size in memory: 2352 References: 0 Number of entries: 4 diff --git a/tests/hash:net6,port.t b/tests/hash:net6,port.t index e3e65848..a9a0f907 100644 --- a/tests/hash:net6,port.t +++ b/tests/hash:net6,port.t @@ -41,25 +41,25 @@ # Test ICMPv6 by name 0 ipset test test 192:168:68::95,icmpv6:port-unreachable # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Save set 0 ipset save test > hash:net6,port.t.restore # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net6,port.t.list0 +0 ./diff.sh .foo hash:net6,port.t.list0 # Sleep 5s so that element can time out 0 sleep 5 # IP: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net6,port.t.list1 +0 ./diff.sh .foo hash:net6,port.t.list1 # Destroy set 0 ipset x test # Restore set 0 ipset restore < hash:net6,port.t.restore && rm hash:net6,port.t.restore # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net6,port.t.list0 +0 ./diff.sh .foo hash:net6,port.t.list0 # Flush test set 0 ipset flush test # Add multiple elements in one step diff --git a/tests/hash:net6,port.t.list0 b/tests/hash:net6,port.t.list0 index 6c80999d..ec3dae64 100644 --- a/tests/hash:net6,port.t.list0 +++ b/tests/hash:net6,port.t.list0 @@ -1,12 +1,13 @@ Name: test Type: hash:net,port -Header: family inet6 hashsize 128 maxelem 65536 timeout x bucketsize 12 +Revision: 8 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0xf2b7e0da Size in memory: 1856 References: 0 Number of entries: 5 Members: -192:160::/27,ipv6-icmp:echo-request timeout x -192:168:68::95,ipv6-icmp:port-unreachable timeout x -1:1:1::1,tcp:8 timeout x -2::/24,tcp:8 timeout x -3::1,tcp:8 timeout x +192:160::/27,ipv6-icmp:echo-request timeout 3 +192:168:68::95,ipv6-icmp:port-unreachable timeout 3 +1:1:1::1,tcp:8 timeout 0 +2::/24,tcp:8 timeout 3 +3::1,tcp:8 timeout 3 diff --git a/tests/hash:net6,port.t.list1 b/tests/hash:net6,port.t.list1 index a2044ce5..b3a8c005 100644 --- a/tests/hash:net6,port.t.list1 +++ b/tests/hash:net6,port.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:net,port -Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Revision: 8 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x799a2fc6 Size in memory: 1856 References: 0 Number of entries: 1 diff --git a/tests/hash:net6.t b/tests/hash:net6.t index 7a476550..67ef33e2 100644 --- a/tests/hash:net6.t +++ b/tests/hash:net6.t @@ -33,15 +33,15 @@ # Try to add IP address 0 ipset add test 3:0:0::1 # List set -0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +0 ipset list test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net6.t.list0 +0 ./diff.sh .foo hash:net6.t.list0 # Sleep 5s so that element can time out 0 sleep 5 # IP: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo hash:net6.t.list1 +0 ./diff.sh .foo hash:net6.t.list1 # Flush test set 0 ipset flush test # Delete test set diff --git a/tests/hash:net6.t.list0 b/tests/hash:net6.t.list0 index 06530aa1..c78fb3a5 100644 --- a/tests/hash:net6.t.list0 +++ b/tests/hash:net6.t.list0 @@ -1,11 +1,12 @@ Name: test Type: hash:net -Header: family inet6 hashsize 128 maxelem 65536 timeout x bucketsize 12 +Revision: 7 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0xd3799c51 Size in memory: 1760 References: 0 Number of entries: 4 Members: -192:160::/27 timeout x -1:1:1::1 timeout x -2::/24 timeout x -3::1 timeout x +192:160::/27 timeout 3 +1:1:1::1 timeout 3 +2::/24 timeout 3 +3::1 timeout 3 diff --git a/tests/hash:net6.t.list1 b/tests/hash:net6.t.list1 index 4d248d50..e0a08ec8 100644 --- a/tests/hash:net6.t.list1 +++ b/tests/hash:net6.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:net -Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 +Revision: 7 +Header: family inet6 hashsize 128 maxelem 65536 timeout 4 bucketsize 12 initval 0x1fb859e4 Size in memory: 1760 References: 0 Number of entries: 0 diff --git a/tests/ignore.sh b/tests/ignore.sh new file mode 100755 index 00000000..9d458e30 --- /dev/null +++ b/tests/ignore.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +grep -v Revision: $1 | sed 's/initval 0x[0-9a-fA-F]\{8\}/initval 0x00000000/' > .foo +rm $1 diff --git a/tests/iphash.t b/tests/iphash.t index 03932955..4d651139 100644 --- a/tests/iphash.t +++ b/tests/iphash.t @@ -23,9 +23,9 @@ # IP: Delete element not added to the set, ignoring error 0 ipset -! -D test 200.100.0.12 # IP: List set -0 ipset -L test 2>/dev/null | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # IP: Check listing -0 diff -u -I 'Size in memory.*' .foo iphash.t.list0 +0 ./diff.sh .foo iphash.t.list0 # IP: Flush test set 0 ipset -F test # IP: Delete test set @@ -53,9 +53,9 @@ # IP: Add more entries to the second set 0 tail -n +2 iphash.t.restore | sed -e 's/test/test2/' -e 's/ 10/ 30/' | ipset r # IP: Save sets -0 ipset -s -f .foo.1 save +0 ipset -s -f .foo0 save && ./ignore.sh .foo0 # IP: Compare sorted save and restore -0 cmp .foo.1 iphash.t.restore.sorted +0 cmp .foo iphash.t.restore.sorted # IP: Delete test set 0 ipset x test # IP: Delete test2 set @@ -63,9 +63,9 @@ # IP: Restore, which requires multiple messages 0 ipset restore < iphash.t.large # IP: Save the restored set -0 ipset save test | sort > .foo.1 +0 (ipset save test | sort > .foo.1) && ./ignore.sh .foo.1 # IP: Compare save and restore -0 (sort iphash.t.large > .foo.2) && (cmp .foo.1 .foo.2) +0 (sort iphash.t.large > .foo.2) && (cmp .foo .foo.2) # IP: Delete all elements, one by one 0 ipset list test | sed '1,/Members/d' | xargs -n1 ipset del test # IP: Delete test set @@ -95,9 +95,9 @@ # Network: Delete element not added to the set 1 ipset -D test 200.100.0.12 # Network: List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo iphash.t.list1 +0 ./diff.sh .foo iphash.t.list1 # Network: Flush test set 0 ipset -F test # Network: Delete test set diff --git a/tests/iphash.t.large b/tests/iphash.t.large index 73c61e40..dc36b2fc 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 bucketsize 12 +create test hash:ip family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x00000000 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 b8e34968..3403b824 100644 --- a/tests/iphash.t.list0 +++ b/tests/iphash.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet hashsize 128 maxelem 65536 bucketsize 12 initval 0x9806dfda Size in memory: 416 References: 0 Number of entries: 2 diff --git a/tests/iphash.t.list1 b/tests/iphash.t.list1 index 4a3c8d14..4ff0d697 100644 --- a/tests/iphash.t.list1 +++ b/tests/iphash.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip -Header: family inet hashsize 128 maxelem 65536 netmask 24 bucketsize 12 +Revision: 5 +Header: family inet hashsize 128 maxelem 65536 netmask 24 bucketsize 12 initval 0x3bfba4f0 Size in memory: 416 References: 0 Number of entries: 2 diff --git a/tests/iphash.t.restore.sorted b/tests/iphash.t.restore.sorted index 4b7ff6dd..2cdd9918 100644 --- a/tests/iphash.t.restore.sorted +++ b/tests/iphash.t.restore.sorted @@ -1,4 +1,4 @@ -create test hash:ip family inet hashsize 128 maxelem 65536 bucketsize 12 +create test hash:ip family inet hashsize 128 maxelem 65536 bucketsize 12 initval 0x00000000 add test 10.0.0.0 add test 10.0.0.1 add test 10.0.0.2 @@ -128,7 +128,7 @@ add test 10.0.0.125 add test 10.0.0.126 add test 10.0.0.127 add test 10.0.0.128 -create test2 hash:ip family inet hashsize 128 maxelem 65536 bucketsize 12 +create test2 hash:ip family inet hashsize 128 maxelem 65536 bucketsize 12 initval 0x00000000 add test2 20.0.0.0 add test2 20.0.0.1 add test2 20.0.0.2 diff --git a/tests/ipmap.t b/tests/ipmap.t index 7ae141c0..8e90dc2d 100644 --- a/tests/ipmap.t +++ b/tests/ipmap.t @@ -49,15 +49,15 @@ # Range: Restore set 0 ipset -R < ipmap.t.restore && rm ipmap.t.restore # Range: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo ipmap.t.list0 +0 ./diff.sh .foo ipmap.t.list0 # Range: Delete a range of elements 0 ipset -! -D test 2.0.0.128-2.0.0.132 # Range: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo ipmap.t.list1 +0 ./diff.sh .foo ipmap.t.list1 # Range: Flush test set 0 ipset -F test # Range: Delete test set @@ -91,9 +91,9 @@ # Network: Delete the same element 0 ipset -D test 2.0.0.128 # Network: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo ipmap.t.list2 +0 ./diff.sh .foo ipmap.t.list2 # Network: Flush test set 0 ipset -F test # Network: Delete test set @@ -127,9 +127,9 @@ # Subnets: Add a subnet of subnets 0 ipset -A test 10.8.0.0/16 # Subnets: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Subnets: Check listing -0 diff -u -I 'Size in memory.*' .foo ipmap.t.list3 +0 ./diff.sh .foo ipmap.t.list3 # Subnets: FLush test set 0 ipset -F test # Subnets: Delete test set @@ -153,9 +153,9 @@ # Full: Delete same element 0 ipset -D test 0.1.0.0 # Full: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Full: Check listing -0 diff -u -I 'Size in memory.*' .foo ipmap.t.list4 +0 ./diff.sh .foo ipmap.t.list4 # Full: Delete test set 0 ipset -X test # eof diff --git a/tests/ipmap.t.list0 b/tests/ipmap.t.list0 index d3b99a89..d2a76819 100644 --- a/tests/ipmap.t.list0 +++ b/tests/ipmap.t.list0 @@ -1,7 +1,8 @@ Name: test Type: bitmap:ip +Revision: 3 Header: range 2.0.0.1-2.1.0.0 -Size in memory: 8352 +Size in memory: 8320 References: 0 Number of entries: 6 Members: diff --git a/tests/ipmap.t.list1 b/tests/ipmap.t.list1 index f9b311dd..6a97b101 100644 --- a/tests/ipmap.t.list1 +++ b/tests/ipmap.t.list1 @@ -1,7 +1,8 @@ Name: test Type: bitmap:ip +Revision: 3 Header: range 2.0.0.1-2.1.0.0 -Size in memory: 8352 +Size in memory: 8320 References: 0 Number of entries: 2 Members: diff --git a/tests/ipmap.t.list2 b/tests/ipmap.t.list2 index c2c56913..6fc78b5d 100644 --- a/tests/ipmap.t.list2 +++ b/tests/ipmap.t.list2 @@ -1,7 +1,8 @@ Name: test Type: bitmap:ip +Revision: 3 Header: range 2.0.0.0-2.0.255.255 -Size in memory: 8352 +Size in memory: 8320 References: 0 Number of entries: 2 Members: diff --git a/tests/ipmap.t.list3 b/tests/ipmap.t.list3 index 35862118..f162e14f 100644 --- a/tests/ipmap.t.list3 +++ b/tests/ipmap.t.list3 @@ -1,7 +1,8 @@ Name: test Type: bitmap:ip +Revision: 3 Header: range 10.0.0.0-10.255.255.255 netmask 24 -Size in memory: 8352 +Size in memory: 8320 References: 0 Number of entries: 258 Members: diff --git a/tests/ipmap.t.list4 b/tests/ipmap.t.list4 index 2042ee68..478382d9 100644 --- a/tests/ipmap.t.list4 +++ b/tests/ipmap.t.list4 @@ -1,7 +1,8 @@ Name: test Type: bitmap:ip +Revision: 3 Header: range 0.0.0.0-255.255.255.255 netmask 16 -Size in memory: 8352 +Size in memory: 8320 References: 0 Number of entries: 2 Members: diff --git a/tests/ipmarkhash.t b/tests/ipmarkhash.t index e96bbfa2..1276f725 100644 --- a/tests/ipmarkhash.t +++ b/tests/ipmarkhash.t @@ -31,9 +31,9 @@ # Try to add value after second random value 0 ipset -A test 2.1.0.1,0x80 # List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo ipmarkhash.t.list0 +0 ./diff.sh .foo ipmarkhash.t.list0 # Flush test set 0 ipset -F test # Delete test set @@ -61,9 +61,9 @@ # Try to add value after second random value 0 ipset -A test 2.1.0.0,0x80 # List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo ipmarkhash.t.list1 +0 ./diff.sh .foo ipmarkhash.t.list1 # Flush test set 0 ipset -F test # Delete test set diff --git a/tests/ipmarkhash.t.list0 b/tests/ipmarkhash.t.list0 index a3bffcc1..7042bc64 100644 --- a/tests/ipmarkhash.t.list0 +++ b/tests/ipmarkhash.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 3 +Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 bucketsize 12 initval 0x3ad108b0 Size in memory: 528 References: 0 Number of entries: 4 diff --git a/tests/ipmarkhash.t.list1 b/tests/ipmarkhash.t.list1 index 34a7207a..30324c7c 100644 --- a/tests/ipmarkhash.t.list1 +++ b/tests/ipmarkhash.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 3 +Header: family inet markmask 0xffffffff hashsize 1024 maxelem 65536 bucketsize 12 initval 0xd0130277 Size in memory: 528 References: 0 Number of entries: 4 diff --git a/tests/ipporthash.t b/tests/ipporthash.t index 866c7203..b8f36063 100644 --- a/tests/ipporthash.t +++ b/tests/ipporthash.t @@ -31,9 +31,9 @@ # Try to add value after second random value 0 ipset -A test 2.1.0.1,128 # List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo ipporthash.t.list0 +0 ./diff.sh .foo ipporthash.t.list0 # Flush test set 0 ipset -F test # Delete test set @@ -61,9 +61,9 @@ # Try to add value after second random value 0 ipset -A test 2.1.0.0,128 # List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo ipporthash.t.list1 +0 ./diff.sh .foo ipporthash.t.list1 # Flush test set 0 ipset -F test # Delete test set diff --git a/tests/ipporthash.t.list0 b/tests/ipporthash.t.list0 index e8a00b38..c87147ef 100644 --- a/tests/ipporthash.t.list0 +++ b/tests/ipporthash.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 6 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x7888c8ef Size in memory: 528 References: 0 Number of entries: 4 diff --git a/tests/ipporthash.t.list1 b/tests/ipporthash.t.list1 index 7ba2900d..5dac9fcf 100644 --- a/tests/ipporthash.t.list1 +++ b/tests/ipporthash.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 6 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0xcb19e607 Size in memory: 528 References: 0 Number of entries: 4 diff --git a/tests/ipportiphash.t b/tests/ipportiphash.t index 56324337..32f22d11 100644 --- a/tests/ipportiphash.t +++ b/tests/ipportiphash.t @@ -39,9 +39,9 @@ # Try to add value after second random value 0 ipset -A test 2.1.0.1,128,2.2.2.2 # List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo ipportiphash.t.list0 +0 ./diff.sh .foo ipportiphash.t.list0 # Flush test set 0 ipset -F test # Delete test set @@ -71,9 +71,9 @@ # Try to del value before first random value 0 ipset -D test 1.255.255.255,5,1.1.1.1 # List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo ipportiphash.t.list1 +0 ./diff.sh .foo ipportiphash.t.list1 # Flush test set 0 ipset -F test # Delete test set diff --git a/tests/ipportiphash.t.list0 b/tests/ipportiphash.t.list0 index b34c3a0b..f0317966 100644 --- a/tests/ipportiphash.t.list0 +++ b/tests/ipportiphash.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 6 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0xf6f43069 Size in memory: 568 References: 0 Number of entries: 4 diff --git a/tests/ipportiphash.t.list1 b/tests/ipportiphash.t.list1 index bce53148..17877b85 100644 --- a/tests/ipportiphash.t.list1 +++ b/tests/ipportiphash.t.list1 @@ -1,6 +1,7 @@ Name: test Type: hash:ip,port,ip -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 6 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0xcd2e539b Size in memory: 456 References: 0 Number of entries: 2 diff --git a/tests/macipmap.t b/tests/macipmap.t index 45783d63..074e0674 100644 --- a/tests/macipmap.t +++ b/tests/macipmap.t @@ -39,9 +39,9 @@ # Range: Delete the same element 0 ipset -D test 2.0.200.214 # Range: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo macipmap.t.list0 +0 ./diff.sh .foo macipmap.t.list0 # Range: Flush test set 0 ipset -F test # Range: Catch invalid (too long) MAC @@ -87,9 +87,9 @@ # Network: Add MAC to already added element 0 ipset -A test 2.0.255.255,00:11:22:33:44:56 # Network: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Network: Check listing -0 diff -u -I 'Size in memory.*' .foo macipmap.t.list1 +0 ./diff.sh .foo macipmap.t.list1 # Network: Flush test set 0 ipset -F test # Network: Delete test set @@ -127,15 +127,15 @@ # Range: Delete the same element 0 ipset -D test 2.0.200.214 # Range: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset -L test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo macipmap.t.list3 +0 ./diff.sh .foo macipmap.t.list3 # Range: sleep 5s so that elements can timeout 0 sleep 5 # Range: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset -L test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo macipmap.t.list2 +0 ./diff.sh .foo macipmap.t.list2 # Range: Flush test set 0 ipset -F test # Range: add element with 1s timeout diff --git a/tests/macipmap.t.list2 b/tests/macipmap.t.list2 index f6a78c77..eaa01ae1 100644 --- a/tests/macipmap.t.list2 +++ b/tests/macipmap.t.list2 @@ -1,8 +1,9 @@ Name: test Type: bitmap:ip,mac -Header: range 2.0.0.1-2.1.0.0 timeout x -Size in memory: 1056920 +Revision: 3 +Header: range 2.0.0.1-2.1.0.0 timeout 5 +Size in memory: 1056888 References: 0 Number of entries: 1 Members: -2.1.0.0 timeout x +2.1.0.0 timeout 3 diff --git a/tests/macipmap.t.list3 b/tests/macipmap.t.list3 index 78c78d35..3262e64a 100644 --- a/tests/macipmap.t.list3 +++ b/tests/macipmap.t.list3 @@ -1,10 +1,11 @@ Name: test Type: bitmap:ip,mac -Header: range 2.0.0.1-2.1.0.0 timeout x -Size in memory: 1056920 +Revision: 3 +Header: range 2.0.0.1-2.1.0.0 timeout 5 +Size in memory: 1056888 References: 0 Number of entries: 3 Members: -2.0.0.1,00:11:22:33:44:56 timeout x -2.0.0.2,00:11:22:33:44:55 timeout x -2.1.0.0 timeout x +2.0.0.1,00:11:22:33:44:56 timeout 3 +2.0.0.2,00:11:22:33:44:55 timeout 3 +2.1.0.0 timeout 3 diff --git a/tests/nethash.t b/tests/nethash.t index 05e64c38..8f98ffa6 100644 --- a/tests/nethash.t +++ b/tests/nethash.t @@ -33,9 +33,9 @@ # Try to add IP address 0 ipset -A test 2.0.0.1 # List set -0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +0 ipset -L test > .foo0 && ./sort.sh .foo0 # Check listing -0 diff -u -I 'Size in memory.*' .foo nethash.t.list0 +0 ./diff.sh .foo nethash.t.list0 # Flush test set 0 ipset -F test # Add a non-matching IP address entry diff --git a/tests/nethash.t.list0 b/tests/nethash.t.list0 index e927599b..dad3deed 100644 --- a/tests/nethash.t.list0 +++ b/tests/nethash.t.list0 @@ -1,6 +1,7 @@ Name: test Type: hash:net -Header: family inet hashsize 128 maxelem 65536 bucketsize 12 +Revision: 7 +Header: family inet hashsize 128 maxelem 65536 bucketsize 12 initval 0xdc096f08 Size in memory: 784 References: 0 Number of entries: 4 diff --git a/tests/portmap.t b/tests/portmap.t index 5eeaaffc..819a59bc 100644 --- a/tests/portmap.t +++ b/tests/portmap.t @@ -25,9 +25,9 @@ # Range: Delete the same element 0 ipset -D test 567 # Range: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Range: Check listing -0 diff -u -I 'Size in memory.*' .foo portmap.t.list0 +0 ./diff.sh .foo portmap.t.list0 # Range: Flush test set 0 ipset -F test # Range: Delete test set @@ -45,9 +45,9 @@ # Full: Test value not added to the set 1 ipset -T test 1 # Full: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Full: Check listing -0 diff -u -I 'Size in memory.*' .foo portmap.t.list1 +0 ./diff.sh .foo portmap.t.list1 # Full: Flush test set 0 ipset -F test # Full: Delete test set @@ -69,15 +69,15 @@ # Full: Delete the same element 0 ipset -D test 567 # Full: List set -0 ipset -L test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo +0 ipset -L test > .foo # Full: Check listing -0 diff -u -I 'Size in memory.*' .foo portmap.t.list3 +0 ./diff.sh .foo portmap.t.list3 # Full: sleep 5s so that elements can timeout 0 sleep 5 # Full: List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Full: Check listing -# 0 diff -u -I 'Size in memory.*' .foo portmap.t.list2 +# 0 ./diff.sh .foo portmap.t.list2 # Full: Flush test set 0 ipset -F test # Full: add element with 1s timeout diff --git a/tests/portmap.t.list3 b/tests/portmap.t.list3 index d5756e6a..cd3f831e 100644 --- a/tests/portmap.t.list3 +++ b/tests/portmap.t.list3 @@ -1,9 +1,10 @@ Name: test Type: bitmap:port -Header: range 0-65535 timeout x -Size in memory: 532628 +Revision: 3 +Header: range 0-65535 timeout 5 +Size in memory: 532592 References: 0 Number of entries: 2 Members: -0 timeout x -65535 timeout x +0 timeout 4 +65535 timeout 0 diff --git a/tests/restore.t.list0 b/tests/restore.t.list0 index 1177d6c9..022a0b55 100644 --- a/tests/restore.t.list0 +++ b/tests/restore.t.list0 @@ -1,6 +1,7 @@ Name: a Type: hash:ip -Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 initval 0xf366ace6 Size in memory: 536 References: 0 Number of entries: 3 diff --git a/tests/restore.t.list1 b/tests/restore.t.list1 index f7e06b82..e270e52d 100644 --- a/tests/restore.t.list1 +++ b/tests/restore.t.list1 @@ -1,6 +1,7 @@ Name: b Type: hash:ip -Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet6 hashsize 1024 maxelem 65536 bucketsize 12 initval 0xdcbd231e Size in memory: 536 References: 0 Number of entries: 3 diff --git a/tests/setlist.t b/tests/setlist.t index 7d14ec85..316daf86 100644 --- a/tests/setlist.t +++ b/tests/setlist.t @@ -45,9 +45,9 @@ # Restore saved sets 0 ipset -R < setlist.t.r # List set -0 ipset -L test | grep -v Revision: > .foo +0 ipset -L test > .foo # Check listing -0 diff -u -I 'Size in memory.*' .foo setlist.t.list0 +0 ./diff.sh .foo setlist.t.list0 # Flush all sets 0 ipset -F # Delete all sets @@ -61,9 +61,9 @@ # Add set a before b 0 ipset add test a before b # List test set -0 ipset list test | grep -v Revision: > .foo +0 ipset list test > .foo # Check listing -0 diff -u -I 'Size in memory.*' .foo setlist.t.list1 +0 ./diff.sh .foo setlist.t.list1 # Test a set before b 0 ipset test test a before b # Test c set after b @@ -71,19 +71,19 @@ # Delete b set before c 0 ipset del test b before c # List test set -0 ipset list test | grep -v Revision: > .foo +0 ipset list test > .foo # Check listing -0 diff -u -I 'Size in memory.*' .foo setlist.t.list2 +0 ./diff.sh .foo setlist.t.list2 # Delete c set after a 0 ipset del test c after a # List test set -0 ipset list test | grep -v Revision: > .foo +0 ipset list test > .foo # Check listing -0 diff -u -I 'Size in memory.*' .foo setlist.t.list3 +0 ./diff.sh .foo setlist.t.list3 # List all sets -0 sleep .1s; ipset list | grep -v Revision: > .foo +0 sleep .1s; ipset list > .foo # Check listing -0 diff -u -I 'Size in memory.*' .foo setlist.t.list4 +0 ./diff.sh .foo setlist.t.list4 # Flush sets 0 ipset flush # Destroy sets diff --git a/tests/setlist.t.list4 b/tests/setlist.t.list4 index 8767afee..46c6a8c3 100644 --- a/tests/setlist.t.list4 +++ b/tests/setlist.t.list4 @@ -1,6 +1,7 @@ Name: a Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x042092ea Size in memory: 336 References: 1 Number of entries: 0 @@ -8,7 +9,8 @@ Members: Name: b Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x05db211b Size in memory: 336 References: 0 Number of entries: 0 @@ -16,7 +18,8 @@ Members: Name: c Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0xf3109e51 Size in memory: 336 References: 0 Number of entries: 0 @@ -24,7 +27,8 @@ Members: Name: d Type: hash:ip -Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 +Revision: 5 +Header: family inet hashsize 1024 maxelem 65536 bucketsize 12 initval 0x6c851a66 Size in memory: 336 References: 0 Number of entries: 0 @@ -32,6 +36,7 @@ Members: Name: test Type: list:set +Revision: 3 Header: size 8 Size in memory: 168 References: 0 diff --git a/tests/sort.sh b/tests/sort.sh index c5edad13..904b2168 100755 --- a/tests/sort.sh +++ b/tests/sort.sh @@ -1,5 +1,5 @@ #!/bin/sh -head -n 7 $1 > .foo -tail -n +8 $1 | grep '[[:alnum:]]' | sort >> .foo -rm $1 +sed '/Members:/q' $1 > .foo +awk '/Members:/,EOF' $1 | grep -v 'Members:' | sort >> .foo +rm -f $1