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

CLEANUP: quic: cleanup prototypes related to CIDs handling

Browse Source 
Remove duplicated prototypes from quic_conn.h also present in
quic_cid.h. Also remove quic_derive_cid() prototype and mark it as
static.
This commit is contained in:
Amaury Denoyelle 2024-06-27 15:45:46 +02:00
parent 883f1bdbce
commit a05fefe74d
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/quic_cid.h
View File

@ -21,8 +21,6 @@ struct quic_connection_id *new_quic_cid(struct eb_root *root,
int quic_get_cid_tid(const unsigned char *cid, size_t cid_len, int quic_get_cid_tid(const unsigned char *cid, size_t cid_len,
const struct sockaddr_storage *cli_addr, const struct sockaddr_storage *cli_addr,
unsigned char *pos, size_t len); unsigned char *pos, size_t 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 quic_conn *retrieve_qc_conn_from_cid(struct quic_rx_packet *pkt,
struct sockaddr_storage *saddr, struct sockaddr_storage *saddr,
int *new_tid); int *new_tid);

9
include/haproxy/quic_conn.h
View File

@ -60,10 +60,6 @@ void quic_free_arngs(struct quic_conn *qc, struct quic_arngs *arngs);
struct quic_cstream *quic_cstream_new(struct quic_conn *qc); struct quic_cstream *quic_cstream_new(struct quic_conn *qc);
struct task *quic_conn_app_io_cb(struct task *t, void *context, unsigned int state); struct task *quic_conn_app_io_cb(struct task *t, void *context, unsigned int state);
struct quic_connection_id *new_quic_cid(struct eb_root *root,
struct quic_conn *qc,
const struct quic_cid *orig,
const struct sockaddr_storage *addr);
void quic_conn_closed_err_count_inc(struct quic_conn *qc, struct quic_frame *frm); void quic_conn_closed_err_count_inc(struct quic_conn *qc, struct quic_frame *frm);
int qc_h3_request_reject(struct quic_conn *qc, uint64_t id); int qc_h3_request_reject(struct quic_conn *qc, uint64_t id);
struct quic_conn *qc_new_conn(const struct quic_version *qv, int ipv4, struct quic_conn *qc_new_conn(const struct quic_version *qv, int ipv4,
@ -167,11 +163,6 @@ void quic_set_connection_close(struct quic_conn *qc, const struct quic_err err);
void quic_set_tls_alert(struct quic_conn *qc, int alert); void quic_set_tls_alert(struct quic_conn *qc, int alert);
int quic_set_app_ops(struct quic_conn *qc, const unsigned char *alpn, size_t alpn_len); int quic_set_app_ops(struct quic_conn *qc, const unsigned char *alpn, size_t alpn_len);
int qc_check_dcid(struct quic_conn *qc, unsigned char *dcid, size_t dcid_len); int qc_check_dcid(struct quic_conn *qc, unsigned char *dcid, size_t dcid_len);
struct quic_cid quic_derive_cid(const struct quic_cid *orig,
const struct sockaddr_storage *addr);
int quic_get_cid_tid(const unsigned char *cid, size_t cid_len,
const struct sockaddr_storage *cli_addr,
unsigned char *buf, size_t buf_len);
int qc_send_mux(struct quic_conn *qc, struct list *frms); int qc_send_mux(struct quic_conn *qc, struct list *frms);
void qc_notify_err(struct quic_conn *qc); void qc_notify_err(struct quic_conn *qc);

8
src/quic_cid.c
View File

@ -25,11 +25,15 @@ static int quic_stateless_reset_token_init(struct quic_connection_id *conn_id)
} }
/* Generate a CID directly derived from <orig> CID and <addr> address. /* Generate a CID directly derived from <orig> CID and <addr> address.
*
* This function is used to calculate the first connection CID derived from
* client ODCID. This allows to optimize CID global tree by not inserting ODCID
* as client is expected to replace it early.
* *
* Returns the derived CID. * Returns the derived CID.
*/ */
struct quic_cid quic_derive_cid(const struct quic_cid *orig, static struct quic_cid quic_derive_cid(const struct quic_cid *orig,
const struct sockaddr_storage *addr) const struct sockaddr_storage *addr)
{ {
struct quic_cid cid; struct quic_cid cid;
const struct sockaddr_in *in; const struct sockaddr_in *in;