Skip to content

quic: premature 1-RTT packets #6805

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

Merged
merged 1 commit into from
Nov 2, 2025
Merged

quic: premature 1-RTT packets #6805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions src/waltz/quic/fd_quic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,11 @@ fd_quic_tx_enc_level( fd_quic_conn_t * conn, int acks ) {
return fd_quic_enc_level_appdata_id;
}

if( conn->flags && conn->upd_pkt_number >= app_pkt_number ) {
/* only allow 1-RTT "flag" frames when we have the keys, to prevent e.g. early 1-RTT PINGs */
uint flags_pending = conn->flags & ~(FD_QUIC_CONN_FLAGS_CLOSE_SENT | FD_QUIC_CONN_FLAGS_PING_SENT);
if( ( flags_pending != 0U )
& ( conn->upd_pkt_number >= app_pkt_number )
& fd_uint_extract_bit( conn->keys_avail, fd_quic_enc_level_appdata_id ) ) {
return fd_quic_enc_level_appdata_id;
}

Expand Down Expand Up @@ -2891,7 +2895,7 @@ fd_quic_svc_poll( fd_quic_t * quic,
}
} else if( quic->config.keep_alive & !!(conn->let_die_time_ns > now) ) {
/* send PING */
if( !( conn->flags & FD_QUIC_CONN_FLAGS_PING ) ) {
if( !( conn->flags & ( FD_QUIC_CONN_FLAGS_PING | FD_QUIC_CONN_FLAGS_PING_SENT ) ) ) {
conn->flags |= FD_QUIC_CONN_FLAGS_PING;
conn->upd_pkt_number = FD_QUIC_PKT_NUM_PENDING; /* update to be sent in next packet */
}
Expand Down Expand Up @@ -3876,8 +3880,7 @@ fd_quic_conn_service( fd_quic_t * quic, fd_quic_conn_t * conn, long now ) {
/* Send new rtt measurement probe? */
if( FD_UNLIKELY( now > conn->last_ack + (long)conn->rtt_period_ns ) ) {
/* send PING */
if( !( conn->flags & ( FD_QUIC_CONN_FLAGS_PING | FD_QUIC_CONN_FLAGS_PING_SENT ) )
&& conn->state == FD_QUIC_CONN_STATE_ACTIVE ) {
if( !( conn->flags & ( FD_QUIC_CONN_FLAGS_PING | FD_QUIC_CONN_FLAGS_PING_SENT ) ) ) {
conn->flags |= FD_QUIC_CONN_FLAGS_PING;
conn->upd_pkt_number = FD_QUIC_PKT_NUM_PENDING; /* update to be sent in next packet */
}
Expand Down
Loading