diff --git a/include/haproxy/qmux_http.h b/include/haproxy/qmux_http.h index 4a7711401..a7dbe7cc3 100644 --- a/include/haproxy/qmux_http.h +++ b/include/haproxy/qmux_http.h @@ -10,6 +10,7 @@ size_t qcs_http_rcv_buf(struct qcs *qcs, struct buffer *buf, size_t count, char *fin); size_t qcs_http_snd_buf(struct qcs *qcs, struct buffer *buf, size_t count, char *fin); +size_t qcs_http_reset_buf(struct qcs *qcs, struct buffer *buf, size_t count); #endif /* USE_QUIC */ diff --git a/src/mux_quic.c b/src/mux_quic.c index a396e340d..1c615f4e1 100644 --- a/src/mux_quic.c +++ b/src/mux_quic.c @@ -2110,7 +2110,7 @@ static size_t qc_snd_buf(struct stconn *sc, struct buffer *buf, BUG_ON_HOT(qcs->flags & QC_SF_DETACH); if (qcs_is_close_local(qcs) || (qcs->flags & QC_SF_TO_RESET)) { - ret = count; + ret = qcs_http_reset_buf(qcs, buf, count); goto end; } diff --git a/src/qmux_http.c b/src/qmux_http.c index c77707460..3ce4a3438 100644 --- a/src/qmux_http.c +++ b/src/qmux_http.c @@ -87,3 +87,23 @@ size_t qcs_http_snd_buf(struct qcs *qcs, struct buffer *buf, size_t count, return ret; } + +/* QUIC MUX snd_buf reset. HTX data stored in of length will be + * cleared. This can be used when data should not be transmitted any longer. + * + * Return the size in bytes of cleared data. + */ +size_t qcs_http_reset_buf(struct qcs *qcs, struct buffer *buf, size_t count) +{ + struct htx *htx; + + TRACE_ENTER(QMUX_EV_STRM_SEND, qcs->qcc->conn, qcs); + + htx = htx_from_buf(buf); + htx_reset(htx); + htx_to_buf(htx, buf); + + TRACE_LEAVE(QMUX_EV_STRM_SEND, qcs->qcc->conn, qcs); + + return count; +}