mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: mux-quic: use stream states to mark as detached

Browse Source 
Adjust condition to detach a qcs instance : if the stream is not locally
close it is not directly free. This should improve stream closing by
ensuring that either FIN or a RESET_STREAM is sent before destroying it.
This commit is contained in:
Amaury Denoyelle 2022-07-11 11:23:17 +02:00
parent 38e6006da1
commit 20d1f84ce4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mux_quic.c
View File

@ -1508,8 +1508,7 @@ static int qc_purge_streams(struct qcc *qcc)
/* Release detached streams with empty buffer. */
if (qcs->flags & QC_SF_DETACH) {
if (!b_data(&qcs->tx.buf) &&
qcs->tx.offset == qcs->tx.sent_offset) {
if (qcs_is_close_local(qcs)) {
TRACE_DEVEL("purging detached stream", QMUX_EV_QCC_WAKE, qcs->qcc->conn, qcs);
qcs_destroy(qcs);
release = 1;
@ -1734,8 +1733,7 @@ static void qc_detach(struct sedesc *sd)
//BUG_ON_HOT(!qcs_is_close_remote(qcs));
--qcc->nb_sc;
if ((b_data(&qcs->tx.buf) || qcs->tx.offset > qcs->tx.sent_offset) &&
!(qcc->conn->flags & CO_FL_ERROR)) {
if (!qcs_is_close_local(qcs) && !(qcc->conn->flags & CO_FL_ERROR)) {
TRACE_DEVEL("leaving with remaining data, detaching qcs", QMUX_EV_STRM_END, qcc->conn, qcs);
qcs->flags |= QC_SF_DETACH;
return;
@ -1838,7 +1836,6 @@ static size_t qc_snd_buf(struct stconn *sc, struct buffer *buf,
if (qcs_is_close_local(qcs)) {
ret = count;
count = 0;
goto end;
}