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

Revert "BUG/MINOR: quix: Memleak for non in flight TX packets"

Browse Source 
This reverts commit da9c441886dbfa02840a93e367f65fd6d312c835.

Indeed this commit prevented the ACK only packets to be used as other packets
when they are acknowledged. Even if not ack-eliciting packets they are
acknowledged alongside others packets. Such acknowledged ACK only packets
must be used for instance to compute the RTT.

Must be backported to 2.6 if da9c441 was backported to 2.6.
This commit is contained in:
Frédéric Lécaille 2022-08-24 16:23:44 +02:00
parent b10b1196b8
commit 5f6c25e447
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/xprt_quic.c
View File

@ -3253,21 +3253,12 @@ int qc_send_ppkts(struct buffer *buf, struct ssl_sock_ctx *ctx)
}
qc->path->in_flight += pkt->in_flight_len;
pkt->pktns->tx.in_flight += pkt->in_flight_len;
next_pkt = pkt->next;
TRACE_DATA("sent pkt", QUIC_EV_CONN_SPPKTS, qc, pkt);
if (pkt->in_flight_len) {
/* Ack-eliciting packets or packets with a PADDING frame */
quic_tx_packet_refinc(pkt);
eb64_insert(&pkt->pktns->tx.pkts, &pkt->pn_node);
if (pkt->in_flight_len)
qc_set_timer(qc);
}
else {
/* Note that we can safely free this packet: There is no
* ack-eliciting frame attached to it. This may be an ACK
* or CONNECTION_CLOSE only packet for instance.
*/
pool_free(pool_head_quic_tx_packet, pkt);
}
TRACE_DATA("sent pkt", QUIC_EV_CONN_SPPKTS, qc, pkt);
next_pkt = pkt->next;
quic_tx_packet_refinc(pkt);
eb64_insert(&pkt->pktns->tx.pkts, &pkt->pn_node);
}
}