mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: quic: Really cancel the connection timer from qc_set_timer()

Browse Source 
The ->expire field of the timer task to be cancelled was not reset
to TICK_ETERNITY.

Must be backported to 2.6 and 2.7.
This commit is contained in:
Frédéric Lécaille 2023-02-08 17:43:13 +01:00 committed by Amaury Denoyelle
parent 75c8ad5490
commit dea3298282
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/quic_conn.c
View File

@ -782,8 +782,11 @@ static inline void qc_set_timer(struct quic_conn *qc)
if (tick_isset(pto)) if (tick_isset(pto))
qc->timer = pto; qc->timer = pto;
out: out:
if (qc->timer_task && qc->timer != TICK_ETERNITY) { if (qc->timer_task) {
if (tick_is_expired(qc->timer, now_ms)) { if (qc->timer == TICK_ETERNITY) {
qc->timer_task->expire = TICK_ETERNITY;
}
else if (tick_is_expired(qc->timer, now_ms)) {
TRACE_DEVEL("wakeup asap timer task", QUIC_EV_CONN_STIMER, qc); TRACE_DEVEL("wakeup asap timer task", QUIC_EV_CONN_STIMER, qc);
task_wakeup(qc->timer_task, TASK_WOKEN_MSG); task_wakeup(qc->timer_task, TASK_WOKEN_MSG);
} }