mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 06:41:32 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: quic: Fix QUIC_EV_CONN_PRSAFRM event traces

Browse Source 
This is a quic_frame struct pointer which must be passed as parameter
to TRACE_PROTO() for such an event.
This commit is contained in:
Frédéric Lécaille 2022-05-31 12:04:42 +02:00 committed by Amaury Denoyelle
parent 417c7c03f4
commit fdc1b96357
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xprt_quic.c
View File

@ -1694,7 +1694,7 @@ static inline void qc_requeue_nacked_pkt_tx_frms(struct quic_conn *qc,
node = eb64_lookup(&qc->streams_by_id, strm_frm->id); node = eb64_lookup(&qc->streams_by_id, strm_frm->id);
if (!node) { if (!node) {
TRACE_PROTO("released stream", QUIC_EV_CONN_PRSAFRM, qc, strm_frm); TRACE_PROTO("released stream", QUIC_EV_CONN_PRSAFRM, qc, frm);
TRACE_PROTO("freeing frame from packet", QUIC_EV_CONN_PRSAFRM, TRACE_PROTO("freeing frame from packet", QUIC_EV_CONN_PRSAFRM,
qc, frm, &pn); qc, frm, &pn);
pool_free(pool_head_quic_frame, frm); pool_free(pool_head_quic_frame, frm);
@ -2218,7 +2218,7 @@ static void qc_dup_pkt_frms(struct quic_conn *qc,
node = eb64_lookup(&qc->streams_by_id, strm_frm->id); node = eb64_lookup(&qc->streams_by_id, strm_frm->id);
if (!node) { if (!node) {
TRACE_PROTO("released stream", QUIC_EV_CONN_PRSAFRM, qc, strm_frm); TRACE_PROTO("released stream", QUIC_EV_CONN_PRSAFRM, qc, frm);
continue; continue;
} }
@ -5787,7 +5787,7 @@ static inline int qc_build_frms(struct list *outlist, struct list *inlist,
*/ */
node = eb64_lookup(&qc->streams_by_id, strm->id); node = eb64_lookup(&qc->streams_by_id, strm->id);
if (!node) { if (!node) {
TRACE_PROTO("released stream", QUIC_EV_CONN_PRSAFRM, qc, strm); TRACE_PROTO("released stream", QUIC_EV_CONN_PRSAFRM, qc, cf);
LIST_DELETE(&cf->list); LIST_DELETE(&cf->list);
pool_free(pool_head_quic_frame, cf); pool_free(pool_head_quic_frame, cf);
continue; continue;
@ -5796,7 +5796,7 @@ static inline int qc_build_frms(struct list *outlist, struct list *inlist,
stream_desc = eb64_entry(node, struct qc_stream_desc, by_id); stream_desc = eb64_entry(node, struct qc_stream_desc, by_id);
if (strm->offset.key + strm->len <= stream_desc->ack_offset) { if (strm->offset.key + strm->len <= stream_desc->ack_offset) {
TRACE_PROTO("ignored frame frame in already acked range", TRACE_PROTO("ignored frame frame in already acked range",
QUIC_EV_CONN_PRSAFRM, qc, strm); QUIC_EV_CONN_PRSAFRM, qc, cf);
LIST_DELETE(&cf->list); LIST_DELETE(&cf->list);
pool_free(pool_head_quic_frame, cf); pool_free(pool_head_quic_frame, cf);
continue; continue;
@ -5804,7 +5804,7 @@ static inline int qc_build_frms(struct list *outlist, struct list *inlist,
else if (strm->offset.key < stream_desc->ack_offset) { else if (strm->offset.key < stream_desc->ack_offset) {
strm->offset.key = stream_desc->ack_offset; strm->offset.key = stream_desc->ack_offset;
TRACE_PROTO("updated partially acked frame", TRACE_PROTO("updated partially acked frame",
QUIC_EV_CONN_PRSAFRM, qc, strm); QUIC_EV_CONN_PRSAFRM, qc, cf);
} }
} }
/* Note that these frames are accepted in short packets only without /* Note that these frames are accepted in short packets only without