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

MINOR: quic: refactor CRYPTO encoding and splitting

Browse Source 
This patch is the direct follow-up of the previous one which refactor
STREAM frame encoding. Reuse the newly defined quic_strm_frm_fillbuf()
and quic_strm_frm_split() functions for CRYPTO frame encoding.

The code for CRYPTO and STREAM frames encoding should now be clearer as
it is mostly identical.
This commit is contained in:
Amaury Denoyelle 2025-02-10 11:28:35 +01:00
parent f96af8e463
commit e2744d23be
2 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/quic_frame.c
View File

@ -1307,6 +1307,11 @@ size_t quic_strm_frm_fillbuf(size_t room, struct quic_frame *frm, size_t *split)
total += quic_int_getsize(frm->stream.offset); total += quic_int_getsize(frm->stream.offset);
payload = frm->stream.len; payload = frm->stream.len;
} }
else if (frm->type == QUIC_FT_CRYPTO) {
total = 1;
total += quic_int_getsize(frm->crypto.offset);
payload = frm->crypto.len;
}
else { else {
/* Function must only be used with STREAM or CRYPTO frames. */ /* Function must only be used with STREAM or CRYPTO frames. */
ABORT_NOW(); ABORT_NOW();
@ -1377,6 +1382,15 @@ struct quic_frame *quic_strm_frm_split(struct quic_frame *frm, uint64_t split)
frm->stream.offset += split; frm->stream.offset += split;
frm->stream.data = (unsigned char *)b_peek(&stream_buf, split); frm->stream.data = (unsigned char *)b_peek(&stream_buf, split);
} }
else if (frm->type == QUIC_FT_CRYPTO) {
new->crypto.qel = frm->crypto.qel;
new->crypto.offset = frm->crypto.offset;
new->crypto.len = split;
/* Advance original frame to point to the remaining data. */
frm->crypto.len -= split;
frm->crypto.offset += split;
}
else { else {
/* Function must only be used with STREAM or CRYPTO frames. */ /* Function must only be used with STREAM or CRYPTO frames. */
ABORT_NOW(); ABORT_NOW();

62
src/quic_tx.c
View File

@ -1533,67 +1533,39 @@ static int qc_build_frms(struct list *outlist, struct list *inlist,
*/ */
list_for_each_entry_safe(cf, cfbak, inlist, list) { list_for_each_entry_safe(cf, cfbak, inlist, list) {
struct quic_frame *split_frm; struct quic_frame *split_frm;
/* header length, data length, frame length. */ size_t flen, split_size;
size_t hlen, dlen, flen;
size_t split_size;
if (!room) if (!room)
break; break;
switch (cf->type) { switch (cf->type) {
case QUIC_FT_CRYPTO: case QUIC_FT_CRYPTO:
TRACE_DEVEL(" New CRYPTO frame build (room, len)", flen = quic_strm_frm_fillbuf(room, cf, &split_size);
QUIC_EV_CONN_BCFRMS, qc, &room, len); if (!flen)
/* Compute the length of this CRYPTO frame header */
hlen = 1 + quic_int_getsize(cf->crypto.offset);
/* Compute the data length of this CRYPTO frame. */
dlen = QUIC_MIN(quic_int_cap_length(room - hlen), cf->crypto.len);
TRACE_DEVEL(" CRYPTO data length (hlen, crypto.len, dlen)",
QUIC_EV_CONN_BCFRMS, qc, &hlen, &cf->crypto.len, &dlen);
if (!dlen)
continue; continue;
/* CRYPTO frame length. */
flen = hlen + quic_int_getsize(dlen) + dlen;
TRACE_DEVEL(" CRYPTO frame length (flen)", TRACE_DEVEL(" CRYPTO frame length (flen)",
QUIC_EV_CONN_BCFRMS, qc, &flen); QUIC_EV_CONN_BCFRMS, qc, &flen);
/* Add the CRYPTO data length and its encoded length to the packet
* length and the length of this length.
*/
*len += flen;
room -= flen;
if (dlen == cf->crypto.len) {
/* <cf> CRYPTO data have been consumed. */
LIST_DEL_INIT(&cf->list);
LIST_APPEND(outlist, &cf->list);
}
else {
struct quic_frame *new_cf;
new_cf = qc_frm_alloc(QUIC_FT_CRYPTO); if (split_size) {
if (!new_cf) { split_frm = quic_strm_frm_split(cf, split_size);
if (!split_frm) {
TRACE_ERROR("No memory for new crypto frame", QUIC_EV_CONN_BCFRMS, qc); TRACE_ERROR("No memory for new crypto frame", QUIC_EV_CONN_BCFRMS, qc);
continue; continue;
} }
TRACE_DEVEL("split frame", QUIC_EV_CONN_PRSAFRM, qc, split_frm);
new_cf->crypto.len = dlen; if (split_frm->origin)
new_cf->crypto.offset = cf->crypto.offset;
new_cf->crypto.qel = qel;
TRACE_DEVEL("split frame", QUIC_EV_CONN_PRSAFRM, qc, new_cf);
if (cf->origin) {
TRACE_DEVEL("duplicated frame", QUIC_EV_CONN_PRSAFRM, qc); TRACE_DEVEL("duplicated frame", QUIC_EV_CONN_PRSAFRM, qc);
/* This <cf> frame was duplicated */ LIST_APPEND(outlist, &split_frm->list);
LIST_APPEND(&cf->origin->reflist, &new_cf->ref);
new_cf->origin = cf->origin;
/* Detach the remaining CRYPTO frame from its original frame */
LIST_DEL_INIT(&cf->ref);
cf->origin = NULL;
}
LIST_APPEND(outlist, &new_cf->list);
/* Consume <dlen> bytes of the current frame. */
cf->crypto.len -= dlen;
cf->crypto.offset += dlen;
} }
else {
LIST_DEL_INIT(&cf->list);
LIST_APPEND(outlist, &cf->list);
}
*len += flen;
room -= flen;
break; break;
case QUIC_FT_STREAM_8 ... QUIC_FT_STREAM_F: case QUIC_FT_STREAM_8 ... QUIC_FT_STREAM_F: