Script updating gh-pages from 2dc5db8. [ci skip]

Author: ID Bot

draft-ietf-quic-qlog-quic-events.html

@@ -3993,37 +3993,55 @@ <h3 id="name-packetnumberspace">
         <h3 id="name-packetheader">
 <a href="#section-8.8" class="section-number selfRef">8.8. </a><a href="#name-packetheader" class="section-name selfRef">PacketHeader</a>
         </h3>
-<p id="section-8.8-1">If the packet_type numerical value does not map to a known packet_type string,
-the packet_type value of "unknown" can be used and the raw value captured in the
-packet_type_bytes field; a numerical value without variable-length integer
-encoding.<a href="#section-8.8-1" class="pilcrow">¶</a></p>
-<p id="section-8.8-2">For long header packets of type initial, handshake, and 0RTT, the length field
+<p id="section-8.8-1">If the <code>packet_type</code> numerical value does not map to a known <code>$PacketType</code>
+string, the <code>packet_type</code> value of "unknown" can be used and the raw value
+captured in the <code>packet_type_bytes</code> field; a numerical value without
+variable-length integer encoding.<a href="#section-8.8-1" class="pilcrow">¶</a></p>
+<p id="section-8.8-2">The fixed and reserved bits are omitted here because they must be 0; see
+<span>[<a href="#QUIC-TRANSPORT" class="cite xref">QUIC-TRANSPORT</a>]</span>. If these bits have an invalid value, the raw values can be
+captured in the <code>raw.data</code> field of the event logging the PacketHeader.<a href="#section-8.8-2" class="pilcrow">¶</a></p>
+<p id="section-8.8-3">QUIC extensions that do utilize these bits are expected to create new events
+(analogous to <code>spin_bit_updated</code>) or use qlog extension mechanisms to reflect
+that usage.<a href="#section-8.8-3" class="pilcrow">¶</a></p>
+<p id="section-8.8-4">For long header packets of type initial, handshake, and 0RTT, the length field
 of the packet header is logged in the qlog <code>raw.length</code> field, and the value
-signifies the length of the packet number plus the payload.<a href="#section-8.8-2" class="pilcrow">¶</a></p>
+signifies the length of the packet number plus the payload.<a href="#section-8.8-4" class="pilcrow">¶</a></p>
 <span id="name-packetheader-definition"></span><div id="packetheader-def">
 <figure id="figure-46">
-          <div class="lang-cddl sourcecode" id="section-8.8-3.1">
+          <div class="lang-cddl sourcecode" id="section-8.8-5.1">
 <pre>
 PacketHeader = {
-    ? quic_bit: bool .default true
     packet_type: $PacketType
 
     ; only if packet_type === "unknown"
     ? packet_type_bytes: uint64
 
+    ; only if packet_type === "1RTT"
+    ? spin_bit: bool
+
+    ; only if packet_type === "1RTT", and if the key phase was
+    ; determined from the key_phase_bit
+    ? key_phase: uint64
+
+    ; only if packet_type === "1RTT", and if key_phase is not set
+    ? key_phase_bit: bool
+
     ; only if packet_type === "initial" || "handshake" || "0RTT" ||
     ;                         "1RTT"
-    ? packet_number: uint64
+    ? packet_number_length: uint8
 
-    ; the bit flags of the packet headers (spin bit, key update bit,
-    ; etc. up to and including the packet number length bits
-    ; if present
-    ? flags: uint8
+    ; only if packet_type === "initial" || "handshake" || "0RTT" ||
+    ;                         "1RTT"
+    ? packet_number: uint64
 
     ; only if packet_type === "initial" || "retry"
     ? token: Token
 
-    ; only if present in the header
+    ; only if packet_type === "initial" || "handshake" || "0RTT"
+    ; Signifies length of the packet_number plus the payload
+    ? length: uint16
+
+    ; only if present in the header.
     ; if correctly using transport:connection_id_updated events,
     ; dcid can be skipped for 1RTT packets
     ? version: QuicVersion

draft-ietf-quic-qlog-quic-events.txt

@@ -2044,35 +2044,56 @@ Table of Contents
 8.8.  PacketHeader
 
    If the packet_type numerical value does not map to a known
-   packet_type string, the packet_type value of "unknown" can be used
+   $PacketType string, the packet_type value of "unknown" can be used
    and the raw value captured in the packet_type_bytes field; a
    numerical value without variable-length integer encoding.
 
+   The fixed and reserved bits are omitted here because they must be 0;
+   see [QUIC-TRANSPORT].  If these bits have an invalid value, the raw
+   values can be captured in the raw.data field of the event logging the
+   PacketHeader.
+
+   QUIC extensions that do utilize these bits are expected to create new
+   events (analogous to spin_bit_updated) or use qlog extension
+   mechanisms to reflect that usage.
+
    For long header packets of type initial, handshake, and 0RTT, the
    length field of the packet header is logged in the qlog raw.length
    field, and the value signifies the length of the packet number plus
    the payload.
 
    PacketHeader = {
-       ? quic_bit: bool .default true
        packet_type: $PacketType
 
        ; only if packet_type === "unknown"
        ? packet_type_bytes: uint64
 
+       ; only if packet_type === "1RTT"
+       ? spin_bit: bool
+
+       ; only if packet_type === "1RTT", and if the key phase was
+       ; determined from the key_phase_bit
+       ? key_phase: uint64
+
+       ; only if packet_type === "1RTT", and if key_phase is not set
+       ? key_phase_bit: bool
+
        ; only if packet_type === "initial" || "handshake" || "0RTT" ||
        ;                         "1RTT"
-       ? packet_number: uint64
+       ? packet_number_length: uint8
 
-       ; the bit flags of the packet headers (spin bit, key update bit,
-       ; etc. up to and including the packet number length bits
-       ; if present
-       ? flags: uint8
+       ; only if packet_type === "initial" || "handshake" || "0RTT" ||
+       ;                         "1RTT"
+       ? packet_number: uint64
 
        ; only if packet_type === "initial" || "retry"
        ? token: Token
 
-       ; only if present in the header
+       ; only if packet_type === "initial" || "handshake" || "0RTT"
+       ; Signifies length of the packet_number plus the payload
+       ? length: uint16
+
+       ; only if present in the header.
        ; if correctly using transport:connection_id_updated events,
        ; dcid can be skipped for 1RTT packets
        ? version: QuicVersion

index.html

@@ -395,7 +395,7 @@ <h2>Preview for branch <a href="packet-header">packet-header</a></h2>
       <tr>
         <td><a href="packet-header/draft-ietf-quic-qlog-quic-events.html" class="html draft-ietf-quic-qlog-quic-events" title="QUIC event definitions for qlog (HTML)">QUIC event definitions for qlog</a></td>
         <td><a href="packet-header/draft-ietf-quic-qlog-quic-events.txt" class="txt draft-ietf-quic-qlog-quic-events" title="QUIC event definitions for qlog (Text)">plain text</a></td>
-        <td><a href="https://author-tools.ietf.org/api/iddiff?url_1=https://quicwg.github.io/qlog/draft-ietf-quic-qlog-quic-events.txt&amp;url_2=https://quicwg.github.io/qlog/packet-header/draft-ietf-quic-qlog-quic-events.txt" class="diff draft-ietf-quic-qlog-quic-events">diff with main</a></td>
+        <td>same as main</td>
       </tr>
     </table>
     <h2>Preview for branch <a href="capsule">capsule</a></h2>