mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 17:17:06 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: h3: fix crash due to h3 traces

Browse Source 
This commit is identical to the preceeding patch. However, these traces
are from another patch with a different backport scope :
    56a86ddfb9
    MINOR: h3: add missing traces on closure

This must be backported up to 2.7 where above patch is scheduled.
This commit is contained in:
Amaury Denoyelle 2023-01-31 15:50:16 +01:00
parent e31867b7fa
commit 78adb4b451
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/h3.c
View File

@ -1713,10 +1713,10 @@ static int h3_send_goaway(struct h3c *h3c)
unsigned char data[3 * QUIC_VARINT_MAX_SIZE]; unsigned char data[3 * QUIC_VARINT_MAX_SIZE];
size_t frm_len = quic_int_getsize(h3c->id_goaway); size_t frm_len = quic_int_getsize(h3c->id_goaway);
TRACE_ENTER(H3_EV_H3C_END, h3c->qcc); TRACE_ENTER(H3_EV_H3C_END, h3c->qcc->conn);
if (!qcs) { if (!qcs) {
TRACE_ERROR("control stream not initialized", H3_EV_H3C_END, h3c->qcc); TRACE_ERROR("control stream not initialized", H3_EV_H3C_END, h3c->qcc->conn);
goto err; goto err;
} }
@ -1729,18 +1729,18 @@ static int h3_send_goaway(struct h3c *h3c)
res = mux_get_buf(qcs); res = mux_get_buf(qcs);
if (!res || b_room(res) < b_data(&pos)) { if (!res || b_room(res) < b_data(&pos)) {
/* Do not try forcefully to emit GOAWAY if no space left. */ /* Do not try forcefully to emit GOAWAY if no space left. */
TRACE_ERROR("cannot send GOAWAY", H3_EV_H3C_END, h3c->qcc, qcs); TRACE_ERROR("cannot send GOAWAY", H3_EV_H3C_END, h3c->qcc->conn, qcs);
goto err; goto err;
} }
b_force_xfer(res, &pos, b_data(&pos)); b_force_xfer(res, &pos, b_data(&pos));
qcc_send_stream(qcs, 1); qcc_send_stream(qcs, 1);
TRACE_LEAVE(H3_EV_H3C_END, h3c->qcc); TRACE_LEAVE(H3_EV_H3C_END, h3c->qcc->conn);
return 0; return 0;
err: err:
TRACE_DEVEL("leaving in error", H3_EV_H3C_END, h3c->qcc); TRACE_DEVEL("leaving in error", H3_EV_H3C_END, h3c->qcc->conn);
return 1; return 1;
} }
@ -1780,7 +1780,7 @@ static void h3_shutdown(void *ctx)
{ {
struct h3c *h3c = ctx; struct h3c *h3c = ctx;
TRACE_ENTER(H3_EV_H3C_END, h3c->qcc); TRACE_ENTER(H3_EV_H3C_END, h3c->qcc->conn);
/* RFC 9114 5.2. Connection Shutdown /* RFC 9114 5.2. Connection Shutdown
* *
@ -1799,7 +1799,7 @@ static void h3_shutdown(void *ctx)
*/ */
qcc_emit_cc_app(h3c->qcc, H3_NO_ERROR, 0); qcc_emit_cc_app(h3c->qcc, H3_NO_ERROR, 0);
TRACE_LEAVE(H3_EV_H3C_END, h3c->qcc); TRACE_LEAVE(H3_EV_H3C_END, h3c->qcc->conn);
} }
static void h3_release(void *ctx) static void h3_release(void *ctx)