mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: quic: Remove useless parameters passes to qc_purge_tx_buf()

Browse Source 
Remove the pointer to the connection passed as parameters to qc_purge_tx_buf()
and other similar function which came with qc_purge_tx_buf() implementation.
They were there do track the connection during tests.

Must be backported to 2.7.
This commit is contained in:
Frédéric Lécaille 2023-04-24 12:05:46 +02:00
parent d5f03cd576
commit e66d67a1ae
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/quic_conn.c
View File

@ -3744,7 +3744,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct buffer *buf,
/* Free all frames in <l> list. In addition also remove all these frames /* Free all frames in <l> list. In addition also remove all these frames
* from the original ones if they are the results of duplications. * from the original ones if they are the results of duplications.
*/ */
static inline void qc_free_frm_list(struct list *l, struct quic_conn *qc) static inline void qc_free_frm_list(struct list *l)
{ {
struct quic_frame *frm, *frmbak; struct quic_frame *frm, *frmbak;
@ -3755,19 +3755,19 @@ static inline void qc_free_frm_list(struct list *l, struct quic_conn *qc)
} }
/* Free <pkt> TX packet and all the packets coalesced to it. */ /* Free <pkt> TX packet and all the packets coalesced to it. */
static inline void qc_free_tx_coalesced_pkts(struct quic_conn *qc, struct quic_tx_packet *p) static inline void qc_free_tx_coalesced_pkts(struct quic_tx_packet *p)
{ {
struct quic_tx_packet *pkt, *nxt_pkt; struct quic_tx_packet *pkt, *nxt_pkt;
for (pkt = p; pkt; pkt = nxt_pkt) { for (pkt = p; pkt; pkt = nxt_pkt) {
qc_free_frm_list(&pkt->frms, qc); qc_free_frm_list(&pkt->frms);
nxt_pkt = pkt->next; nxt_pkt = pkt->next;
pool_free(pool_head_quic_tx_packet, pkt); pool_free(pool_head_quic_tx_packet, pkt);
} }
} }
/* Purge <buf> TX buffer from its prepare packets. */ /* Purge <buf> TX buffer from its prepare packets. */
static void qc_purge_tx_buf(struct quic_conn *qc, struct buffer *buf) static void qc_purge_tx_buf(struct buffer *buf)
{ {
while (b_contig_data(buf, 0)) { while (b_contig_data(buf, 0)) {
uint16_t dglen; uint16_t dglen;
@ -3776,7 +3776,7 @@ static void qc_purge_tx_buf(struct quic_conn *qc, struct buffer *buf)
dglen = read_u16(b_head(buf)); dglen = read_u16(b_head(buf));
pkt = read_ptr(b_head(buf) + sizeof dglen); pkt = read_ptr(b_head(buf) + sizeof dglen);
qc_free_tx_coalesced_pkts(qc, pkt); qc_free_tx_coalesced_pkts(pkt);
b_del(buf, dglen + headlen); b_del(buf, dglen + headlen);
} }
@ -3836,9 +3836,9 @@ int qc_send_ppkts(struct buffer *buf, struct ssl_sock_ctx *ctx)
if (ret < 0) { if (ret < 0) {
TRACE_ERROR("sendto fatal error", QUIC_EV_CONN_SPPKTS, qc, first_pkt); TRACE_ERROR("sendto fatal error", QUIC_EV_CONN_SPPKTS, qc, first_pkt);
qc_kill_conn(qc); qc_kill_conn(qc);
qc_free_tx_coalesced_pkts(qc, first_pkt); qc_free_tx_coalesced_pkts(first_pkt);
b_del(buf, dglen + headlen); b_del(buf, dglen + headlen);
qc_purge_tx_buf(qc, buf); qc_purge_tx_buf(buf);
goto leave; goto leave;
} }
else if (!ret) { else if (!ret) {
@ -4962,7 +4962,7 @@ static int qc_dgrams_retransmit(struct quic_conn *qc)
if (!LIST_ISEMPTY(&frms1)) { if (!LIST_ISEMPTY(&frms1)) {
aqel->pktns->tx.pto_probe = 1; aqel->pktns->tx.pto_probe = 1;
if (!qc_send_app_probing(qc, &frms1)) { if (!qc_send_app_probing(qc, &frms1)) {
qc_free_frm_list(&frms2, qc); qc_free_frm_list(&frms2);
goto leave; goto leave;
} }