mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: ssl: load xprt_qstrm after handshake completion

Browse Source 
On SSL handshake completion, MUX layer can be initialized if not already
the case. However, for QMux protocol, it is necessary first to perform
transport parameters exchange, via the new xprt_qstrm layer. This patch
ensures this is performed if any flag CO_FL_QSTRM_* is set on the
connection.

Also, SSL layer registers itself via add_xprt. This ensures that it can
be used by xprt_qstrm for the emission/reception of the necessary
frames.
This commit is contained in:
Amaury Denoyelle 2026-03-25 14:17:38 +01:00
parent f1ed1de317
commit 3c42a7e9ac
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/connection.c
View File

@ -182,7 +182,7 @@ int conn_notify_mux(struct connection *conn, int old_flags, int forced_wake)
* information to create one, typically from the ALPN. If we're
* done with the handshake, attempt to create one.
*/
if (unlikely(!conn->mux) && !(conn->flags & CO_FL_WAIT_XPRT)) {
if (unlikely(!conn->mux) && !(conn->flags & (CO_FL_WAIT_XPRT|CO_FL_QSTRM_RECV|CO_FL_QSTRM_SEND))) {
ret = conn_create_mux(conn, NULL);
if (ret < 0)
goto done;

27
src/ssl_sock.c
View File

@ -6957,9 +6957,30 @@ struct task *ssl_sock_io_cb(struct task *t, void *context, unsigned int state)
if (ctx->conn->xprt_ctx == ctx) {
int closed_connection = 0;
if (!ctx->conn->mux)
ret = conn_create_mux(ctx->conn, &closed_connection);
if (ret >= 0 && !woke && ctx->conn->mux && ctx->conn->mux->wake) {
if (!ctx->conn->mux) {
if (ctx->conn->flags & (CO_FL_QSTRM_RECV|CO_FL_QSTRM_SEND)) {
const struct xprt_ops *ops = xprt_get(XPRT_QSTRM);
void *xprt_ctx_hs = NULL;
ret = ops->init(conn, &xprt_ctx_hs);
BUG_ON(ret);
ret = ops->add_xprt(conn, xprt_ctx_hs,
conn->xprt_ctx, conn->xprt, NULL, NULL);
BUG_ON(ret);
conn->xprt = ops;
conn->xprt_ctx = xprt_ctx_hs;
ret = conn->xprt->start(conn, xprt_ctx_hs);
BUG_ON(ret);
}
else
ret = conn_create_mux(ctx->conn, &closed_connection);
}
if (ret >= 0 && ctx->conn->mux && !woke && ctx->conn->mux && ctx->conn->mux->wake) {
ret = CALL_MUX_WITH_RET(ctx->conn->mux, wake(ctx->conn));
if (ret < 0)
closed_connection = 1;