From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Fri, 7 Apr 2023 16:12:00 +0000 (+0200)
Subject: MINOR: quic: Dump more information at proto level when building packets
X-Git-Tag: v2.8-dev8~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e47adca4322f55884fc74c1eb78561cbf8baa758;p=thirdparty%2Fhaproxy.git

MINOR: quic: Dump more information at proto level when building packets

This should be helpful to debug issues at without too much traces.

Must be backported to 2.7 and 2.6.
---

diff --git a/src/quic_conn.c b/src/quic_conn.c
index 1a9edc698f..0cce20b2c0 100644
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -3433,7 +3433,7 @@ static int qc_prep_app_pkts(struct quic_conn *qc, struct buffer *buf,
 	while (b_contig_space(buf) >= (int)qc->path->mtu + dg_headlen) {
 		int err, probe, cc;
 
-		TRACE_POINT(QUIC_EV_CONN_PHPKTS, qc, qel);
+		TRACE_PROTO("TX prep app pkts", QUIC_EV_CONN_PHPKTS, qc, qel);
 		probe = 0;
 		cc =  qc->flags & QUIC_FL_CONN_IMMEDIATE_CLOSE;
 		/* We do not probe if an immediate close was asked */
@@ -3463,7 +3463,7 @@ static int qc_prep_app_pkts(struct quic_conn *qc, struct buffer *buf,
 			 * MTU, we are here because of the congestion control window. There is
 			 * no need to try to reuse this buffer.
 			 */
-			TRACE_DEVEL("could not prepare anymore packet", QUIC_EV_CONN_PHPKTS, qc);
+			TRACE_PROTO("could not prepare anymore packet", QUIC_EV_CONN_PHPKTS, qc, qel);
 			goto out;
 		default:
 			break;
@@ -3538,7 +3538,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct buffer *buf,
 			(qel == &qc->els[QUIC_TLS_ENC_LEVEL_INITIAL] ||
 			 qel == &qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE]);
 
-		TRACE_PROTO("TX prep pks", QUIC_EV_CONN_PHPKTS, qc, qel);
+		TRACE_PROTO("TX prep pkts", QUIC_EV_CONN_PHPKTS, qc, qel);
 		probe = 0;
 		cc =  qc->flags & QUIC_FL_CONN_IMMEDIATE_CLOSE;
 		/* We do not probe if an immediate close was asked */
@@ -3619,7 +3619,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct buffer *buf,
 			 */
 			if (prv_pkt)
 				qc_txb_store(buf, dglen, first_pkt);
-			TRACE_DEVEL("could not prepare anymore packet", QUIC_EV_CONN_PHPKTS, qc);
+			TRACE_PROTO("could not prepare anymore packet", QUIC_EV_CONN_PHPKTS, qc, qel);
 			goto out;
 		default:
 			break;