From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 24 Feb 2022 10:13:57 +0000 (+0100)
Subject: BUG/MINOR: h3/hq_interop: Fix CS and stream creation
X-Git-Tag: v2.6-dev2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9264a2c0e8e031ab9ae8193ad576c8fceed7a82b;p=thirdparty%2Fhaproxy.git

BUG/MINOR: h3/hq_interop: Fix CS and stream creation

Some recent API changes about conn-stream and stream creation were not fully
applied to the H3 part.

It is 2.6-DEV specific, no backport is needed.
---

diff --git a/src/h3.c b/src/h3.c
index b5699bfbfc..7fbd483c6b 100644
--- a/src/h3.c
+++ b/src/h3.c
@@ -179,11 +179,11 @@ static int h3_headers_to_htx(struct qcs *qcs, struct buffer *buf, uint64_t len,
 	cs = cs_new();
 	if (!cs)
 		return 1;
-	cs_attach_endp(&qcs->qcc->conn->obj_type, qcs);
+	cs_attach_endp(cs, &qcs->qcc->conn->obj_type, qcs);
 
 	cs->flags |= CS_FL_NOT_FIRST;
 	cs->ctx = qcs;
-	stream_create_from_cs(cs, &htx_buf);
+	stream_new(qcs->qcc->conn->owner, cs, &htx_buf);
 
 	/* buffer is transferred to conn_stream and set to NULL
 	 * except on stream creation error.
diff --git a/src/hq_interop.c b/src/hq_interop.c
index c9d8c9a3da..0e5561d8aa 100644
--- a/src/hq_interop.c
+++ b/src/hq_interop.c
@@ -77,7 +77,7 @@ static int hq_interop_decode_qcs(struct qcs *qcs, int fin, void *ctx)
 		return -1;
 	cs_attach_endp(cs, &qcs->qcc->conn->obj_type, qcs);
 	cs->ctx = qcs;
-	stream_create_from_cs(cs, &htx_buf);
+	stream_new(qcs->qcc->conn->owner, cs, &htx_buf);
 
 	b_del(rxbuf, b_data(rxbuf));
 	b_free(&htx_buf);