mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 14:51:27 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mux-quic: remove dead code in qcs_xfer_data()

Browse Source 
Since previous patch
 MINOR: mux-quic: split xfer and STREAM frames build
there is no way to report an error in qcs_xfer_data().

This should fix github issue #1669.
This commit is contained in:
Amaury Denoyelle 2022-04-22 09:47:58 +02:00
parent e1e9f6bbe5
commit 3eb892fd65
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mux_quic.c
View File

@ -563,7 +563,7 @@ static void qc_release(struct qcc *qcc)
* repeatdly this function on multiple streams before passing the data to the * repeatdly this function on multiple streams before passing the data to the
* lower layer. * lower layer.
* *
* Returns the total bytes of newly transferred data or a negative error code. * Returns the total bytes of newly transferred data. It may be 0 if none.
*/ */
static int qcs_xfer_data(struct qcs *qcs, struct buffer *out, static int qcs_xfer_data(struct qcs *qcs, struct buffer *out,
struct buffer *payload, uint64_t max_data) struct buffer *payload, uint64_t max_data)
@ -621,10 +621,6 @@ static int qcs_xfer_data(struct qcs *qcs, struct buffer *out,
} }
return total; return total;
err:
TRACE_DEVEL("leaving in error", QMUX_EV_QCS_SEND, qcc->conn, qcs);
return -1;
} }
static int qcs_build_stream_frm(struct qcs *qcs, struct buffer *out, char fin, static int qcs_build_stream_frm(struct qcs *qcs, struct buffer *out, char fin,
@ -871,8 +867,6 @@ static int _qc_send_qcs(struct qcs *qcs, struct list *frms,
/* Transfer data from <buf> to <out>. */ /* Transfer data from <buf> to <out>. */
if (b_data(buf)) { if (b_data(buf)) {
xfer = qcs_xfer_data(qcs, out, buf, qcc_max_data); xfer = qcs_xfer_data(qcs, out, buf, qcc_max_data);
BUG_ON(xfer < 0); /* TODO handle this properly */
if (xfer > 0) { if (xfer > 0) {
qcs_notify_send(qcs); qcs_notify_send(qcs);
qcs->flags &= ~QC_SF_BLK_MROOM; qcs->flags &= ~QC_SF_BLK_MROOM;