RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: xprt-quic: finalize app layer initialization after ALPN nego 

The app layer is initialized after the handshake completion by the XPRT
stack. Call the finalize operation just after that.

Remove the erroneous call to finalize by the mux in the TPs callback as
the app layer is not yet initialized at this stage.

This should fix the missing H3 settings currently not emitted by
haproxy.
This commit is contained in:
Amaury Denoyelle 2021-12-03 14:44:21 +01:00
parent e1f3ff0d08
commit e2288c3087
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mux_quic.c
View File

@ -498,12 +498,6 @@ void quic_mux_transport_params_update(struct qcc *qcc)
qcc->strms[QCS_SRV_BIDI].rx.max_data = srv_params->initial_max_stream_data_bidi_local;
qcc->strms[QCS_SRV_UNI].rx.max_data = srv_params->initial_max_stream_data_uni;
}
/* Now that we have all the flow control information, we can finalize the application
* context.
*/
if (qcc->app_ops)
qcc->app_ops->finalize(qcc->ctx);
}
/* Initialize the mux once it's attached. For outgoing connections, the context

15
src/xprt_quic.c
View File

@ -1827,6 +1827,7 @@ static inline int qc_provide_cdata(struct quic_enc_level *el,
{
int ssl_err, state;
struct quic_conn *qc;
const struct qcc_app_ops *app_ops;
const char *alpn;
int alpn_len;
@ -1887,12 +1888,10 @@ static inline int qc_provide_cdata(struct quic_enc_level *el,
conn_get_alpn(ctx->conn, &alpn, &alpn_len);
if (alpn_len >= 2 && memcmp(alpn, "h3", 2) == 0) {
qc->qcc->app_ops = &h3_ops;
if (!qc->qcc->app_ops->init(qc->qcc))
goto err;
app_ops = qc->qcc->app_ops = &h3_ops;
}
else if (alpn_len >= 10 && memcmp(alpn, "hq-interop", 10) == 0) {
qc->qcc->app_ops = &hq_interop_ops;
app_ops = qc->qcc->app_ops = &hq_interop_ops;
}
else {
/* TODO RFC9001 8.1. Protocol Negotiation
@ -1902,6 +1901,14 @@ static inline int qc_provide_cdata(struct quic_enc_level *el,
goto err;
}
if (app_ops->init) {
if (!app_ops->init(qc->qcc))
goto err;
}
if (app_ops->finalize)
app_ops->finalize(qc->qcc->ctx);
out:
TRACE_LEAVE(QUIC_EV_CONN_SSLDATA, ctx->conn);
return 1;