commit 6fe2d80590676a65636945d7fd5dea9f3ce27e6b
parent 9c408ef1532e82763c012e0d513096fdd9409264
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Wed, 12 Jan 2022 23:22:03 +0100
hello
Diffstat:
1 file changed, 38 insertions(+), 40 deletions(-)
diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
@@ -707,23 +707,32 @@ Connectivity | |Underlay| |Underlay|
<section anchor="route_options">
<name>Route Options</name>
<t>
- The <tt>RouteOptions</tt> consist of the following flags:
+ The <tt>RouteOptions</tt> consist of the following flags which
+ are represented in an options field in the messages.
+ Each flag is represented by a bit in the field starting from 0 as
+ the rightmost bit to 15 as the leftmost bit.
+ FIXME: Actually, we set those bits and then store the resulting
+ value in NBO...
</t>
<dl>
- <dt>Demultiplex-Everywhere</dt>
+ <dt>0: Demultiplex-Everywhere</dt>
<dd>
indicates that each node along the way should process the request.
</dd>
- <dt>Record-Route</dt>
+ <dt>1: Record-Route</dt>
<dd>
indicates to keep track of the route that the message takes
in the P2P network.
</dd>
- <dt>Allow-Approximate</dt>
+ <dt>2: Allow-Approximate</dt>
<dd>
This is a special flag which modifies the message processing to
allow approximate results.
</dd>
+ <dt>3-15: Reserved</dt>
+ <dd>
+ For future use.
+ </dd>
</dl>
</section>
<section anchor="p2p_bf" numbered="true" toc="default">
@@ -1292,39 +1301,38 @@ Connectivity | |Underlay| |Underlay|
<artwork name="" type="" align="left" alt=""><![CDATA[
0 8 16 24 32 40 48 56
+---+-----+-----+-----+-----+-----+-----+-----+
-| NODEID /
-+ /
-/ /
+| PEER-ID |
+| (32 byte) |
+| |
+| |
++---+-----+-----+-----+-----+-----+-----+-----+
+| SIGNATURE |
+| (64 byte) |
+| |
+| |
+| |
+| |
+| |
+| |
+---+-----+-----+-----+-----+-----+-----+-----+
-| ADDRESSES /
-/ (variable length) |
+| EXPIRATION |
++---+-----+-----+-----+-----+-----+-----+-----+
+/ ADDRESSES /
+/ (variable length) /
+---+-----+-----+-----+-----+-----+-----+-----+
]]></artwork>
</figure>
<dl>
- <dt>TYPE</dt>
+ <dt>PEER-ID</dt>
<dd>
- is the type of HELLO. A 16-bit number in network byte order.
- This value determines the type of the NODEID field.
- </dd>
- <dt>SIZE</dt>
- <dd>
- is the SIZE of the following fields NODEID and ADDRESSES in bytes.
- In network byte order.
- </dd>
- <dt>NODEID</dt>
- <dd>
- is the Node ID of the node which has generated this HELLO.
- The length content of this field is determined by the TYPE.
- Usually, this is a cryptographic public key which allows the
- Underlay to uniquely identify and authenticate the node.
+ is the Peer-ID of the node which has generated this HELLO.
</dd>
<dt>ADDRESSES</dt>
<dd>
- is a list of UTF-8 strings <xref target="RFC3629"/> which can be
- used as addresses to contact the node.
+ is a list of UTF-8 <xref target="RFC3629"/> URIs
+ <xref target="RFC3986"/> which can be
+ used as addresses to contact the peer.
The strings MUST be 0-terminated.
- FIXME: Examples? Format determined?
</dd>
</dl>
<t>
@@ -1332,18 +1340,9 @@ Connectivity | |Underlay| |Underlay|
HELLO of a node.
</t>
<t>
- For the string representation of the node public key,
- the base-32 encoding "StringEncode" is used.
- However, instead of following <xref target="RFC4648"/> the
- character map is based on the optical character recognition friendly
- proposal of Crockford <xref target="CrockfordB32"/>.
- The only difference to Crockford is that the letter
- "U" decodes to the same base-32 value as the letter "V" (27).
- </t>
- <t>
The <tt>ADDRESSES</tt> part of the <tt>HELLO</tt> indicate endpoints
which can be used by the Underlay in order to establish a connection
- with the node identified by <tt>NODEKEY</tt>.
+ with the node identified by <tt>Peer-ID</tt>.
An example of an addressing scheme used throughout
this document is "ip+tcp", which refers to a standard TCP/IP socket
connection. The "hier"-part of the URI must provide a suitable
@@ -1352,10 +1351,8 @@ Connectivity | |Underlay| |Underlay|
</t>
<figure>
<artwork name="" type="" align="left" alt=""><![CDATA[
-ip+tcp://1.2.3.4:6789 \
+ip+udp://1.2.3.4:6789 \
gnunet+tcp://12.3.4.5/ \
-i2p+udp://1.2.4.5:424/ \
-tor+onionv3://rasdflkjasdfliasduf.onion/
]]></artwork>
</figure>
</section>
@@ -1458,6 +1455,7 @@ Purpose | Name | References | Description
&RFC2119;
&RFC3629;
+ &RFC3986;
&RFC4634;
&RFC4648;
&RFC6940;
