CLEANUP: quic: remove unused quic_rx_strm_frm
quic_rx_strm_frm type was used to buffered STREAM frames received out of
order. Now the MUX is able to deal directly with these frames and
buffered it inside its ncbuf.
diff --git a/include/haproxy/xprt_quic-t.h b/include/haproxy/xprt_quic-t.h
index 86cbe0e..c9d4b1d 100644
--- a/include/haproxy/xprt_quic-t.h
+++ b/include/haproxy/xprt_quic-t.h
@@ -513,15 +513,6 @@
struct quic_rx_packet *pkt;
};
-/* Structure to store information about RX STREAM frames. */
-struct quic_rx_strm_frm {
- struct eb64_node offset_node;
- uint64_t len;
- const unsigned char *data;
- int fin;
- struct quic_rx_packet *pkt;
-};
-
/* Flag a sent packet as being an ack-eliciting packet. */
#define QUIC_FL_TX_PACKET_ACK_ELICITING (1UL << 0)
/* Flag a sent packet as containing a PADDING frame. */
diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 099ce67..bc290fa 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -167,7 +167,6 @@
DECLARE_POOL(pool_head_quic_rx_packet, "quic_rx_packet_pool", sizeof(struct quic_rx_packet));
DECLARE_POOL(pool_head_quic_tx_packet, "quic_tx_packet_pool", sizeof(struct quic_tx_packet));
DECLARE_STATIC_POOL(pool_head_quic_rx_crypto_frm, "quic_rx_crypto_frm_pool", sizeof(struct quic_rx_crypto_frm));
-DECLARE_POOL(pool_head_quic_rx_strm_frm, "quic_rx_strm_frm", sizeof(struct quic_rx_strm_frm));
DECLARE_STATIC_POOL(pool_head_quic_crypto_buf, "quic_crypto_buf_pool", sizeof(struct quic_crypto_buf));
DECLARE_POOL(pool_head_quic_frame, "quic_frame_pool", sizeof(struct quic_frame));
DECLARE_STATIC_POOL(pool_head_quic_arng, "quic_arng_pool", sizeof(struct quic_arng_node));
@@ -2149,28 +2148,6 @@
return 0;
}
-/* Allocate a new STREAM RX frame from <stream_fm> STREAM frame attached to
- * <pkt> RX packet.
- * Return it if succeeded, NULL if not.
- */
-static inline
-struct quic_rx_strm_frm *new_quic_rx_strm_frm(struct quic_stream *stream_frm,
- struct quic_rx_packet *pkt)
-{
- struct quic_rx_strm_frm *frm;
-
- frm = pool_alloc(pool_head_quic_rx_strm_frm);
- if (frm) {
- frm->offset_node.key = stream_frm->offset.key;
- frm->len = stream_frm->len;
- frm->data = stream_frm->data;
- frm->pkt = pkt;
- frm->fin = stream_frm->fin;
- }
-
- return frm;
-}
-
/* Handle <strm_frm> bidirectional STREAM frame. Depending on its ID, several
* streams may be open. The data are copied to the stream RX buffer if possible.
* If not, the STREAM frame is stored to be treated again later.