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

CLEANUP: quic: Rename quic_get_dgram_dcid() <buf> variable

Browse Source 
quic_get_dgram_dcid() does not manipulate any struct buffer variable.

Should be backported to 2.7.
This commit is contained in:
Frédéric Lécaille 2023-04-24 15:24:58 +02:00
parent 1e0f8255a1
commit 182934d80b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/quic_conn.c
View File

@ -8370,10 +8370,11 @@ int qc_check_dcid(struct quic_conn *qc, unsigned char *dcid, size_t dcid_len)
return 0; return 0;
} }
/* Retrieve the DCID from a QUIC datagram or packet with <buf> as first octet. /* Retrieve the DCID from a QUIC datagram or packet at <pos> postition,
* <end> being at one byte past the end of this datagram.
* Returns 1 if succeeded, 0 if not. * Returns 1 if succeeded, 0 if not.
*/ */
int quic_get_dgram_dcid(unsigned char *buf, const unsigned char *end, int quic_get_dgram_dcid(unsigned char *pos, const unsigned char *end,
unsigned char **dcid, size_t *dcid_len) unsigned char **dcid, size_t *dcid_len)
{ {
int ret = 0, long_header; int ret = 0, long_header;
@ -8381,24 +8382,24 @@ int quic_get_dgram_dcid(unsigned char *buf, const unsigned char *end,
TRACE_ENTER(QUIC_EV_CONN_RXPKT); TRACE_ENTER(QUIC_EV_CONN_RXPKT);
if (!(*buf & QUIC_PACKET_FIXED_BIT)) { if (!(*pos & QUIC_PACKET_FIXED_BIT)) {
TRACE_PROTO("fixed bit not set", QUIC_EV_CONN_RXPKT); TRACE_PROTO("fixed bit not set", QUIC_EV_CONN_RXPKT);
goto err; goto err;
} }
long_header = *buf & QUIC_PACKET_LONG_HEADER_BIT; long_header = *pos & QUIC_PACKET_LONG_HEADER_BIT;
minlen = long_header ? QUIC_LONG_PACKET_MINLEN : minlen = long_header ? QUIC_LONG_PACKET_MINLEN :
QUIC_SHORT_PACKET_MINLEN + QUIC_HAP_CID_LEN + QUIC_TLS_TAG_LEN; QUIC_SHORT_PACKET_MINLEN + QUIC_HAP_CID_LEN + QUIC_TLS_TAG_LEN;
skip = long_header ? QUIC_LONG_PACKET_DCID_OFF : QUIC_SHORT_PACKET_DCID_OFF; skip = long_header ? QUIC_LONG_PACKET_DCID_OFF : QUIC_SHORT_PACKET_DCID_OFF;
if (end - buf < minlen) if (end - pos < minlen)
goto err; goto err;
buf += skip; pos += skip;
*dcid_len = long_header ? *buf++ : QUIC_HAP_CID_LEN; *dcid_len = long_header ? *pos++ : QUIC_HAP_CID_LEN;
if (*dcid_len > QUIC_CID_MAXLEN || end - buf <= *dcid_len) if (*dcid_len > QUIC_CID_MAXLEN || end - pos <= *dcid_len)
goto err; goto err;
*dcid = buf; *dcid = pos;
ret = 1; ret = 1;
leave: leave: