RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-27 13:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: quic: Remove useless traces about references to TX packets

Browse Source 
Since this commit:
    "BUG/MINOR: quic: Wrong list_for_each_entry() use when building packets from
     qc_do_build_pkt()"
there is no more reason that frames can be released without having been
sent, i.e. frames with non null ->pkt member. This ->pkt is the packet
the frame is attached to.

Must be backported to 2.6.
This commit is contained in:
Frédéric Lécaille 2022-08-25 07:13:33 +02:00
parent 560ddfa003
commit f61398a7ca
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xprt_quic.c
View File

@ -1475,16 +1475,9 @@ static void qc_frm_unref(struct quic_conn *qc, struct quic_frame *frm)
list_for_each_entry_safe(f, tmp, &frm->reflist, ref) { list_for_each_entry_safe(f, tmp, &frm->reflist, ref) {
f->origin = NULL; f->origin = NULL;
LIST_DELETE(&f->ref); LIST_DELETE(&f->ref);
if (f->pkt) {
TRACE_DEVEL("remove frame reference", TRACE_DEVEL("remove frame reference",
QUIC_EV_CONN_PRSAFRM, qc, f, &f->pkt->pn_node.key); QUIC_EV_CONN_PRSAFRM, qc, f, &f->pkt->pn_node.key);
} }
else {
/* XXX TODO: what must be done for such a frame */
TRACE_DEVEL("remove frame reference for unsent frame",
QUIC_EV_CONN_PRSAFRM, qc, f);
}
}
TRACE_LEAVE(QUIC_EV_CONN_PRSAFRM, qc); TRACE_LEAVE(QUIC_EV_CONN_PRSAFRM, qc);
} }
@ -1509,16 +1502,9 @@ void qc_release_frm(struct quic_conn *qc, struct quic_frame *frm)
* the current one. * the current one.
*/ */
list_for_each_entry_safe(f, tmp, &origin->reflist, ref) { list_for_each_entry_safe(f, tmp, &origin->reflist, ref) {
if (f->pkt) {
pn = f->pkt->pn_node.key; pn = f->pkt->pn_node.key;
TRACE_DEVEL("mark frame as acked from packet", TRACE_DEVEL("mark frame as acked from packet",
QUIC_EV_CONN_PRSAFRM, qc, f, &pn); QUIC_EV_CONN_PRSAFRM, qc, f, &pn);
}
else {
/* XXX TODO: what must be done for such a frame */
TRACE_DEVEL("mark frame as acked for unsent frame",
QUIC_EV_CONN_PRSAFRM, qc, f);
}
f->flags |= QUIC_FL_TX_FRAME_ACKED; f->flags |= QUIC_FL_TX_FRAME_ACKED;
f->origin = NULL; f->origin = NULL;
LIST_DELETE(&f->ref); LIST_DELETE(&f->ref);