[lsd0003] 02/02: Merge branch 'master' of git+ssh://gnunet.org/lsd0003

[gnunet]

This is an automated email from the git hooks/post-receive script.

elias-summermatter pushed a commit to branch master
in repository lsd0003.

commit 97a7e6ff4153fb10e009c43558683b5670968306
Merge: dc5c89d 645fdcc
Author: Elias Summermatter <elias.summermatter@seccom.ch>
AuthorDate: Wed Jun 9 09:06:57 2021 +0200

    Merge branch 'master' of git+ssh://gnunet.org/lsd0003

 draft-summermatter-set-union.xml | 77 +++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --cc draft-summermatter-set-union.xml
index 8a55878,8ed3591..d286e32
--- a/draft-summermatter-set-union.xml
+++ b/draft-summermatter-set-union.xml
@@@ -1239,12 -1243,11 +1243,12 @@@ FUNCTION get_bucket_id (key, number_of_
                              <t>
                                  are variable numbers of slices in an array. A 
single slice contains multiple 64-bit IDSUMS,
                                  32-bit HASHSUMS and 1-64bit COUNTERS of 
variable size. In the network order the array of IDSUMS is first, followed
 -                                by an array of HASHSUMS and ended with an 
array of COUNTERS. Length of the array is defined
 -                                by MIN( SIZE - OFFSET, 
MAX_BUCKETS_PER_MESSAGE). MAX_BUCKETS_PER_MESSAGE is defined as
 +                                by an array of HASHSUMS and ended with an 
array of COUNTERS (details are described in section
 +                                <xref 
target="performance_counter_variable_size" format="default"/>). Length of the 
array is
 +                                defined by MIN( SIZE - OFFSET, 
MAX_BUCKETS_PER_MESSAGE). MAX_BUCKETS_PER_MESSAGE is defined as
                                  32768 divided by the BUCKET_SIZE which is 
13-byte (104-bit).
                              </t>
-                             
+ 
                              <t>
                                  To get the IDSUM field, all IDs hitting a 
bucket are added up with a binary XOR operation.
                                  See <xref target="ibf_format_id_generation" 
format="title" /> details about ID generation.

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.