CLEANUP: quic: wrong use of eb*entry() macro
This wrong use has no consequence because the ->node member fields of
eb*node structs are the first.
diff --git a/include/haproxy/xprt_quic.h b/include/haproxy/xprt_quic.h
index dc90f3d..cca985c 100644
--- a/include/haproxy/xprt_quic.h
+++ b/include/haproxy/xprt_quic.h
@@ -137,7 +137,7 @@
while (node) {
struct quic_connection_id *cid;
- cid = eb64_entry(&node->node, struct quic_connection_id, seq_num);
+ cid = eb64_entry(node, struct quic_connection_id, seq_num);
/* remove the CID from the receiver tree */
ebmb_delete(&cid->node);
@@ -968,7 +968,7 @@
if (!ar)
return -1;
- return eb64_entry(&ar->node, struct quic_arng_node, first)->last;
+ return eb64_entry(ar, struct quic_arng_node, first)->last;
}
/* Increment the reference counter of <pkt> */
@@ -995,7 +995,7 @@
struct quic_tx_packet *pkt;
struct quic_frame *frm, *frmbak;
- pkt = eb64_entry(&node->node, struct quic_tx_packet, pn_node);
+ pkt = eb64_entry(node, struct quic_tx_packet, pn_node);
node = eb64_next(node);
list_for_each_entry_safe(frm, frmbak, &pkt->frms, list) {
LIST_DELETE(&frm->list);
@@ -1171,7 +1171,7 @@
node = eb64_first(&qel->rx.pkts);
while (node) {
struct quic_rx_packet *pkt =
- eb64_entry(&node->node, struct quic_rx_packet, pn_node);
+ eb64_entry(node, struct quic_rx_packet, pn_node);
node = eb64_next(node);
eb64_delete(&pkt->pn_node);
@@ -1189,7 +1189,7 @@
while (node) {
struct quic_rx_packet *pkt;
- pkt = eb64_entry(&node->node, struct quic_rx_packet, pn_node);
+ pkt = eb64_entry(node, struct quic_rx_packet, pn_node);
fprintf(stderr, "pkt@%p type=%d pn=%llu\n",
pkt, pkt->type, (ull)pkt->pn_node.key);
node = eb64_next(node);
diff --git a/src/quic_frame.c b/src/quic_frame.c
index e239be1..5a13e52 100644
--- a/src/quic_frame.c
+++ b/src/quic_frame.c
@@ -278,7 +278,7 @@
struct quic_arng_node *ar_node, *prev_ar_node;
ar = eb64_last(&tx_ack->arngs->root);
- ar_node = eb64_entry(&ar->node, struct quic_arng_node, first);
+ ar_node = eb64_entry(ar, struct quic_arng_node, first);
TRACE_PROTO("ack range", QUIC_EV_CONN_PRSAFRM,
qc,, &ar_node->last, &ar_node->first.key);
if (!quic_enc_int(buf, end, ar_node->last) ||
@@ -288,7 +288,7 @@
return 0;
while ((prev_ar = eb64_prev(ar))) {
- prev_ar_node = eb64_entry(&prev_ar->node, struct quic_arng_node, first);
+ prev_ar_node = eb64_entry(prev_ar, struct quic_arng_node, first);
TRACE_PROTO("ack range", QUIC_EV_CONN_PRSAFRM, qc,,
&prev_ar_node->last, &prev_ar_node->first.key);
if (!quic_enc_int(buf, end, ar_node->first.key - prev_ar_node->last - 2) ||
@@ -296,7 +296,7 @@
return 0;
ar = prev_ar;
- ar_node = eb64_entry(&ar->node, struct quic_arng_node, first);
+ ar_node = eb64_entry(ar, struct quic_arng_node, first);
}
return 1;
diff --git a/src/quic_stream.c b/src/quic_stream.c
index 3a7aed1..0d9e12a 100644
--- a/src/quic_stream.c
+++ b/src/quic_stream.c
@@ -180,7 +180,7 @@
struct quic_stream *strm;
struct quic_frame *frm;
- strm = eb64_entry(&frm_node->node, struct quic_stream, offset);
+ strm = eb64_entry(frm_node, struct quic_stream, offset);
frm_node = eb64_next(frm_node);
eb64_delete(&strm->offset);
diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index e0c4301..d4f3ef0 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -1502,7 +1502,7 @@
struct quic_frame *frm;
size_t offset, len;
- strm = eb64_entry(&frm_node->node, struct quic_stream, offset);
+ strm = eb64_entry(frm_node, struct quic_stream, offset);
offset = strm->offset.key;
len = strm->len;
@@ -1635,7 +1635,7 @@
while (node && node->key >= smallest) {
struct quic_frame *frm, *frmbak;
- pkt = eb64_entry(&node->node, struct quic_tx_packet, pn_node);
+ pkt = eb64_entry(node, struct quic_tx_packet, pn_node);
*pkt_flags |= pkt->flags;
LIST_INSERT(newly_acked_pkts, &pkt->list);
TRACE_PROTO("Removing packet #", QUIC_EV_CONN_PRSAFRM, qc, NULL, &pkt->pn_node.key);
@@ -1784,7 +1784,7 @@
struct quic_arng_node *ar_node;
next_ar = eb64_next(ar);
- ar_node = eb64_entry(&ar->node, struct quic_arng_node, first);
+ ar_node = eb64_entry(ar, struct quic_arng_node, first);
if ((int64_t)ar_node->first.key > largest_acked_pn)
break;
@@ -1960,7 +1960,7 @@
QUIC_EV_CONN_PRSAFRM, qc);
}
else {
- time_sent = eb64_entry(&largest_node->node,
+ time_sent = eb64_entry(largest_node,
struct quic_tx_packet, pn_node)->time_sent;
}
}
@@ -2250,7 +2250,7 @@
*/
frm_node = eb64_first(&qcs->rx.frms);
while (frm_node) {
- frm = eb64_entry(&frm_node->node,
+ frm = eb64_entry(frm_node,
struct quic_rx_strm_frm, offset_node);
ret = qcc_recv(qc->qcc, qcs->id, frm->len,
@@ -2535,7 +2535,7 @@
node = eb64_first(pkts);
/* Skip the empty packet (they have already been retransmitted) */
while (node) {
- pkt = eb64_entry(&node->node, struct quic_tx_packet, pn_node);
+ pkt = eb64_entry(node, struct quic_tx_packet, pn_node);
if (!LIST_ISEMPTY(&pkt->frms) && !(pkt->flags & QUIC_FL_TX_PACKET_COALESCED))
break;
node = eb64_next(node);
@@ -3412,7 +3412,7 @@
struct quic_connection_id *cid;
- cid = eb64_entry(&node->node, struct quic_connection_id, seq_num);
+ cid = eb64_entry(node, struct quic_connection_id, seq_num);
if (cid->seq_num.key >= max)
break;
@@ -3438,7 +3438,7 @@
while (n) {
struct eb64_node *next;
- ar = eb64_entry(&n->node, struct quic_arng_node, first);
+ ar = eb64_entry(n, struct quic_arng_node, first);
next = eb64_next(n);
eb64_delete(n);
pool_free(pool_head_quic_arng, ar);
@@ -3472,8 +3472,8 @@
if (!prev)
return 0;
- last_node = eb64_entry(&last->node, struct quic_arng_node, first);
- prev_node = eb64_entry(&prev->node, struct quic_arng_node, first);
+ last_node = eb64_entry(last, struct quic_arng_node, first);
+ prev_node = eb64_entry(prev, struct quic_arng_node, first);
arngs->enc_sz -= quic_int_getsize(last_node->last - last_node->first.key);
arngs->enc_sz -= quic_int_getsize(sack_gap(prev_node, last_node));
arngs->enc_sz -= quic_decint_size_diff(arngs->sz);
@@ -3496,16 +3496,16 @@
if (!node)
return;
- ar = eb64_entry(&node->node, struct quic_arng_node, first);
+ ar = eb64_entry(node, struct quic_arng_node, first);
arngs->enc_sz = quic_int_getsize(ar->last) +
quic_int_getsize(ar->last - ar->first.key) + quic_int_getsize(arngs->sz - 1);
while ((next = eb64_prev(node))) {
- ar_next = eb64_entry(&next->node, struct quic_arng_node, first);
+ ar_next = eb64_entry(next, struct quic_arng_node, first);
arngs->enc_sz += quic_int_getsize(sack_gap(ar, ar_next)) +
quic_int_getsize(ar_next->last - ar_next->first.key);
node = next;
- ar = eb64_entry(&node->node, struct quic_arng_node, first);
+ ar = eb64_entry(node, struct quic_arng_node, first);
}
}
@@ -3577,7 +3577,7 @@
}
else {
struct quic_arng_node *le_ar =
- eb64_entry(&le->node, struct quic_arng_node, first);
+ eb64_entry(le, struct quic_arng_node, first);
/* Already existing range */
if (le_ar->last >= ar->last)
@@ -3606,7 +3606,7 @@
while ((next = eb64_next(new))) {
next_node =
- eb64_entry(&next->node, struct quic_arng_node, first);
+ eb64_entry(next, struct quic_arng_node, first);
if (new_node->last + 1 < next_node->first.key)
break;
@@ -3681,7 +3681,7 @@
while (node) {
struct quic_rx_crypto_frm *cf;
- cf = eb64_entry(&node->node, struct quic_rx_crypto_frm, offset_node);
+ cf = eb64_entry(node, struct quic_rx_crypto_frm, offset_node);
if (cf->offset_node.key != el->rx.crypto.offset)
break;
@@ -3725,7 +3725,7 @@
while (node) {
struct quic_rx_packet *pkt;
- pkt = eb64_entry(&node->node, struct quic_rx_packet, pn_node);
+ pkt = eb64_entry(node, struct quic_rx_packet, pn_node);
TRACE_PROTO("new packet", QUIC_EV_CONN_ELRXPKTS,
ctx->qc, pkt, NULL, ctx->ssl);
if (!qc_pkt_decrypt(pkt, qel)) {