Skip to content

refuse to build when a greasing TP is used #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kazuho wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refuse to build when a greasing TP is used #416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66eccd9
refuse to build when a greasing TP is used
kazuho Nov 13, 2020
55fd2a2
Merge branch 'master' into kazuho/detect-tp-grease-collision
kazuho Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/quicly.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,11 +1868,16 @@ int quicly_encode_transport_parameter_list(ptls_buffer_t *buf, const quicly_tran
{
int ret;

#define PUSH_TP(buf, id, block) \
#define PUSH_TP_NO_GREASE_CHECK(buf, id, block) \
do { \
ptls_buffer_push_quicint((buf), (id)); \
ptls_buffer_push_block((buf), -1, block); \
} while (0)
#define PUSH_TP(buf, id, block) \
do { \
PTLS_BUILD_ASSERT(((uint64_t)id + 31 - 27) % 31 != 0); \
PUSH_TP_NO_GREASE_CHECK(buf, id, block); \
} while (0)

PUSH_TP(buf, QUICLY_TRANSPORT_PARAMETER_ID_MAX_UDP_PAYLOAD_SIZE,
{ ptls_buffer_push_quicint(buf, params->max_udp_payload_size); });
Expand Down Expand Up @@ -1927,7 +1932,7 @@ int quicly_encode_transport_parameter_list(ptls_buffer_t *buf, const quicly_tran
{ ptls_buffer_push_quicint(buf, params->max_datagram_frame_size); });
/* if requested, add a greasing TP of 1 MTU size so that CH spans across multiple packets */
if (expand_by != 0) {
PUSH_TP(buf, 31 * 100 + 27, {
PUSH_TP_NO_GREASE_CHECK(buf, 31 * 100 + 27, {
if ((ret = ptls_buffer_reserve(buf, expand_by)) != 0)
goto Exit;
memset(buf->base + buf->off, 0, expand_by);
Expand Down