]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: h3/hq_interop: Fix CS and stream creation
authorChristopher Faulet <cfaulet@haproxy.com>
Thu, 24 Feb 2022 10:13:57 +0000 (11:13 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 24 Feb 2022 10:13:59 +0000 (11:13 +0100)
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.

src/h3.c
src/hq_interop.c

index b5699bfbfc4307c7dad2b68325bdf4d5fea4581a..7fbd483c6b0127d50e407c5baf693414884a3b63 100644 (file)
--- 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.
index c9d8c9a3dad88d9a175af8a831c7740087b9e018..0e5561d8aa9792b13c3ebbeae5eda4e0fff02fd2 100644 (file)
@@ -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);