From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Thu, 30 Nov 2023 13:00:56 +0000 (+0100)
Subject: CLEANUP: quic_cid: remove unused listener arg
X-Git-Tag: v2.9-dev12~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f31719edae656198891e5ad6eace990f8473000e;p=thirdparty%2Fhaproxy.git

CLEANUP: quic_cid: remove unused listener arg

retrieve_qc_conn_from_cid() requires listener as argument whereas it is
unused. This is an artifact from the old architecture where CID trees
where stored on listener instances instead of globally. Remove it to
better reflect this change.
---

diff --git a/include/haproxy/quic_cid.h b/include/haproxy/quic_cid.h
index 82c8ee82aa..482a020e18 100644
--- a/include/haproxy/quic_cid.h
+++ b/include/haproxy/quic_cid.h
@@ -24,7 +24,6 @@ int quic_get_cid_tid(const unsigned char *cid, size_t cid_len,
 struct quic_cid quic_derive_cid(const struct quic_cid *orig,
                                 const struct sockaddr_storage *addr);
 struct quic_conn *retrieve_qc_conn_from_cid(struct quic_rx_packet *pkt,
-                                            struct listener *l,
                                             struct sockaddr_storage *saddr,
                                             int *new_tid);
 int qc_build_new_connection_id_frm(struct quic_conn *qc,
diff --git a/src/quic_cid.c b/src/quic_cid.c
index 4f1548b790..19c1f07f60 100644
--- a/src/quic_cid.c
+++ b/src/quic_cid.c
@@ -208,7 +208,6 @@ int quic_get_cid_tid(const unsigned char *cid, size_t cid_len,
  * Returns the instance or NULL if not found.
  */
 struct quic_conn *retrieve_qc_conn_from_cid(struct quic_rx_packet *pkt,
-                                            struct listener *l,
                                             struct sockaddr_storage *saddr,
                                             int *new_tid)
 {
diff --git a/src/quic_rx.c b/src/quic_rx.c
index 828dfbeaac..d136efdf89 100644
--- a/src/quic_rx.c
+++ b/src/quic_rx.c
@@ -1624,7 +1624,7 @@ static struct quic_conn *quic_rx_pkt_retrieve_conn(struct quic_rx_packet *pkt,
 	prx = l->bind_conf->frontend;
 	prx_counters = EXTRA_COUNTERS_GET(prx->extra_counters_fe, &quic_stats_module);
 
-	qc = retrieve_qc_conn_from_cid(pkt, l, &dgram->saddr, new_tid);
+	qc = retrieve_qc_conn_from_cid(pkt, &dgram->saddr, new_tid);
 
 	/* If connection already created or rebinded on another thread. */
 	if (!qc && *new_tid != -1 && tid != *new_tid)