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 82c8ee82aabc75d66ced8d289468de79f2659cd1..482a020e18620ac4c9fb85fc50bf83d851009087 100644 (file)
--- 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 4f1548b790de0fc701d49d9491c46024022c2eb1..19c1f07f602aa14b8ae216cde3ea5406b60e4bd4 100644 (file)
--- 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 828dfbeaacdd4b900b9de08e6739396948474eef..d136efdf89c143f32063ae2a5ff39e7aaed3c04c 100644 (file)
--- 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)