diff options
author | Hugo Landau <hlandau@openssl.org> | 2024-02-07 08:49:30 +0000 |
---|---|---|
committer | Hugo Landau <hlandau@openssl.org> | 2024-02-08 16:50:01 +0000 |
commit | 827475fc8b255f912a90295b3dac5864a0a7614a (patch) | |
tree | 0f16d4a31a6ac58f85ad36b4f35c8e9f395beecd | |
parent | 37228ded0faab6c10f7438f812ce611e0a41830b (diff) |
QUIC CHANNEL: Optimise struct packing
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)
-rw-r--r-- | doc/man3/SSL_get_value_uint.pod | 4 | ||||
-rw-r--r-- | ssl/quic/quic_channel_local.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/man3/SSL_get_value_uint.pod b/doc/man3/SSL_get_value_uint.pod index 69652bec9a..4d342ceebb 100644 --- a/doc/man3/SSL_get_value_uint.pod +++ b/doc/man3/SSL_get_value_uint.pod @@ -77,7 +77,7 @@ SSL_get_generic_value_uint() and SSL_set_generic_value_uint() for brevity. Values in this class are read-write, and represent what the local party is requesting during feature negotiation. Such a request will not necessarily be -honoured; see B<SSL_VALUE_CLASS_FEATURE_NEOGTIATED>. +honoured; see B<SSL_VALUE_CLASS_FEATURE_NEGOTIATED>. A value in this class may become read-only in certain circumstances; for example, after a connection has been established, for a value which cannot be @@ -100,7 +100,7 @@ SSL_get_feature_peer_request_uint() for brevity. =item B<SSL_VALUE_CLASS_FEATURE_NEGOTIATED> Values in this value class are read-only, and represent the value which was -actually negotated based on both local and peer input during feature +actually negotiated based on both local and peer input during feature negotiation. This is the effective value in actual use. Attempting to read a value in this class will generally fail if the feature 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; |