From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Fri, 7 Apr 2023 15:58:49 +0000 (+0200)
Subject: MINOR: quic: Modify qc_try_rm_hp() traces
X-Git-Tag: v2.8-dev8~186
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0aaa07aa3483b68de3d22b4f63535007dfd9001;p=thirdparty%2Fhaproxy.git

MINOR: quic: Modify qc_try_rm_hp() traces

Dump at proto level the packet information when its header protection was removed.
Remove no more use qpkt_trace variable.

Must be backported to 2.7 and 2.6.
---

diff --git a/src/quic_conn.c b/src/quic_conn.c
index e76355c9be..1a9edc698f 100644
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -5932,9 +5932,7 @@ static inline int qc_try_rm_hp(struct quic_conn *qc,
 	enum quic_tls_enc_level tel;
 	struct quic_enc_level *qel;
 	/* Only for traces. */
-	struct quic_rx_packet *qpkt_trace;
 
-	qpkt_trace = NULL;
 	TRACE_ENTER(QUIC_EV_CONN_TRMHP, qc);
 	BUG_ON(!pkt->pn_offset);
 
@@ -5968,7 +5966,7 @@ static inline int qc_try_rm_hp(struct quic_conn *qc,
 			goto out;
 		}
 
-		qpkt_trace = pkt;
+		TRACE_PROTO("RX hp removed", QUIC_EV_CONN_TRMHP, qc, pkt);
 	}
 	else {
 		if (qel->tls_ctx.flags & QUIC_FL_TLS_SECRETS_DCD) {
@@ -5993,7 +5991,7 @@ static inline int qc_try_rm_hp(struct quic_conn *qc,
 	
 	ret = 1;
  out:
-	TRACE_LEAVE(QUIC_EV_CONN_TRMHP, qc, qpkt_trace);
+	TRACE_LEAVE(QUIC_EV_CONN_TRMHP, qc);
 	return ret;
 }