RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-17 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: quic: Stream FIN bit fix in qcs_push_frame()

Browse Source 
The FIN of a STREAM frame to be built must be set if there is no more
at all data in the ring buffer.
Do not do anything if there is nothing to transfer the ->tx.buf mux
buffer via b_force_xfer() (without zero copy)
This commit is contained in:
Frédéric Lécaille 2021-09-20 17:50:03 +02:00 committed by Amaury Denoyelle
parent 1c482c665b
commit d2ba0967b7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mux_quic.c
View File

@ -1295,14 +1295,19 @@ static int qcs_push_frame(struct qcs *qcs, struct buffer *payload, int fin, uint
struct quic_frame *frm; struct quic_frame *frm;
struct buffer *buf = &qcs->tx.buf; struct buffer *buf = &qcs->tx.buf;
struct quic_enc_level *qel = &qcs->qcc->conn->qc->els[QUIC_TLS_ENC_LEVEL_APP]; struct quic_enc_level *qel = &qcs->qcc->conn->qc->els[QUIC_TLS_ENC_LEVEL_APP];
int total = 0; int total = 0, to_xfer;
qc_get_buf(qcs->qcc, buf); qc_get_buf(qcs->qcc, buf);
total = b_force_xfer(buf, payload, QUIC_MIN(b_data(payload), b_room(buf))); to_xfer = QUIC_MIN(b_data(payload), b_room(buf));
if (!to_xfer)
goto out;
frm = pool_zalloc(pool_head_quic_frame); frm = pool_zalloc(pool_head_quic_frame);
if (!frm) if (!frm)
goto err; goto err;
total = b_force_xfer(buf, payload, to_xfer);
fin = fin && !b_data(payload);
frm->type = QUIC_FT_STREAM_8; frm->type = QUIC_FT_STREAM_8;
if (fin) if (fin)
frm->type |= QUIC_STREAM_FRAME_TYPE_FIN_BIT; frm->type |= QUIC_STREAM_FRAME_TYPE_FIN_BIT;
@ -1319,6 +1324,7 @@ static int qcs_push_frame(struct qcs *qcs, struct buffer *payload, int fin, uint
} }
MT_LIST_APPEND(&qel->pktns->tx.frms, &frm->mt_list); MT_LIST_APPEND(&qel->pktns->tx.frms, &frm->mt_list);
out:
fprintf(stderr, "%s: total=%d fin=%d offset=%lu\n", __func__, total, fin, offset); fprintf(stderr, "%s: total=%d fin=%d offset=%lu\n", __func__, total, fin, offset);
return total; return total;