From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Wed, 30 Mar 2022 12:36:40 +0000 (+0200)
Subject: MINOR: quic: Do not display any timer value from process_timer()
X-Git-Tag: v2.6-dev5~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03235d78ae9783b72fb1e961bc44e2597a6d9dad;p=thirdparty%2Fhaproxy.git

MINOR: quic: Do not display any timer value from process_timer()

This is confusing to display the connection timer from this function as it is not
supposed to update it. Only qc_set_timer() should do that.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 7ba47a6f47..dd9c3543ae 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -529,7 +529,7 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
 				}
 			}
 
-			if (!(mask & QUIC_EV_CONN_SPTO) && qc->timer_task) {
+			if (!(mask & (QUIC_EV_CONN_SPTO|QUIC_EV_CONN_PTIMER)) && qc->timer_task) {
 				chunk_appendf(&trace_buf,
 				              " expire=%dms", TICKS_TO_MS(qc->timer - now_ms));
 			}