From: Hugo Landau <hlandau@openssl.org>
Date: Fri, 8 Sep 2023 12:31:36 +0000 (+0100)
Subject: QLOG: Wiring: QUIC TXPIM: Record the packet type
X-Git-Tag: openssl-3.3.0-alpha1~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40c835dac7e68528bfdc9322041ac93ef274c37d;p=thirdparty%2Fopenssl.git

QLOG: Wiring: QUIC TXPIM: Record the packet type

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)
---

diff --git a/include/internal/quic_txpim.h b/include/internal/quic_txpim.h
index efe1ca6302a..7219f21ef65 100644
--- a/include/internal/quic_txpim.h
+++ b/include/internal/quic_txpim.h
@@ -33,6 +33,9 @@ typedef struct quic_txpim_pkt_st {
     /* Reserved for FIFD use. */
     QUIC_FIFD          *fifd;
 
+    /* QUIC_PKT_TYPE value. For diagnostic use only. */
+    unsigned char       pkt_type;
+
     /* Regenerate-strategy frames. */
     unsigned int        had_handshake_done_frame    : 1;
     unsigned int        had_max_data_frame          : 1;
diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index b18f8c0e38e..c23ec346681 100644
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -2812,6 +2812,7 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
     tpkt->ackm_pkt.is_pto_probe     = 0;
     tpkt->ackm_pkt.is_mtu_probe     = 0;
     tpkt->ackm_pkt.time             = txp->args.now(txp->args.now_arg);
+    tpkt->pkt_type                  = pkt->phdr.type;
 
     /* Done. */
     return rc;