From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Thu, 13 Apr 2023 13:55:49 +0000 (+0200)
Subject: MINOR: quic: Display the packet number space flags in traces
X-Git-Tag: v2.8-dev8~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91369cfcd0990ccfab19b981fa4365c2b13eabfc;p=thirdparty%2Fhaproxy.git

MINOR: quic: Display the packet number space flags in traces

Display this information when the encryption level is also displayed.

Must be backported to 2.6 and 2.7.
---

diff --git a/src/quic_conn.c b/src/quic_conn.c
index 50a562d097..8e7f21d05d 100644
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -398,9 +398,10 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
 
 			if (qel) {
 				const struct quic_pktns *pktns = qel->pktns;
-				chunk_appendf(&trace_buf, " qel=%c pto_count=%d cwnd=%llu ppif=%lld pif=%llu "
+				chunk_appendf(&trace_buf, " qel=%c flags=0x%x pto_count=%d cwnd=%llu ppif=%lld pif=%llu "
 				              "if=%llu pp=%u",
 				              quic_enc_level_char_from_qel(qel, qc),
+				              qel->pktns->flags,
 				              qc->path->loss.pto_count,
 				              (unsigned long long)qc->path->cwnd,
 				              (unsigned long long)qc->path->prep_in_flight,
@@ -504,8 +505,9 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
 			if (qel) {
 				const struct quic_pktns *pktns = qel->pktns;
 				chunk_appendf(&trace_buf,
-				              " qel=%c state=%s ack?%d pto_count=%d cwnd=%llu ppif=%lld pif=%llu if=%llu pp=%u off=%llu",
+				              " qel=%c flags=0x%x state=%s ack?%d pto_count=%d cwnd=%llu ppif=%lld pif=%llu if=%llu pp=%u off=%llu",
 				              quic_enc_level_char_from_qel(qel, qc),
+				              qel->pktns->flags,
 				              quic_hdshk_state_str(qc->state),
 				              !!(qel->pktns->flags & QUIC_FL_PKTNS_ACK_REQUIRED),
 				              qc->path->loss.pto_count,