commit c88cc55a15ed79fdacea79304fec045e50cb235a
parent 002e76c2851086b1e557d3a22831013add030fc4
Author: Elias Summermatter <elias.summermatter@seccom.ch>
Date: Mon, 14 Jun 2021 08:41:53 +0200
Fixed something more
Diffstat:
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/draft-summermatter-set-union.xml b/draft-summermatter-set-union.xml
@@ -1266,10 +1266,10 @@ hashSum | 0x0101 | 0x5151 | 0x5050 | 0x0000 |
+-----+-----+-----+-----+-----+-----+-----+-----+
| MSG SIZE | MSG TYPE | IBF SIZE |
+-----+-----+-----+-----+-----+-----+-----+-----+
- |IMCS | OFFSET | SALT |
+ | OFFSET | SALT | IMCS |
+-----+-----+-----+-----+-----+-----+-----+-----+
- | IBF-SLICE
- +----- /
+ | IBF-SLICE
+ +-----+-----+-----+-----+-----+-----+-----+-----+ /
/ /
/ /
]]></artwork>
@@ -1289,21 +1289,22 @@ hashSum | 0x0101 | 0x5151 | 0x5050 | 0x0000 |
<dd>
is a 32-bit unsigned integer which signals the total number of buckets in the IBF. The minimal number of buckets is 79.
</dd>
- <dt>IMCS</dt> <!-- FIXME: bad placement, destroys alignment of offset+salt. Move after salt! -->
- <dd>
- is a 8-bit unsigned integer, which describes the number of bits that
- are required to store a single counter. This is used for the unpacking function as described
- in the <xref target="performance_counter_variable_size" format="title" /> section.
- </dd>
<dt>OFFSET</dt>
<dd>
is a 32-bit unsigned integer which signals the offset of the following IBF slices in the original.
</dd>
- <dt>SALT</dt> <!-- FIXME: do we need a 32-bit field here? Maybe use only 16 bits, and then have some room for IMCS without destroying alignment? @Christian in my mind we need 32-bit(4,294,967,296) because with 16 we could only transmit an offset of 65,536 that's much less than max ibf size of 1,048,576-->
+ <dt>SALT</dt>
<dd>
- is a 32-bit unsigned integer that contains the IBF-salt which was used to create the
+ is a 16-bit unsigned integer that contains the IBF-salt which was used to create the
IBF.
</dd>
+ <dt>IMCS</dt>
+ <dd>
+ is a 16-bit unsigned integer, which describes the number of bits that
+ are required to store a single counter. This is used for the unpacking function as described
+ in the <xref target="performance_counter_variable_size" format="title" /> section.
+ <!-- @Christian changed this t o 16-bit to make it align better ist that oke or should i leave it 8-bit? -->
+ </dd>
<dt>IBF-SLICE</dt>
<dd>
<t>
