From b78805488ba582286a7bad09e4ed2fee378ff6e9 Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Wed, 9 Feb 2022 10:28:53 +0100 Subject: [PATCH] MINOR: h3: hardcode the stream id of control stream Use the value of 0x3 for the stream-id of H3 control-stream. As a consequence, qcs_get_next_id is now unused and is thus removed. --- include/haproxy/mux_quic.h | 6 ------ src/h3.c | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/haproxy/mux_quic.h b/include/haproxy/mux_quic.h index 5abb1df9f..4452076f0 100644 --- a/include/haproxy/mux_quic.h +++ b/include/haproxy/mux_quic.h @@ -46,12 +46,6 @@ static inline int qc_local_stream_id(struct qcc *qcc, uint64_t id) return id & QCS_ID_SRV_INTIATOR_BIT; } -static inline int qcs_get_next_id(struct qcc *qcc, enum qcs_type type) -{ - BUG_ON(qcc->strms[type].nb_streams + 1 > qcc->strms[type].max_streams); - return (qcc->strms[type].nb_streams++ << QCS_ID_TYPE_SHIFT) | type; -} - struct eb64_node *qcc_get_qcs(struct qcc *qcc, uint64_t id); /* Install the applicative layer of a QUIC connection on mux . diff --git a/src/h3.c b/src/h3.c index 79d746001..d72f082e2 100644 --- a/src/h3.c +++ b/src/h3.c @@ -706,10 +706,8 @@ static int h3_attach_ruqs(struct qcs *qcs, void *ctx) static int h3_finalize(void *ctx) { struct h3 *h3 = ctx; - int lctrl_id; - lctrl_id = qcs_get_next_id(h3->qcc, QCS_SRV_UNI); - h3->lctrl.qcs = qcs_new(h3->qcc, lctrl_id, QCS_SRV_UNI); + h3->lctrl.qcs = qcs_new(h3->qcc, 0x3, QCS_SRV_UNI); if (!h3->lctrl.qcs) return 0;