RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-31 02:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: mux-quic: refactor uni streams TX/send H3 SETTINGS

Browse Source 
Remove the unneeded skip over unidirectional streams in qc_send(). This
unify sending for both uni and bidi streams.

In fact, the only local unidirectional streams in use for the moment is
the H3 Control stream responsible of SETTINGS emission. The frame was
already properly generated in qcs.tx.buf, but not send due to stream
skip in qc_send(). Now, there is no need to ignore uni streams so remove
this condition.

This fixes the emission of H3 settings which is now properly emitted.

Uni and bidi streams use the same set of funtcions for sending. One of
the most notable gain is that flow-control is now enforced for uni
streams.
This commit is contained in:
Amaury Denoyelle 2022-05-23 11:39:14 +02:00
parent 6754d7e2ed
commit c6195d77b4
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/h3.c
View File

@ -870,7 +870,6 @@ static int h3_finalize(void *ctx)
if (!h3c->lctrl.qcs)
return 0;
/* Wakeup ->lctrl uni-stream */
h3_control_send(&h3c->lctrl, h3c);
return 1;
@ -967,7 +966,7 @@ static int h3_init(struct qcc *qcc)
!h3_uqs_init(&h3c->rctrl, h3c, h3_control_recv, h3_uqs_task))
goto fail_no_h3_ruqs;
if (!h3_uqs_init(&h3c->lctrl, h3c, h3_control_send, h3_uqs_task) ||
if (!h3_uqs_init(&h3c->lctrl, h3c, NULL, h3_uqs_task) ||
!h3_uqs_init(&h3c->lqpack_enc, h3c, NULL, h3_uqs_task) ||
!h3_uqs_init(&h3c->lqpack_dec, h3c, NULL, h3_uqs_task))
goto fail_no_h3_luqs;

12
src/mux_quic.c
View File

@ -1104,14 +1104,12 @@ static int qc_send(struct qcc *qcc)
node = eb64_first(&qcc->streams_by_id);
while (node) {
int ret;
qcs = eb64_entry(node, struct qcs, by_id);
uint64_t id;
/* TODO
* for the moment, unidirectional streams have their own
* mechanism for sending. This should be unified in the future,
* in this case the next check will be removed.
*/
if (quic_stream_is_uni(qcs->id)) {
qcs = eb64_entry(node, struct qcs, by_id);
id = qcs->id;
if (quic_stream_is_uni(id) && quic_stream_is_remote(qcc, id)) {
node = eb64_next(node);
continue;
}