From 1e2e683aa289849483ea9d48e9fcdda9559028ec Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Thu, 13 Jul 2023 11:41:26 +0100 Subject: [PATCH] QUIC TXP: Generate forced PINGs correctly Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/21458) --- ssl/quic/quic_txp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c index 15095c7d9e8..1f3715e1707 100644 --- a/ssl/quic/quic_txp.c +++ b/ssl/quic/quic_txp.c @@ -2605,7 +2605,9 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp, /* PING */ tx_helper_unrestrict(h); - if (a.require_ack_eliciting && !have_ack_eliciting && a.allow_ping) { + if ((a.require_ack_eliciting + || (txp->force_ack_eliciting & (1UL << pn_space)) != 0) + && !have_ack_eliciting && a.allow_ping) { WPACKET *wpkt; wpkt = tx_helper_begin(h); -- 2.47.2