lsd0004

commit 2add9247a625947115bc9c032db3420fd6c4100e
parent 4418802490a141a64dcea94b6bb0e12090f84d98
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Sun, 20 Aug 2023 17:29:20 +0200

minor edits and clarifications

Diffstat:
M
draft-schanzen-r5n.xml
 | 
21
+++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
@@ -724,8 +724,8 @@ Connectivity | |Underlay|  |Underlay|  | Underlay | ...
         </t>
         <t>
           To discover peers for its routing table, a peer will initiate <tt>GetMessage</tt> requests
-          <xref target="p2p_get"/> asking for blocks of type <tt>HELLO</tt> using its own peer address as
-          the <em>key</em> provided in the <tt>QUERY_HASH</tt> field of the message.
+          <xref target="p2p_get"/> asking for blocks of type <tt>HELLO</tt> using its own peer address 
+          in the <tt>QUERY_HASH</tt> field of the message.
           The <tt>PEER_BF</tt> is initialized and set using the peers own peer address as well as the addresses
           of all currently connected <em>neighbors</em>. <!-- note: we mean the identities here! FIX with terminology... -->
           These requests <bcp14>MUST</bcp14> use the <tt>FindApproximate</tt> and <tt>DemultiplexEverywhere</tt>
@@ -808,7 +808,7 @@ Connectivity | |Underlay|  |Underlay|  | Underlay | ...
         </t>
         <dl>
           <dt>
-            <tt>GetDistance(A, B) -&gt; Distance as Integer</tt>
+            <tt>GetDistance(A, B) -&gt; Distance</tt>
           </dt>
           <dd>
             This function calculates the binary XOR between A and B.
@@ -842,15 +842,15 @@ Connectivity | |Underlay|  |Underlay|  | Underlay | ...
             This function selects a neighbor <tt>N</tt> depending on the
             number of hops <tt>H</tt> parameter.
             If <tt>H &lt; NETWORK_SIZE_ESTIMATE</tt>
-            this function <bcp14>MUST</bcp14> return <tt>SelectRandomPeer(B)</tt> and
-            <tt>SelectClosestPeer(K, B)</tt> otherwise.
+            returns <tt>SelectRandomPeer(B)</tt>, and otherwise
+            returns <tt>SelectClosestPeer(K, B)</tt>.
           </dd>
           <dt>
             <tt>IsClosestPeer(N, K, B) -&gt; true | false</tt>
           </dt>
           <dd>
             This function checks if <tt>N</tt> is the closest peer for <tt>K</tt>
-            (cf. <tt>SelectClosestpeer(K)</tt>).
+            (cf. <tt>SelectClosestPeer(K, B)</tt>).
             Peers with a positive test in the Bloom filter <tt>B</tt> are not considered.
           </dd>
           <dt>
@@ -858,11 +858,12 @@ Connectivity | |Underlay|  |Underlay|  | Underlay | ...
           </dt>
           <dd>
 	    <t>
-            This function computes the number of neighbors
+            This function computes the number of <em>neighbors</em>
 	    that a message should be forwarded to.  The arguments
-	    are the desired replication level (<tt>REPL_LVL</tt>), the <tt>HOPCOUNT</tt> of the message so far and
-	    and the current network size estimate (<tt>L2NSE</tt>) as provided
-	    by the underlay.
+	    are the desired replication level (<tt>REPL_LVL</tt>),
+	    the <tt>HOPCOUNT</tt> of the message so far and
+	    and the current network size estimate (<tt>L2NSE</tt>)
+	    as provided by the underlay.
             The result is the non-negative number of next hops to
 	    select.  The following figure gives the
 	    pseudocode for computing the number of neighbors