konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: quic: handle CONNECTION_CLOSE frame

Browse Source 
On receiving CONNECTION_CLOSE frame, the mux is flagged for immediate
connection close. A stream is closed even if there is data not ACKed
left if CONNECTION_CLOSE has been received.
This commit is contained in:
Amaury Denoyelle 2021-10-13 16:34:49 +02:00
parent 1e308ffc79
commit 493bb1db10
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/mux_quic-t.h
View File

@ -77,6 +77,8 @@
/* other flags */
#define QC_CF_IS_BACK 0x00008000 // this is an outgoing connection
#define QC_CF_CC_RECV 0x00010000 // CONNECTION_CLOSE received
extern struct pool_head *pool_head_qcs;
/* Stream types */

8
src/mux_quic.c
View File

@ -1498,14 +1498,18 @@ static void qc_detach(struct conn_stream *cs)
struct qcc *qcc = qcs->qcc;
TRACE_ENTER(QC_EV_STRM_END, qcs ? qcs->qcc->conn : NULL, qcs);
if (b_data(&qcs->tx.buf) || b_data(&qcs->tx.xprt_buf)) {
if (b_data(&qcs->tx.buf) ||
(b_data(&qcs->tx.xprt_buf) && !(qcc->flags & QC_CF_CC_RECV))) {
qcs->flags |= QC_SF_DETACH;
goto out;
}
qcs_destroy(qcs);
if (qcc_is_dead(qcc))
if (qcc_is_dead(qcc)) {
qc_release(qcc);
TRACE_LEAVE(QC_EV_STRM_END, NULL);
return;
}
out:
TRACE_LEAVE(QC_EV_STRM_END, qcs ? qcs->qcc->conn : NULL);

1
src/xprt_quic.c
View File

@ -2040,6 +2040,7 @@ static int qc_parse_pkt_frms(struct quic_rx_packet *pkt, struct ssl_sock_ctx *ct
break;
case QUIC_FT_CONNECTION_CLOSE:
case QUIC_FT_CONNECTION_CLOSE_APP:
conn->qcc->flags |= QC_CF_CC_RECV;
break;
case QUIC_FT_HANDSHAKE_DONE:
if (objt_listener(ctx->conn->target))