RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-01 09:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: quic: add quic_conn instance in traces for qc_new_conn

Browse Source 
The connection instance has been replaced by a quic_conn as first
argument to QUIC traces. It is possible to report the quic_conn instance
in the qc_new_conn(), contrary to the connection which is not
initialized at this stage.
This commit is contained in:
Amaury Denoyelle 2021-12-21 14:51:56 +01:00
parent 7aaeb5b567
commit e770ce3980
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xprt_quic.c
View File

@ -3327,7 +3327,7 @@ static struct quic_conn *qc_new_conn(unsigned int version, int ipv4,
buf_area = pool_alloc(pool_head_quic_conn_rxbuf); buf_area = pool_alloc(pool_head_quic_conn_rxbuf);
if (!buf_area) { if (!buf_area) {
TRACE_PROTO("Could not allocate a new RX buffer", QUIC_EV_CONN_INIT); TRACE_PROTO("Could not allocate a new RX buffer", QUIC_EV_CONN_INIT, qc);
goto err; goto err;
} }
@ -3362,7 +3362,7 @@ static struct quic_conn *qc_new_conn(unsigned int version, int ipv4,
icid = new_quic_cid(&qc->cids, qc, 0); icid = new_quic_cid(&qc->cids, qc, 0);
if (!icid) { if (!icid) {
TRACE_PROTO("Could not allocate a new connection ID", QUIC_EV_CONN_INIT); TRACE_PROTO("Could not allocate a new connection ID", QUIC_EV_CONN_INIT, qc);
goto err; goto err;
} }
@ -3382,7 +3382,7 @@ static struct quic_conn *qc_new_conn(unsigned int version, int ipv4,
/* QUIC encryption level context initialization. */ /* QUIC encryption level context initialization. */
for (i = 0; i < QUIC_TLS_ENC_LEVEL_MAX; i++) { for (i = 0; i < QUIC_TLS_ENC_LEVEL_MAX; i++) {
if (!quic_conn_enc_level_init(qc, i)) { if (!quic_conn_enc_level_init(qc, i)) {
TRACE_PROTO("Could not initialize an encryption level", QUIC_EV_CONN_INIT); TRACE_PROTO("Could not initialize an encryption level", QUIC_EV_CONN_INIT, qc);
goto err; goto err;
} }
/* Initialize the packet number space. */ /* Initialize the packet number space. */
@ -3406,7 +3406,7 @@ static struct quic_conn *qc_new_conn(unsigned int version, int ipv4,
HA_RWLOCK_INIT(&qc->rx.buf_rwlock); HA_RWLOCK_INIT(&qc->rx.buf_rwlock);
LIST_INIT(&qc->rx.pkt_list); LIST_INIT(&qc->rx.pkt_list);
if (!quic_tls_ku_init(qc)) { if (!quic_tls_ku_init(qc)) {
TRACE_PROTO("Key update initialization failed", QUIC_EV_CONN_INIT); TRACE_PROTO("Key update initialization failed", QUIC_EV_CONN_INIT, qc);
goto err; goto err;
} }
@ -3414,12 +3414,12 @@ static struct quic_conn *qc_new_conn(unsigned int version, int ipv4,
qc->path = &qc->paths[0]; qc->path = &qc->paths[0];
quic_path_init(qc->path, ipv4, default_quic_cc_algo, qc); quic_path_init(qc->path, ipv4, default_quic_cc_algo, qc);
TRACE_LEAVE(QUIC_EV_CONN_INIT); TRACE_LEAVE(QUIC_EV_CONN_INIT, qc);
return qc; return qc;
err: err:
TRACE_DEVEL("leaving in error", QUIC_EV_CONN_INIT); TRACE_DEVEL("leaving in error", QUIC_EV_CONN_INIT, qc ? qc : NULL);
quic_conn_free(qc); quic_conn_free(qc);
return NULL; return NULL;
} }