Add element count to all set types header

It is better to list the set elements for all set types, thus the
header information is uniform. Element counts are therefore added
to the bitmap and list types.

28 files changed, 57 insertions, 29 deletions

diff --git a/tests/bitmap:ip.t.list0 b/tests/bitmap:ip.t.list0
index c316603..ad9a693 100644
--- a/tests/bitmap:ip.t.list0
+++ b/tests/bitmap:ip.t.list0
@@ -1,7 +1,8 @@
 Name: test
 Type: bitmap:ip
 Header: range 2.0.0.1-2.1.0.0 timeout 5
-Size in memory: 524408
+Size in memory: 532640
 References: 0
+Number of entries: 1
 Members:
 2.1.0.0 timeout 0
diff --git a/tests/bitmap:ip.t.list1 b/tests/bitmap:ip.t.list1
index 3c94983..a9504f6 100644
--- a/tests/bitmap:ip.t.list1
+++ b/tests/bitmap:ip.t.list1
@@ -1,7 +1,8 @@
 Name: test
 Type: bitmap:ip
 Header: range 2.0.0.0-2.0.255.255 timeout 5
-Size in memory: 524408
+Size in memory: 532640
 References: 0
+Number of entries: 1
 Members:
 2.0.0.0 timeout 0
diff --git a/tests/bitmap:ip.t.list2 b/tests/bitmap:ip.t.list2
index 78bce6c..ddf8100 100644
--- a/tests/bitmap:ip.t.list2
+++ b/tests/bitmap:ip.t.list2
@@ -1,7 +1,8 @@
 Name: test
 Type: bitmap:ip
 Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout 5
-Size in memory: 524408
+Size in memory: 532640
 References: 0
+Number of entries: 1
 Members:
 10.255.255.0 timeout 0
diff --git a/tests/bitmap:ip.t.list3 b/tests/bitmap:ip.t.list3
index 3f4e064..e1a4d43 100644
--- a/tests/bitmap:ip.t.list3
+++ b/tests/bitmap:ip.t.list3
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 0.0.0.0-255.255.255.255 netmask 16 timeout 5
-Size in memory: 524408
+Size in memory: 532640
 References: 0
+Number of entries: 2
 Members:
 0.0.0.0 timeout 0
 255.255.0.0 timeout 0
diff --git a/tests/bitmap:ip.t.list4 b/tests/bitmap:ip.t.list4
index e706b67..7148a8d 100644
--- a/tests/bitmap:ip.t.list4
+++ b/tests/bitmap:ip.t.list4
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 2.0.0.1-2.1.0.0 timeout x
-Size in memory: 524408
+Size in memory: 532640
 References: 0
+Number of entries: 6
 Members:
 2.0.0.1 timeout x
 2.0.0.128 timeout x
diff --git a/tests/bitmap:ip.t.list5 b/tests/bitmap:ip.t.list5
index 2d91635..1d22665 100644
--- a/tests/bitmap:ip.t.list5
+++ b/tests/bitmap:ip.t.list5
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 2.0.0.0-2.0.255.255 timeout x
-Size in memory: 524408
+Size in memory: 532640
 References: 0
+Number of entries: 2
 Members:
 2.0.0.0 timeout x
 2.0.255.255 timeout x
diff --git a/tests/bitmap:ip.t.list6 b/tests/bitmap:ip.t.list6
index 68b1b07..c3eb347 100644
--- a/tests/bitmap:ip.t.list6
+++ b/tests/bitmap:ip.t.list6
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 10.0.0.0-10.255.255.255 netmask 24 timeout x
-Size in memory: 524408
+Size in memory: 532640
 References: 0
+Number of entries: 258
 Members:
 10.0.0.0 timeout x
 10.8.0.0 timeout x
diff --git a/tests/comment.t.list0 b/tests/comment.t.list0
index 86bcacd..6d44c91 100644
--- a/tests/comment.t.list0
+++ b/tests/comment.t.list0
@@ -3,5 +3,6 @@ Type: bitmap:ip
 Header: range 2.0.0.1-2.1.0.0 comment
 Size in memory: 532640
 References: 0
+Number of entries: 1
 Members:
 2.0.0.1 comment "text message"
diff --git a/tests/comment.t.list1 b/tests/comment.t.list1
index 607b65a..1a09672 100644
--- a/tests/comment.t.list1
+++ b/tests/comment.t.list1
@@ -3,6 +3,7 @@ Type: bitmap:ip
 Header: range 2.0.0.1-2.1.0.0 comment
 Size in memory: 532640
 References: 0
+Number of entries: 255
 Members:
 2.0.0.1 comment "text message 1"
 2.0.0.2 comment "text message 2"
diff --git a/tests/comment.t.list11 b/tests/comment.t.list11
index 19168a8..7d6990f 100644
--- a/tests/comment.t.list11
+++ b/tests/comment.t.list11
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 2.0.0.1-2.1.0.0 timeout x comment
-Size in memory: 1581216
+Size in memory: 1056928
 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"
diff --git a/tests/comment.t.list12 b/tests/comment.t.list12
index 54b0a3a..9440b75 100644
--- a/tests/comment.t.list12
+++ b/tests/comment.t.list12
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 2.0.0.1-2.1.0.0 timeout x comment
-Size in memory: 1581216
+Size in memory: 1056928
 References: 0
+Number of entries: 510
 Members:
 2.0.1.1 timeout x comment "text message 1"
 2.0.1.2 timeout x comment "text message 2"
diff --git a/tests/ipmap.t.list0 b/tests/ipmap.t.list0
index c1c4360..d3b99a8 100644
--- a/tests/ipmap.t.list0
+++ b/tests/ipmap.t.list0
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 2.0.0.1-2.1.0.0
-Size in memory: 8232
+Size in memory: 8352
 References: 0
+Number of entries: 6
 Members:
 2.0.0.1
 2.0.0.128
diff --git a/tests/ipmap.t.list1 b/tests/ipmap.t.list1
index abfc98d..f9b311d 100644
--- a/tests/ipmap.t.list1
+++ b/tests/ipmap.t.list1
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 2.0.0.1-2.1.0.0
-Size in memory: 8232
+Size in memory: 8352
 References: 0
+Number of entries: 2
 Members:
 2.0.0.1
 2.1.0.0
diff --git a/tests/ipmap.t.list2 b/tests/ipmap.t.list2
index 932cad2..c2c5691 100644
--- a/tests/ipmap.t.list2
+++ b/tests/ipmap.t.list2
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 2.0.0.0-2.0.255.255
-Size in memory: 8232
+Size in memory: 8352
 References: 0
+Number of entries: 2
 Members:
 2.0.0.0
 2.0.255.255
diff --git a/tests/ipmap.t.list3 b/tests/ipmap.t.list3
index ab391d0..3586211 100644
--- a/tests/ipmap.t.list3
+++ b/tests/ipmap.t.list3
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 10.0.0.0-10.255.255.255 netmask 24
-Size in memory: 8232
+Size in memory: 8352
 References: 0
+Number of entries: 258
 Members:
 10.0.0.0
 10.8.0.0
diff --git a/tests/ipmap.t.list4 b/tests/ipmap.t.list4
index eaff220..2042ee6 100644
--- a/tests/ipmap.t.list4
+++ b/tests/ipmap.t.list4
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip
 Header: range 0.0.0.0-255.255.255.255 netmask 16
-Size in memory: 8232
+Size in memory: 8352
 References: 0
+Number of entries: 2
 Members:
 0.0.0.0
 255.255.0.0
diff --git a/tests/macipmap.t.list0 b/tests/macipmap.t.list0
index d37e560..4268a2c 100644
--- a/tests/macipmap.t.list0
+++ b/tests/macipmap.t.list0
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip,mac
 Header: range 2.0.0.1-2.1.0.0
-Size in memory: 458864
+Size in memory: 532632
 References: 0
+Number of entries: 3
 Members:
 2.0.0.1,00:11:22:33:44:56
 2.0.0.2,00:11:22:33:44:55
diff --git a/tests/macipmap.t.list1 b/tests/macipmap.t.list1
index 0447c41..a568148 100644
--- a/tests/macipmap.t.list1
+++ b/tests/macipmap.t.list1
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:ip,mac
 Header: range 2.0.0.0-2.0.255.255
-Size in memory: 458864
+Size in memory: 532632
 References: 0
+Number of entries: 3
 Members:
 2.0.0.0
 2.0.0.2,00:11:22:33:44:55
diff --git a/tests/macipmap.t.list2 b/tests/macipmap.t.list2
index 0c8bf6f..f6a78c7 100644
--- a/tests/macipmap.t.list2
+++ b/tests/macipmap.t.list2
@@ -1,7 +1,8 @@
 Name: test
 Type: bitmap:ip,mac
 Header: range 2.0.0.1-2.1.0.0 timeout x
-Size in memory: 1048688
+Size in memory: 1056920
 References: 0
+Number of entries: 1
 Members:
 2.1.0.0 timeout x
diff --git a/tests/macipmap.t.list3 b/tests/macipmap.t.list3
index bf78821..78c78d3 100644
--- a/tests/macipmap.t.list3
+++ b/tests/macipmap.t.list3
@@ -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: 1048688
+Size in memory: 1056920
 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
diff --git a/tests/portmap.t.list0 b/tests/portmap.t.list0
index 4ff6b1f..7f8657e 100644
--- a/tests/portmap.t.list0
+++ b/tests/portmap.t.list0
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:port
 Header: range 1-1024
-Size in memory: 152
+Size in memory: 276
 References: 0
+Number of entries: 2
 Members:
 1
 1024
diff --git a/tests/portmap.t.list1 b/tests/portmap.t.list1
index a34caba..55ba0d0 100644
--- a/tests/portmap.t.list1
+++ b/tests/portmap.t.list1
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:port
 Header: range 0-65535
-Size in memory: 8216
+Size in memory: 8340
 References: 0
+Number of entries: 2
 Members:
 0
 65535
diff --git a/tests/portmap.t.list2 b/tests/portmap.t.list2
index 6afaf02..d5756e6 100644
--- a/tests/portmap.t.list2
+++ b/tests/portmap.t.list2
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:port
-Header: range 0-65535 timeout 8
-Elements: 1
-Size in memory: 524288
+Header: range 0-65535 timeout x
+Size in memory: 532628
 References: 0
+Number of entries: 2
 Members:
-65535 timeout 0
+0 timeout x
+65535 timeout x
diff --git a/tests/portmap.t.list3 b/tests/portmap.t.list3
index 441da01..d5756e6 100644
--- a/tests/portmap.t.list3
+++ b/tests/portmap.t.list3
@@ -1,8 +1,9 @@
 Name: test
 Type: bitmap:port
 Header: range 0-65535 timeout x
-Size in memory: 524400
+Size in memory: 532628
 References: 0
+Number of entries: 2
 Members:
 0 timeout x
 65535 timeout x
diff --git a/tests/setlist.t.list0 b/tests/setlist.t.list0
index c413c26..2925a73 100644
--- a/tests/setlist.t.list0
+++ b/tests/setlist.t.list0
@@ -1,8 +1,9 @@
 Name: test
 Type: list:set
 Header: size 8
-Size in memory: 112
+Size in memory: 224
 References: 0
+Number of entries: 2
 Members:
 foo
 bar
diff --git a/tests/setlist.t.list1 b/tests/setlist.t.list1
index 47ba175..5446c14 100644
--- a/tests/setlist.t.list1
+++ b/tests/setlist.t.list1
@@ -1,8 +1,9 @@
 Name: test
 Type: list:set
 Header: size 8
-Size in memory: 120
+Size in memory: 264
 References: 0
+Number of entries: 3
 Members:
 a
 b
diff --git a/tests/setlist.t.list2 b/tests/setlist.t.list2
index d1bb378..70fb52b 100644
--- a/tests/setlist.t.list2
+++ b/tests/setlist.t.list2
@@ -1,8 +1,9 @@
 Name: test
 Type: list:set
 Header: size 8
-Size in memory: 120
+Size in memory: 224
 References: 0
+Number of entries: 2
 Members:
 a
 c
diff --git a/tests/setlist.t.list3 b/tests/setlist.t.list3
index 0a9e0b4..6be4b37 100644
--- a/tests/setlist.t.list3
+++ b/tests/setlist.t.list3
@@ -1,7 +1,8 @@
 Name: test
 Type: list:set
 Header: size 8
-Size in memory: 120
+Size in memory: 184
 References: 0
+Number of entries: 1
 Members:
 a