From: Willy Tarreau <w@1wt.eu>
Date: Fri, 15 Nov 2024 14:41:21 +0000 (+0100)
Subject: BUG/MINOR: mux_quic: make sure to always apply offsets to now_ms in expiration
X-Git-Tag: v3.1-dev13~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f66bfcff96082ce5c98c635c5da7a9ba157a20af;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mux_quic: make sure to always apply offsets to now_ms in expiration

Now_ms can be zero nowadays, so it's not suitable for direct assignment to
t->expire, as there's a risk that the timer never wakes up once assigned
(TICK_ETERNITY). Let's use tick_add(now_ms, 0) for an immediate wakeup
instead. The impact looks nul since the task is also woken up, but better
not leave such tasks in the timer tree anyway.

This should be backported where it applies.
---

diff --git a/src/mux_quic.c b/src/mux_quic.c
index d704403d30..80f4eff2d0 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -366,7 +366,7 @@ static void qcc_refresh_timeout(struct qcc *qcc)
 					/* We are past the soft close window end, wake the timeout
 					 * task up immediately.
 					 */
-					qcc->task->expire = now_ms;
+					qcc->task->expire = tick_add(now_ms, 0);
 					task_wakeup(qcc->task, TASK_WOKEN_TIMER);
 				}
 			}