From 827475fc8b255f912a90295b3dac5864a0a7614a Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Wed, 7 Feb 2024 08:49:30 +0000 Subject: QUIC CHANNEL: Optimise struct packing Reviewed-by: Neil Horman Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/23360) --- ssl/quic/quic_channel_local.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ssl/quic') diff --git a/ssl/quic/quic_channel_local.h b/ssl/quic/quic_channel_local.h index 88122f0435..16d96ef7d9 100644 --- a/ssl/quic/quic_channel_local.h +++ b/ssl/quic/quic_channel_local.h @@ -119,6 +119,9 @@ struct quic_channel_st { */ QUIC_CONN_ID retry_scid; + /* Server only: The DCID we currently expect the peer to use to talk to us. */ + QUIC_CONN_ID cur_local_cid; + /* * The DCID we currently use to talk to the peer and its sequence num. */ @@ -126,9 +129,6 @@ struct quic_channel_st { uint64_t cur_remote_seq_num; uint64_t cur_retire_prior_to; - /* Server only: The DCID we currently expect the peer to use to talk to us. */ - QUIC_CONN_ID cur_local_cid; - /* Transport parameter values we send to our peer. */ uint64_t tx_init_max_stream_data_bidi_local; uint64_t tx_init_max_stream_data_bidi_remote; @@ -142,6 +142,9 @@ struct quic_channel_st { uint64_t rx_max_ack_delay; /* ms */ unsigned char rx_ack_delay_exp; + /* Diagnostic counters for testing purposes only. May roll over. */ + uint16_t diag_num_rx_ack; /* Number of ACK frames received */ + /* * Temporary staging area to store information about the incoming packet we * are currently processing. @@ -201,9 +204,6 @@ struct quic_channel_st { */ uint64_t txku_threshold_override; - /* Diagnostic counters for testing purposes only. May roll over. */ - uint16_t diag_num_rx_ack; /* Number of ACK frames received */ - /* Valid if we are in the TERMINATING or TERMINATED states. */ QUIC_TERMINATE_CAUSE terminate_cause; -- cgit v1.2.3