From: Frederic Lecaille <flecaille@haproxy.com>
Date: Thu, 12 Dec 2024 09:45:26 +0000 (+0100)
Subject: BUG/MINOR: quic: wrong logical statement in in_recovery_period() (BBR)
X-Git-Tag: v3.2-dev2~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dbf6b8bedadd5d287ab44e1a387a89e2fc6c70b;p=thirdparty%2Fhaproxy.git

BUG/MINOR: quic: wrong logical statement in in_recovery_period() (BBR)

A && logical operator was badly replaced by a || in this function which decides
if BBR is in a recovery period.

Must be backported to 3.1.
---

diff --git a/src/quic_cc_bbr.c b/src/quic_cc_bbr.c
index 39fd673df4..9a3b0a83ea 100644
--- a/src/quic_cc_bbr.c
+++ b/src/quic_cc_bbr.c
@@ -1296,7 +1296,7 @@ static void bbr_update_control_parameters(struct bbr *bbr,
 
 static inline int in_recovery_period(struct quic_cc_path *p, uint32_t ts)
 {
-	return tick_isset(p->recovery_start_ts) ||
+	return tick_isset(p->recovery_start_ts) &&
 		tick_is_le(ts, p->recovery_start_ts);
 }