mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: quic: Modify qc_do_build_hdshk_pkt() to accept any packet type

Browse Source 
With this patch qc_do_build_hdshk_pkt() is also able to build Application level
packet type. Its name should be consequently renamed (to come).
This commit is contained in:
Frédéric Lécaille 2021-08-03 16:03:09 +02:00 committed by Amaury Denoyelle
parent 0e50e1b0b5
commit e1aa0d347a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/xprt_quic.c
View File

@ -3672,7 +3672,6 @@ static int qc_do_build_hdshk_pkt(unsigned char *pos, const unsigned char *end,
size_t len, len_frms, token_fields_len, padding_len; size_t len, len_frms, token_fields_len, padding_len;
struct quic_frame frm = { .type = QUIC_FT_CRYPTO, }; struct quic_frame frm = { .type = QUIC_FT_CRYPTO, };
struct quic_frame ack_frm = { .type = QUIC_FT_ACK, }; struct quic_frame ack_frm = { .type = QUIC_FT_ACK, };
struct quic_crypto *crypto = &frm.crypto;
size_t ack_frm_len; size_t ack_frm_len;
int64_t largest_acked_pn; int64_t largest_acked_pn;
int add_ping_frm; int add_ping_frm;
@ -3703,11 +3702,14 @@ static int qc_do_build_hdshk_pkt(unsigned char *pos, const unsigned char *end,
goto err; goto err;
} }
largest_acked_pn = qel->pktns->tx.largest_acked_pn; largest_acked_pn = HA_ATOMIC_LOAD(&qel->pktns->tx.largest_acked_pn);
/* packet number length */ /* packet number length */
*pn_len = quic_packet_number_length(pn, largest_acked_pn); *pn_len = quic_packet_number_length(pn, largest_acked_pn);
quic_build_packet_long_header(&pos, end, pkt_type, *pn_len, conn); if (pkt_type == QUIC_PACKET_TYPE_SHORT)
quic_build_packet_short_header(&pos, end, *pn_len, conn);
else
quic_build_packet_long_header(&pos, end, pkt_type, *pn_len, conn);
/* Encode the token length (0) for an Initial packet. */ /* Encode the token length (0) for an Initial packet. */
if (pkt_type == QUIC_PACKET_TYPE_INITIAL) if (pkt_type == QUIC_PACKET_TYPE_INITIAL)
@ -3770,7 +3772,8 @@ static int qc_do_build_hdshk_pkt(unsigned char *pos, const unsigned char *end,
len = len_frms; len = len_frms;
else else
len += QUIC_TLS_TAG_LEN; len += QUIC_TLS_TAG_LEN;
quic_enc_int(&pos, end, len); if (pkt_type != QUIC_PACKET_TYPE_SHORT)
quic_enc_int(&pos, end, len);
/* Packet number field address. */ /* Packet number field address. */
*buf_pn = pos; *buf_pn = pos;