RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-15 06:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: quic: xprt traces fixes

Browse Source 
Empty parameters are permitted with TRACE_*() macros. If removed, must
be replaced by NULL.
This commit is contained in:
Frédéric Lécaille 2021-12-22 17:40:38 +01:00
parent 10250b2e93
commit e7ff2b265a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/xprt_quic.c
View File

@ -1513,7 +1513,7 @@ static inline struct eb64_node *qc_ackrng_pkts(struct eb_root *pkts, unsigned in
pkt = eb64_entry(&node->node, struct quic_tx_packet, pn_node); pkt = eb64_entry(&node->node, struct quic_tx_packet, pn_node);
*pkt_flags |= pkt->flags; *pkt_flags |= pkt->flags;
LIST_INSERT(newly_acked_pkts, &pkt->list); LIST_INSERT(newly_acked_pkts, &pkt->list);
TRACE_PROTO("Removing packet #", QUIC_EV_CONN_PRSAFRM, ctx->qc, &pkt->pn_node.key); TRACE_PROTO("Removing packet #", QUIC_EV_CONN_PRSAFRM, ctx->qc, NULL, &pkt->pn_node.key);
list_for_each_entry_safe(frm, frmbak, &pkt->frms, list) list_for_each_entry_safe(frm, frmbak, &pkt->frms, list)
qc_treat_acked_tx_frm(frm, ctx); qc_treat_acked_tx_frm(frm, ctx);
node = eb64_prev(node); node = eb64_prev(node);
@ -1724,13 +1724,13 @@ static inline int qc_parse_ack_frm(struct quic_frame *frm, struct ssl_sock_ctx *
if (ack->largest_ack > qel->pktns->tx.next_pn) { if (ack->largest_ack > qel->pktns->tx.next_pn) {
TRACE_DEVEL("ACK for not sent packet", QUIC_EV_CONN_PRSAFRM, TRACE_DEVEL("ACK for not sent packet", QUIC_EV_CONN_PRSAFRM,
ctx->qc, &ack->largest_ack); ctx->qc, NULL, &ack->largest_ack);
goto err; goto err;
} }
if (ack->first_ack_range > ack->largest_ack) { if (ack->first_ack_range > ack->largest_ack) {
TRACE_DEVEL("too big first ACK range", QUIC_EV_CONN_PRSAFRM, TRACE_DEVEL("too big first ACK range", QUIC_EV_CONN_PRSAFRM,
ctx->qc, &ack->first_ack_range); ctx->qc, NULL, &ack->first_ack_range);
goto err; goto err;
} }
@ -1754,7 +1754,7 @@ static inline int qc_parse_ack_frm(struct quic_frame *frm, struct ssl_sock_ctx *
} }
TRACE_PROTO("ack range", QUIC_EV_CONN_PRSAFRM, TRACE_PROTO("ack range", QUIC_EV_CONN_PRSAFRM,
ctx->qc, &largest, &smallest); ctx->qc, NULL, &largest, &smallest);
do { do {
uint64_t gap, ack_range; uint64_t gap, ack_range;
@ -1768,7 +1768,7 @@ static inline int qc_parse_ack_frm(struct quic_frame *frm, struct ssl_sock_ctx *
if (smallest < gap + 2) { if (smallest < gap + 2) {
TRACE_DEVEL("wrong gap value", QUIC_EV_CONN_PRSAFRM, TRACE_DEVEL("wrong gap value", QUIC_EV_CONN_PRSAFRM,
ctx->qc, &gap, &smallest); ctx->qc, NULL, &gap, &smallest);
goto err; goto err;
} }
@ -1778,7 +1778,7 @@ static inline int qc_parse_ack_frm(struct quic_frame *frm, struct ssl_sock_ctx *
if (largest < ack_range) { if (largest < ack_range) {
TRACE_DEVEL("wrong ack range value", QUIC_EV_CONN_PRSAFRM, TRACE_DEVEL("wrong ack range value", QUIC_EV_CONN_PRSAFRM,
ctx->qc, &largest, &ack_range); ctx->qc, NULL, &largest, &ack_range);
goto err; goto err;
} }
@ -1788,7 +1788,7 @@ static inline int qc_parse_ack_frm(struct quic_frame *frm, struct ssl_sock_ctx *
smallest = largest - ack_range; smallest = largest - ack_range;
TRACE_PROTO("ack range", QUIC_EV_CONN_PRSAFRM, TRACE_PROTO("ack range", QUIC_EV_CONN_PRSAFRM,
ctx->qc, &largest, &smallest); ctx->qc, NULL, &largest, &smallest);
} while (1); } while (1);
/* Flag this packet number space as having received an ACK. */ /* Flag this packet number space as having received an ACK. */
@ -1870,7 +1870,7 @@ static inline int qc_provide_cdata(struct quic_enc_level *el,
el->rx.crypto.offset += len; el->rx.crypto.offset += len;
TRACE_PROTO("in order CRYPTO data", TRACE_PROTO("in order CRYPTO data",
QUIC_EV_CONN_SSLDATA, qc, cf, ctx->ssl); QUIC_EV_CONN_SSLDATA, qc, NULL, cf, ctx->ssl);
state = HA_ATOMIC_LOAD(&qc->state); state = HA_ATOMIC_LOAD(&qc->state);
if (state < QUIC_HS_ST_COMPLETE) { if (state < QUIC_HS_ST_COMPLETE) {