konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: h3: hardcode the stream id of control stream

Browse Source 
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.
This commit is contained in:
Amaury Denoyelle 2022-02-09 10:28:53 +01:00
parent c9414e25c4
commit b78805488b
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/mux_quic.h
View File

@ -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 <app_ops> applicative layer of a QUIC connection on mux <qcc>.

4
src/h3.c
View File

@ -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;