From: Willy Tarreau <w@1wt.eu>
Date: Tue, 10 May 2022 09:24:26 +0000 (+0200)
Subject: CLEANUP: mux-quic: always take the endp from the qcs not the cs
X-Git-Tag: v2.6-dev10~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15b0721ca5577cf675b8f122276986e84eaf7461;p=thirdparty%2Fhaproxy.git

CLEANUP: mux-quic: always take the endp from the qcs not the cs

At a few places the endpoint pointer was retrieved from the conn_stream
while it's safer and more long-term proof to take it from the qcs. Let's
just do that.
---

diff --git a/src/mux_quic.c b/src/mux_quic.c
index d5f448ca5e..0d7d4240f5 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -1298,15 +1298,15 @@ static size_t qc_rcv_buf(struct conn_stream *cs, struct buffer *buf,
 
  end:
 	if (b_data(&qcs->rx.app_buf)) {
-		cs->endp->flags |= (CS_EP_RCV_MORE | CS_EP_WANT_ROOM);
+		qcs->endp->flags |= (CS_EP_RCV_MORE | CS_EP_WANT_ROOM);
 	}
 	else {
-		cs->endp->flags &= ~(CS_EP_RCV_MORE | CS_EP_WANT_ROOM);
-		if (cs->endp->flags & CS_EP_ERR_PENDING)
-			cs->endp->flags |= CS_EP_ERROR;
+		qcs->endp->flags &= ~(CS_EP_RCV_MORE | CS_EP_WANT_ROOM);
+		if (qcs->endp->flags & CS_EP_ERR_PENDING)
+			qcs->endp->flags |= CS_EP_ERROR;
 
 		if (fin)
-			cs->endp->flags |= CS_EP_EOI;
+			qcs->endp->flags |= CS_EP_EOI;
 
 		if (b_size(&qcs->rx.app_buf)) {
 			b_free(&qcs->rx.app_buf);