lsd0004

commit 36f6e00e063d691d52cd990fb0a4a28b53b7cae2
parent ee23f6aea857c00b2b7c6d41944a35d8872488f0
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Sat, 19 Aug 2023 12:14:52 +0200

remove separate  header definition

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

1 file changed, 36 insertions(+), 44 deletions(-)
diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
@@ -895,33 +895,6 @@ BEGIN
 	  This section describes some data structures and fields shared
 	  by various message types.
         </t>
-        <section anchor="msg_hdr">
-          <name>Header</name>
-          <t>
-            A message header that identifies the message length and type is shared across
-            all messages used in the R<sup>5</sup>N protocol.
-          </t>
-          <figure anchor="figure_msghdr" title="The common message header.">
-            <artwork name="" type="" align="left" alt=""><![CDATA[
-0     8     16    24
-+-----+-----+-----+-----+
-|  MSIZE    |   MTYPE   |
-+-----+-----+-----+-----+
-]]></artwork>
-          </figure>
-	  <t>where:</t>
-          <dl>
-            <dt>MSIZE</dt>
-            <dd>
-              denotes the size of this message in network byte order.
-            </dd>
-            <dt>MTYPE</dt>
-            <dd>
-              is the 16-bit message type. Message types are registered in
-              the GANA "GNUnet Message Type" registry <xref target="gana_message_type"/>.
-            </dd>
-          </dl>
-        </section>
         <section anchor="route_flags">
           <name>Flags</name>
           <t>
@@ -1228,7 +1201,7 @@ BEGIN
             <artwork name="" type="" align="left" alt=""><![CDATA[
 0     8     16    24    32    40    48    56
 +-----+-----+-----+-----+-----+-----+-----+-----+
-|        HEADER         | RESERVED  | URL_CTR   |
+|  MSIZE    |   MTYPE   | RESERVED  | URL_CTR   |
 +-----+-----+-----+-----+-----+-----+-----+-----+
 |                    SIGNATURE                  /
 /                   (64 byte)                   |
@@ -1241,10 +1214,15 @@ BEGIN
           </figure>
           <t>where:</t>
           <dl>
-            <dt>HEADER</dt>
+            <dt>MSIZE</dt>
+            <dd>
+              denotes the size of this message in network byte order.
+            </dd>
+            <dt>MTYPE</dt>
             <dd>
-              the common message header. Its <tt>MTYPE</tt> field must be set to
-              the value 157 in network byte order.
+              is the 16-bit message type.
+              It must be set to
+              the value 157 in network byte order as defined in the GANA "GNUnet Message Type" registry <xref target="gana_message_type"/>.
             </dd>
             <dt>RESERVED</dt>
             <dd>
@@ -1334,7 +1312,7 @@ BEGIN
             <artwork name="" type="" align="left" alt=""><![CDATA[
 0     8     16    24    32    40    48    56
 +-----+-----+-----+-----+-----+-----+-----+-----+
-|        HEADER         |         BTYPE         |
+|   MSIZE   |   MTYPE   |         BTYPE         |
 +-----+-----+-----+-----+-----+-----+-----+-----+
 |   FLAGS   | HOPCOUNT  | REPL_LVL  | PATH_LEN  |
 +-----+-----+-----+-----+-----+-----+-----+-----+
@@ -1358,10 +1336,15 @@ BEGIN
           </figure>
           <t>where:</t>
           <dl>
-            <dt>HEADER</dt>
+            <dt>MSIZE</dt>
             <dd>
-              is the common message header. Its <tt>MTYPE</tt> field is set by the initiator to
-              the value 146 in network byte order. Read-only.
+              denotes the size of this message in network byte order.
+            </dd>
+            <dt>MTYPE</dt>
+            <dd>
+              is the 16-bit message type. Read-only.
+              It must be set to
+              the value 146 in network byte order as defined in the GANA "GNUnet Message Type" registry <xref target="gana_message_type"/>.
             </dd>
             <dt>BTYPE</dt>
             <dd>
@@ -1573,7 +1556,7 @@ BEGIN
             <artwork name="" type="" align="left" alt=""><![CDATA[
 0     8     16    24    32    40    48    56
 +-----+-----+-----+-----+-----+-----+-----+-----+
-|        HEADER         |         BTYPE         |
+|   MSIZE   |   MTYPE   |         BTYPE         |
 +-----+-----+-----+-----+-----+-----+-----+-----+
 |   FLAGS   |  HOPCOUNT | REPL_LVL  |  RF_SIZE  |
 +-----+-----+-----+-----+-----+-----+-----+-----+
@@ -1592,10 +1575,15 @@ BEGIN
           </figure>
           <t>where:</t>
           <dl>
-            <dt>HEADER</dt>
+            <dt>MSIZE</dt>
+            <dd>
+              denotes the size of this message in network byte order.
+            </dd>
+            <dt>MTYPE</dt>
             <dd>
-              is the common message header. Its <tt>MTYPE</tt> field is set by the initiator to
-              the value 147 in network byte order. Read-only.
+              is the 16-bit message type. Read-only.
+              It must be set to
+              the value 147 in network byte order as defined in the GANA "GNUnet Message Type" registry <xref target="gana_message_type"/>.
             </dd>
             <dt>BTYPE</dt>
             <dd>
@@ -1800,7 +1788,7 @@ BEGIN
             <artwork name="" type="" align="left" alt=""><![CDATA[
 0     8     16    24    32    40    48    56
 +-----+-----+-----+-----+-----+-----+-----+-----+
-|        HEADER         |        BTYPE          |
+|   MSIZE   |   MTYPE   |        BTYPE          |
 +-----+-----+-----+-----+-----+-----+-----+-----+
 |  RESERVED |   FLAGS   | PUTPATH_L | GETPATH_L |
 +-----+-----+-----+-----+-----+-----+-----+-----+
@@ -1826,11 +1814,15 @@ BEGIN
           </figure>
           <t>where:</t>
           <dl>
-            <dt>HEADER</dt>
+            <dt>MSIZE</dt>
             <dd>
-              is the common message header. Its <tt>MTYPE</tt> field must be set to
-              the value 148 in network byte order.
-              Set by the initiator. Read-only.
+              denotes the size of this message in network byte order.
+            </dd>
+            <dt>MTYPE</dt>
+            <dd>
+              is the 16-bit message type. Set by the initiator Read-only.
+              It must be set to
+              the value 148 in network byte order as defined in the GANA "GNUnet Message Type" registry <xref target="gana_message_type"/>.
             </dd>
             <dt>BTYPE</dt>
             <dd>