From d2a536e458f4cd7ffeadfe302c23bbfe263b0053 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 3 Jun 2024 07:11:10 +0200
Subject: Merging upstream version 3.0.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/quic_stream.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'src/quic_stream.c')

diff --git a/src/quic_stream.c b/src/quic_stream.c
index a4b984d..e153660 100644
--- a/src/quic_stream.c
+++ b/src/quic_stream.c
@@ -6,7 +6,7 @@
 #include <haproxy/buf.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/list.h>
-#include <haproxy/mux_quic-t.h>
+#include <haproxy/mux_quic.h>
 #include <haproxy/pool.h>
 #include <haproxy/quic_conn.h>
 #include <haproxy/task.h>
@@ -37,10 +37,13 @@ static void qc_stream_buf_free(struct qc_stream_desc *stream,
 	/* notify MUX about available buffers. */
 	--qc->stream_buf_count;
 	if (qc->mux_state == QC_MUX_READY) {
-		if (qc->qcc->flags & QC_CF_CONN_FULL) {
-			qc->qcc->flags &= ~QC_CF_CONN_FULL;
-			tasklet_wakeup(qc->qcc->wait_event.tasklet);
-		}
+		/* notify MUX about available buffers.
+		 *
+		 * TODO several streams may be woken up even if a single buffer
+		 * is available for now.
+		 */
+		while (qcc_notify_buf(qc->qcc))
+			;
 	}
 }
 
@@ -202,11 +205,13 @@ void qc_stream_desc_free(struct qc_stream_desc *stream, int closing)
 
 		qc->stream_buf_count -= free_count;
 		if (qc->mux_state == QC_MUX_READY) {
-			/* notify MUX about available buffers. */
-			if (qc->qcc->flags & QC_CF_CONN_FULL) {
-				qc->qcc->flags &= ~QC_CF_CONN_FULL;
-				tasklet_wakeup(qc->qcc->wait_event.tasklet);
-			}
+			/* notify MUX about available buffers.
+			 *
+			 * TODO several streams may be woken up even if a single buffer
+			 * is available for now.
+			 */
+			while (qcc_notify_buf(qc->qcc))
+				;
 		}
 	}
 
-- 
cgit v1.2.3