summaryrefslogtreecommitdiffstats
path: root/src/quic_ssl.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 12:20:34 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 12:20:34 +0000
commitf3bb08bb1d94c77704371f8546a739119f0a05b4 (patch)
tree5dfb47fa424ecde655f8950098411a311e9296e6 /src/quic_ssl.c
parentReleasing progress-linux version 2.9.6-1~progress7.99u1. (diff)
downloadhaproxy-f3bb08bb1d94c77704371f8546a739119f0a05b4.tar.xz
haproxy-f3bb08bb1d94c77704371f8546a739119f0a05b4.zip
Merging upstream version 2.9.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--src/quic_ssl.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/quic_ssl.c b/src/quic_ssl.c
index 314f587..85b6717 100644
--- a/src/quic_ssl.c
+++ b/src/quic_ssl.c
@@ -636,29 +636,12 @@ int qc_ssl_provide_all_quic_data(struct quic_conn *qc, struct ssl_sock_ctx *ctx)
{
int ret = 0;
struct quic_enc_level *qel;
- struct ncbuf ncbuf = NCBUF_NULL;
TRACE_ENTER(QUIC_EV_CONN_PHPKTS, qc);
list_for_each_entry(qel, &qc->qel_list, list) {
- struct qf_crypto *qf_crypto, *qf_back;
+ struct quic_cstream *cstream = qel->cstream;
- list_for_each_entry_safe(qf_crypto, qf_back, &qel->rx.crypto_frms, list) {
- const unsigned char *crypto_data = qf_crypto->data;
- size_t crypto_len = qf_crypto->len;
-
- /* Free this frame asap */
- LIST_DELETE(&qf_crypto->list);
- pool_free(pool_head_qf_crypto, qf_crypto);
-
- if (!qc_ssl_provide_quic_data(&ncbuf, qel->level, ctx,
- crypto_data, crypto_len))
- goto leave;
-
- TRACE_DEVEL("buffered crypto data were provided to TLS stack",
- QUIC_EV_CONN_PHPKTS, qc, qel);
- }
-
- if (!qel->cstream)
+ if (!cstream)
continue;
if (!qc_treat_rx_crypto_frms(qc, qel, ctx))