Rename some transport parameters
IETF draft-28 has renamed some of the transport parameters. This CL adopts the new names across all versions to make it easier to refer to the editor's copy of the drafts. This CL does not change any behavior related to these transport parameters.
Rename, no behavior change, not flag protected
PiperOrigin-RevId: 312784664
Change-Id: Ia341914e30e6da36c4f7b2b4398200916f079d8a
diff --git a/quic/core/crypto/transport_parameters.cc b/quic/core/crypto/transport_parameters.cc
index 72e83a1..45b284b 100644
--- a/quic/core/crypto/transport_parameters.cc
+++ b/quic/core/crypto/transport_parameters.cc
@@ -31,8 +31,8 @@
// which parameter is encoded. The supported draft version is noted in
// transport_parameters.h.
enum TransportParameters::TransportParameterId : uint64_t {
- kOriginalConnectionId = 0,
- kIdleTimeout = 1,
+ kOriginalDestinationConnectionId = 0,
+ kMaxIdleTimeout = 1,
kStatelessResetToken = 2,
kMaxPacketSize = 3,
kInitialMaxData = 4,
@@ -43,7 +43,7 @@
kInitialMaxStreamsUni = 9,
kAckDelayExponent = 0xa,
kMaxAckDelay = 0xb,
- kDisableMigration = 0xc,
+ kDisableActiveMigration = 0xc,
kPreferredAddress = 0xd,
kActiveConnectionIdLimit = 0xe,
@@ -74,14 +74,14 @@
std::string TransportParameterIdToString(
TransportParameters::TransportParameterId param_id) {
switch (param_id) {
- case TransportParameters::kOriginalConnectionId:
- return "original_connection_id";
- case TransportParameters::kIdleTimeout:
- return "idle_timeout";
+ case TransportParameters::kOriginalDestinationConnectionId:
+ return "original_destination_connection_id";
+ case TransportParameters::kMaxIdleTimeout:
+ return "max_idle_timeout";
case TransportParameters::kStatelessResetToken:
return "stateless_reset_token";
case TransportParameters::kMaxPacketSize:
- return "max_packet_size";
+ return "max_udp_payload_size";
case TransportParameters::kInitialMaxData:
return "initial_max_data";
case TransportParameters::kInitialMaxStreamDataBidiLocal:
@@ -98,8 +98,8 @@
return "ack_delay_exponent";
case TransportParameters::kMaxAckDelay:
return "max_ack_delay";
- case TransportParameters::kDisableMigration:
- return "disable_migration";
+ case TransportParameters::kDisableActiveMigration:
+ return "disable_active_migration";
case TransportParameters::kPreferredAddress:
return "preferred_address";
case TransportParameters::kActiveConnectionIdLimit:
@@ -123,8 +123,8 @@
bool TransportParameterIdIsKnown(
TransportParameters::TransportParameterId param_id) {
switch (param_id) {
- case TransportParameters::kOriginalConnectionId:
- case TransportParameters::kIdleTimeout:
+ case TransportParameters::kOriginalDestinationConnectionId:
+ case TransportParameters::kMaxIdleTimeout:
case TransportParameters::kStatelessResetToken:
case TransportParameters::kMaxPacketSize:
case TransportParameters::kInitialMaxData:
@@ -135,7 +135,7 @@
case TransportParameters::kInitialMaxStreamsUni:
case TransportParameters::kAckDelayExponent:
case TransportParameters::kMaxAckDelay:
- case TransportParameters::kDisableMigration:
+ case TransportParameters::kDisableActiveMigration:
case TransportParameters::kPreferredAddress:
case TransportParameters::kActiveConnectionIdLimit:
case TransportParameters::kMaxDatagramFrameSize:
@@ -401,18 +401,18 @@
rv += " supported_versions " +
QuicVersionLabelVectorToString(supported_versions);
}
- if (original_connection_id.has_value()) {
- rv += " " + TransportParameterIdToString(kOriginalConnectionId) + " " +
- original_connection_id.value().ToString();
+ if (original_destination_connection_id.has_value()) {
+ rv += " " + TransportParameterIdToString(kOriginalDestinationConnectionId) +
+ " " + original_destination_connection_id.value().ToString();
}
- rv += idle_timeout_milliseconds.ToString(/*for_use_in_list=*/true);
+ rv += max_idle_timeout_ms.ToString(/*for_use_in_list=*/true);
if (!stateless_reset_token.empty()) {
rv += " " + TransportParameterIdToString(kStatelessResetToken) + " " +
quiche::QuicheTextUtils::HexEncode(
reinterpret_cast<const char*>(stateless_reset_token.data()),
stateless_reset_token.size());
}
- rv += max_packet_size.ToString(/*for_use_in_list=*/true);
+ rv += max_udp_payload_size.ToString(/*for_use_in_list=*/true);
rv += initial_max_data.ToString(/*for_use_in_list=*/true);
rv += initial_max_stream_data_bidi_local.ToString(/*for_use_in_list=*/true);
rv += initial_max_stream_data_bidi_remote.ToString(/*for_use_in_list=*/true);
@@ -421,8 +421,8 @@
rv += initial_max_streams_uni.ToString(/*for_use_in_list=*/true);
rv += ack_delay_exponent.ToString(/*for_use_in_list=*/true);
rv += max_ack_delay.ToString(/*for_use_in_list=*/true);
- if (disable_migration) {
- rv += " " + TransportParameterIdToString(kDisableMigration);
+ if (disable_active_migration) {
+ rv += " " + TransportParameterIdToString(kDisableActiveMigration);
}
if (preferred_address) {
rv += " " + TransportParameterIdToString(kPreferredAddress) + " " +
@@ -469,11 +469,11 @@
TransportParameters::TransportParameters()
: version(0),
- idle_timeout_milliseconds(kIdleTimeout),
- max_packet_size(kMaxPacketSize,
- kDefaultMaxPacketSizeTransportParam,
- kMinMaxPacketSizeTransportParam,
- kVarInt62MaxValue),
+ max_idle_timeout_ms(kMaxIdleTimeout),
+ max_udp_payload_size(kMaxPacketSize,
+ kDefaultMaxPacketSizeTransportParam,
+ kMinMaxPacketSizeTransportParam,
+ kVarInt62MaxValue),
initial_max_data(kInitialMaxData),
initial_max_stream_data_bidi_local(kInitialMaxStreamDataBidiLocal),
initial_max_stream_data_bidi_remote(kInitialMaxStreamDataBidiRemote),
@@ -488,7 +488,7 @@
kDefaultMaxAckDelayTransportParam,
0,
kMaxMaxAckDelayTransportParam),
- disable_migration(false),
+ disable_active_migration(false),
active_connection_id_limit(kActiveConnectionIdLimit,
kDefaultActiveConnectionIdLimitTransportParam,
kMinActiveConnectionIdLimitTransportParam,
@@ -505,10 +505,11 @@
: perspective(other.perspective),
version(other.version),
supported_versions(other.supported_versions),
- original_connection_id(other.original_connection_id),
- idle_timeout_milliseconds(other.idle_timeout_milliseconds),
+ original_destination_connection_id(
+ other.original_destination_connection_id),
+ max_idle_timeout_ms(other.max_idle_timeout_ms),
stateless_reset_token(other.stateless_reset_token),
- max_packet_size(other.max_packet_size),
+ max_udp_payload_size(other.max_udp_payload_size),
initial_max_data(other.initial_max_data),
initial_max_stream_data_bidi_local(
other.initial_max_stream_data_bidi_local),
@@ -519,7 +520,7 @@
initial_max_streams_uni(other.initial_max_streams_uni),
ack_delay_exponent(other.ack_delay_exponent),
max_ack_delay(other.max_ack_delay),
- disable_migration(other.disable_migration),
+ disable_active_migration(other.disable_active_migration),
active_connection_id_limit(other.active_connection_id_limit),
max_datagram_frame_size(other.max_datagram_frame_size),
initial_round_trip_time_us(other.initial_round_trip_time_us),
@@ -539,11 +540,11 @@
bool TransportParameters::operator==(const TransportParameters& rhs) const {
if (!(perspective == rhs.perspective && version == rhs.version &&
supported_versions == rhs.supported_versions &&
- original_connection_id == rhs.original_connection_id &&
- idle_timeout_milliseconds.value() ==
- rhs.idle_timeout_milliseconds.value() &&
+ original_destination_connection_id ==
+ rhs.original_destination_connection_id &&
+ max_idle_timeout_ms.value() == rhs.max_idle_timeout_ms.value() &&
stateless_reset_token == rhs.stateless_reset_token &&
- max_packet_size.value() == rhs.max_packet_size.value() &&
+ max_udp_payload_size.value() == rhs.max_udp_payload_size.value() &&
initial_max_data.value() == rhs.initial_max_data.value() &&
initial_max_stream_data_bidi_local.value() ==
rhs.initial_max_stream_data_bidi_local.value() &&
@@ -557,7 +558,7 @@
rhs.initial_max_streams_uni.value() &&
ack_delay_exponent.value() == rhs.ack_delay_exponent.value() &&
max_ack_delay.value() == rhs.max_ack_delay.value() &&
- disable_migration == rhs.disable_migration &&
+ disable_active_migration == rhs.disable_active_migration &&
active_connection_id_limit.value() ==
rhs.active_connection_id_limit.value() &&
max_datagram_frame_size.value() ==
@@ -600,7 +601,7 @@
return false;
}
if (perspective == Perspective::IS_CLIENT &&
- original_connection_id.has_value()) {
+ original_destination_connection_id.has_value()) {
*error_details = "Client cannot send original connection ID";
return false;
}
@@ -646,7 +647,7 @@
return false;
}
const bool ok =
- idle_timeout_milliseconds.IsValid() && max_packet_size.IsValid() &&
+ max_idle_timeout_ms.IsValid() && max_udp_payload_size.IsValid() &&
initial_max_data.IsValid() &&
initial_max_stream_data_bidi_local.IsValid() &&
initial_max_stream_data_bidi_remote.IsValid() &&
@@ -699,7 +700,7 @@
static constexpr size_t kGreaseParameterLength =
kTypeAndValueLength + kMaxGreaseLength;
static constexpr size_t kKnownTransportParamLength =
- kConnectionIdParameterLength + // original_connection_id
+ kConnectionIdParameterLength + // original_destination_connection_id
kIntegerParameterLength + // max_idle_timeout
kStatelessResetParameterLength + // stateless_reset_token
kIntegerParameterLength + // max_udp_payload_size
@@ -761,24 +762,27 @@
}
}
- // original_connection_id
- if (in.original_connection_id.has_value()) {
+ // original_destination_connection_id
+ if (in.original_destination_connection_id.has_value()) {
DCHECK_EQ(Perspective::IS_SERVER, in.perspective);
- QuicConnectionId original_connection_id = in.original_connection_id.value();
+ QuicConnectionId original_destination_connection_id =
+ in.original_destination_connection_id.value();
if (!WriteTransportParameterId(
- &writer, TransportParameters::kOriginalConnectionId, version) ||
+ &writer, TransportParameters::kOriginalDestinationConnectionId,
+ version) ||
!WriteTransportParameterStringPiece(
&writer,
- quiche::QuicheStringPiece(original_connection_id.data(),
- original_connection_id.length()),
+ quiche::QuicheStringPiece(
+ original_destination_connection_id.data(),
+ original_destination_connection_id.length()),
version)) {
- QUIC_BUG << "Failed to write original_connection_id "
- << in.original_connection_id.value() << " for " << in;
+ QUIC_BUG << "Failed to write original_destination_connection_id "
+ << original_destination_connection_id << " for " << in;
return false;
}
}
- if (!in.idle_timeout_milliseconds.Write(&writer, version)) {
+ if (!in.max_idle_timeout_ms.Write(&writer, version)) {
QUIC_BUG << "Failed to write idle_timeout for " << in;
return false;
}
@@ -801,7 +805,7 @@
}
}
- if (!in.max_packet_size.Write(&writer, version) ||
+ if (!in.max_udp_payload_size.Write(&writer, version) ||
!in.initial_max_data.Write(&writer, version) ||
!in.initial_max_stream_data_bidi_local.Write(&writer, version) ||
!in.initial_max_stream_data_bidi_remote.Write(&writer, version) ||
@@ -817,12 +821,12 @@
return false;
}
- // disable_migration
- if (in.disable_migration) {
+ // disable_active_migration
+ if (in.disable_active_migration) {
if (!WriteTransportParameterId(
- &writer, TransportParameters::kDisableMigration, version) ||
+ &writer, TransportParameters::kDisableActiveMigration, version) ||
!WriteTransportParameterLength(&writer, /*length=*/0, version)) {
- QUIC_BUG << "Failed to write disable_migration for " << in;
+ QUIC_BUG << "Failed to write disable_active_migration for " << in;
return false;
}
}
@@ -1061,41 +1065,43 @@
QuicDataReader value_reader(value);
bool parse_success = true;
switch (param_id) {
- case TransportParameters::kOriginalConnectionId: {
- if (out->original_connection_id.has_value()) {
- *error_details = "Received a second original connection ID";
+ case TransportParameters::kOriginalDestinationConnectionId: {
+ if (out->original_destination_connection_id.has_value()) {
+ *error_details =
+ "Received a second original_destination_connection_id";
return false;
}
const size_t connection_id_length = value_reader.BytesRemaining();
if (!QuicUtils::IsConnectionIdLengthValidForVersion(
connection_id_length, version.transport_version)) {
*error_details = quiche::QuicheStrCat(
- "Received original connection ID of invalid length ",
+ "Received original_destination_connection_id of invalid length ",
connection_id_length);
return false;
}
- QuicConnectionId original_connection_id;
- if (!value_reader.ReadConnectionId(&original_connection_id,
+ QuicConnectionId original_destination_connection_id;
+ if (!value_reader.ReadConnectionId(&original_destination_connection_id,
connection_id_length)) {
- *error_details = "Failed to read original connection ID";
+ *error_details = "Failed to read original_destination_connection_id";
return false;
}
- out->original_connection_id = original_connection_id;
+ out->original_destination_connection_id =
+ original_destination_connection_id;
} break;
- case TransportParameters::kIdleTimeout:
+ case TransportParameters::kMaxIdleTimeout:
parse_success =
- out->idle_timeout_milliseconds.Read(&value_reader, error_details);
+ out->max_idle_timeout_ms.Read(&value_reader, error_details);
break;
case TransportParameters::kStatelessResetToken: {
if (!out->stateless_reset_token.empty()) {
- *error_details = "Received a second stateless reset token";
+ *error_details = "Received a second stateless_reset_token";
return false;
}
quiche::QuicheStringPiece stateless_reset_token =
value_reader.ReadRemainingPayload();
if (stateless_reset_token.length() != kStatelessResetTokenLength) {
*error_details = quiche::QuicheStrCat(
- "Received stateless reset token of invalid length ",
+ "Received stateless_reset_token of invalid length ",
stateless_reset_token.length());
return false;
}
@@ -1104,7 +1110,8 @@
stateless_reset_token.data() + stateless_reset_token.length());
} break;
case TransportParameters::kMaxPacketSize:
- parse_success = out->max_packet_size.Read(&value_reader, error_details);
+ parse_success =
+ out->max_udp_payload_size.Read(&value_reader, error_details);
break;
case TransportParameters::kInitialMaxData:
parse_success =
@@ -1137,12 +1144,12 @@
case TransportParameters::kMaxAckDelay:
parse_success = out->max_ack_delay.Read(&value_reader, error_details);
break;
- case TransportParameters::kDisableMigration:
- if (out->disable_migration) {
- *error_details = "Received a second disable migration";
+ case TransportParameters::kDisableActiveMigration:
+ if (out->disable_active_migration) {
+ *error_details = "Received a second disable_active_migration";
return false;
}
- out->disable_migration = true;
+ out->disable_active_migration = true;
break;
case TransportParameters::kPreferredAddress: {
TransportParameters::PreferredAddress preferred_address;
@@ -1159,7 +1166,7 @@
&preferred_address.connection_id) ||
!value_reader.ReadBytes(&preferred_address.stateless_reset_token[0],
kStatelessResetTokenLength)) {
- *error_details = "Failed to read preferred address";
+ *error_details = "Failed to read preferred_address";
return false;
}
preferred_address.ipv4_socket_address =
@@ -1168,13 +1175,13 @@
QuicSocketAddress(QuicIpAddress(ipv6_address), ipv6_port);
if (!preferred_address.ipv4_socket_address.host().IsIPv4() ||
!preferred_address.ipv6_socket_address.host().IsIPv6()) {
- *error_details = "Received preferred addresses of bad families " +
+ *error_details = "Received preferred_address of bad families " +
preferred_address.ToString();
return false;
}
if (!QuicUtils::IsConnectionIdValidForVersion(
preferred_address.connection_id, version.transport_version)) {
- *error_details = "Received invalid preferred address connection ID " +
+ *error_details = "Received invalid preferred_address connection ID " +
preferred_address.ToString();
return false;
}
@@ -1196,14 +1203,14 @@
break;
case TransportParameters::kGoogleConnectionOptions: {
if (out->google_connection_options.has_value()) {
- *error_details = "Received a second Google connection options";
+ *error_details = "Received a second google_connection_options";
return false;
}
out->google_connection_options = QuicTagVector{};
while (!value_reader.IsDoneReading()) {
QuicTag connection_option;
if (!value_reader.ReadTag(&connection_option)) {
- *error_details = "Failed to read a Google connection option";
+ *error_details = "Failed to read a google_connection_options";
return false;
}
out->google_connection_options.value().push_back(connection_option);
@@ -1211,7 +1218,7 @@
} break;
case TransportParameters::kGoogleUserAgentId:
if (out->user_agent_id.has_value()) {
- *error_details = "Received a second user agent ID";
+ *error_details = "Received a second user_agent_id";
return false;
}
out->user_agent_id = std::string(value_reader.ReadRemainingPayload());
diff --git a/quic/core/crypto/transport_parameters.h b/quic/core/crypto/transport_parameters.h
index 9dec484..630f7bb 100644
--- a/quic/core/crypto/transport_parameters.h
+++ b/quic/core/crypto/transport_parameters.h
@@ -132,17 +132,17 @@
// The value of the Destination Connection ID field from the first
// Initial packet sent by the client.
- quiche::QuicheOptional<QuicConnectionId> original_connection_id;
+ quiche::QuicheOptional<QuicConnectionId> original_destination_connection_id;
- // Idle timeout expressed in milliseconds.
- IntegerParameter idle_timeout_milliseconds;
+ // Maximum idle timeout expressed in milliseconds.
+ IntegerParameter max_idle_timeout_ms;
// Stateless reset token used in verifying stateless resets.
std::vector<uint8_t> stateless_reset_token;
// Limits the size of packets that the endpoint is willing to receive.
// This indicates that packets larger than this limit will be dropped.
- IntegerParameter max_packet_size;
+ IntegerParameter max_udp_payload_size;
// Contains the initial value for the maximum amount of data that can
// be sent on the connection.
@@ -171,7 +171,7 @@
IntegerParameter max_ack_delay;
// Indicates lack of support for connection migration.
- bool disable_migration;
+ bool disable_active_migration;
// Used to effect a change in server address at the end of the handshake.
std::unique_ptr<PreferredAddress> preferred_address;
diff --git a/quic/core/crypto/transport_parameters_test.cc b/quic/core/crypto/transport_parameters_test.cc
index 6b02411..628c19f 100644
--- a/quic/core/crypto/transport_parameters_test.cc
+++ b/quic/core/crypto/transport_parameters_test.cc
@@ -52,7 +52,7 @@
static_cast<TransportParameters::TransportParameterId>(0xff34);
const char* kCustomParameter2Value = "bar";
-QuicConnectionId CreateFakeOriginalConnectionId() {
+QuicConnectionId CreateFakeOriginalDestinationConnectionId() {
return TestConnectionId(0x1337);
}
@@ -151,8 +151,8 @@
new_params.perspective = Perspective::IS_CLIENT;
orig_params.version = kFakeVersionLabel;
new_params.version = kFakeVersionLabel;
- orig_params.disable_migration = true;
- new_params.disable_migration = true;
+ orig_params.disable_active_migration = true;
+ new_params.disable_active_migration = true;
EXPECT_EQ(orig_params, new_params);
EXPECT_TRUE(orig_params == new_params);
EXPECT_FALSE(orig_params != new_params);
@@ -172,12 +172,12 @@
EXPECT_FALSE(orig_params != new_params);
// Test comparison on IntegerParameters.
- orig_params.max_packet_size.set_value(kFakeMaxPacketSize);
- new_params.max_packet_size.set_value(kFakeMaxPacketSize + 1);
+ orig_params.max_udp_payload_size.set_value(kFakeMaxPacketSize);
+ new_params.max_udp_payload_size.set_value(kFakeMaxPacketSize + 1);
EXPECT_NE(orig_params, new_params);
EXPECT_FALSE(orig_params == new_params);
EXPECT_TRUE(orig_params != new_params);
- new_params.max_packet_size.set_value(kFakeMaxPacketSize);
+ new_params.max_udp_payload_size.set_value(kFakeMaxPacketSize);
EXPECT_EQ(orig_params, new_params);
EXPECT_TRUE(orig_params == new_params);
EXPECT_FALSE(orig_params != new_params);
@@ -230,10 +230,11 @@
orig_params.version = kFakeVersionLabel;
orig_params.supported_versions.push_back(kFakeVersionLabel);
orig_params.supported_versions.push_back(kFakeVersionLabel2);
- orig_params.original_connection_id = CreateFakeOriginalConnectionId();
- orig_params.idle_timeout_milliseconds.set_value(kFakeIdleTimeoutMilliseconds);
+ orig_params.original_destination_connection_id =
+ CreateFakeOriginalDestinationConnectionId();
+ orig_params.max_idle_timeout_ms.set_value(kFakeIdleTimeoutMilliseconds);
orig_params.stateless_reset_token = CreateFakeStatelessResetToken();
- orig_params.max_packet_size.set_value(kFakeMaxPacketSize);
+ orig_params.max_udp_payload_size.set_value(kFakeMaxPacketSize);
orig_params.initial_max_data.set_value(kFakeInitialMaxData);
orig_params.initial_max_stream_data_bidi_local.set_value(
kFakeInitialMaxStreamDataBidiLocal);
@@ -245,7 +246,7 @@
orig_params.initial_max_streams_uni.set_value(kFakeInitialMaxStreamsUni);
orig_params.ack_delay_exponent.set_value(kFakeAckDelayExponent);
orig_params.max_ack_delay.set_value(kFakeMaxAckDelay);
- orig_params.disable_migration = kFakeDisableMigration;
+ orig_params.disable_active_migration = kFakeDisableMigration;
orig_params.preferred_address = CreateFakePreferredAddress();
orig_params.active_connection_id_limit.set_value(
kFakeActiveConnectionIdLimit);
@@ -263,8 +264,8 @@
TransportParameters orig_params;
orig_params.perspective = Perspective::IS_CLIENT;
orig_params.version = kFakeVersionLabel;
- orig_params.idle_timeout_milliseconds.set_value(kFakeIdleTimeoutMilliseconds);
- orig_params.max_packet_size.set_value(kFakeMaxPacketSize);
+ orig_params.max_idle_timeout_ms.set_value(kFakeIdleTimeoutMilliseconds);
+ orig_params.max_udp_payload_size.set_value(kFakeMaxPacketSize);
orig_params.initial_max_data.set_value(kFakeInitialMaxData);
orig_params.initial_max_stream_data_bidi_local.set_value(
kFakeInitialMaxStreamDataBidiLocal);
@@ -276,7 +277,7 @@
orig_params.initial_max_streams_uni.set_value(kFakeInitialMaxStreamsUni);
orig_params.ack_delay_exponent.set_value(kFakeAckDelayExponent);
orig_params.max_ack_delay.set_value(kFakeMaxAckDelay);
- orig_params.disable_migration = kFakeDisableMigration;
+ orig_params.disable_active_migration = kFakeDisableMigration;
orig_params.active_connection_id_limit.set_value(
kFakeActiveConnectionIdLimit);
orig_params.initial_round_trip_time_us.set_value(kFakeInitialRoundTripTime);
@@ -305,10 +306,11 @@
orig_params.version = kFakeVersionLabel;
orig_params.supported_versions.push_back(kFakeVersionLabel);
orig_params.supported_versions.push_back(kFakeVersionLabel2);
- orig_params.original_connection_id = CreateFakeOriginalConnectionId();
- orig_params.idle_timeout_milliseconds.set_value(kFakeIdleTimeoutMilliseconds);
+ orig_params.original_destination_connection_id =
+ CreateFakeOriginalDestinationConnectionId();
+ orig_params.max_idle_timeout_ms.set_value(kFakeIdleTimeoutMilliseconds);
orig_params.stateless_reset_token = CreateFakeStatelessResetToken();
- orig_params.max_packet_size.set_value(kFakeMaxPacketSize);
+ orig_params.max_udp_payload_size.set_value(kFakeMaxPacketSize);
orig_params.initial_max_data.set_value(kFakeInitialMaxData);
orig_params.initial_max_stream_data_bidi_local.set_value(
kFakeInitialMaxStreamDataBidiLocal);
@@ -320,7 +322,7 @@
orig_params.initial_max_streams_uni.set_value(kFakeInitialMaxStreamsUni);
orig_params.ack_delay_exponent.set_value(kFakeAckDelayExponent);
orig_params.max_ack_delay.set_value(kFakeMaxAckDelay);
- orig_params.disable_migration = kFakeDisableMigration;
+ orig_params.disable_active_migration = kFakeDisableMigration;
orig_params.preferred_address = CreateFakePreferredAddress();
orig_params.active_connection_id_limit.set_value(
kFakeActiveConnectionIdLimit);
@@ -354,10 +356,10 @@
params.perspective = Perspective::IS_CLIENT;
EXPECT_TRUE(params.AreValid(&error_details));
EXPECT_TRUE(error_details.empty());
- params.idle_timeout_milliseconds.set_value(kFakeIdleTimeoutMilliseconds);
+ params.max_idle_timeout_ms.set_value(kFakeIdleTimeoutMilliseconds);
EXPECT_TRUE(params.AreValid(&error_details));
EXPECT_TRUE(error_details.empty());
- params.idle_timeout_milliseconds.set_value(601000);
+ params.max_idle_timeout_ms.set_value(601000);
EXPECT_TRUE(params.AreValid(&error_details));
EXPECT_TRUE(error_details.empty());
}
@@ -367,27 +369,27 @@
params.perspective = Perspective::IS_CLIENT;
EXPECT_TRUE(params.AreValid(&error_details));
EXPECT_TRUE(error_details.empty());
- params.max_packet_size.set_value(1200);
+ params.max_udp_payload_size.set_value(1200);
EXPECT_TRUE(params.AreValid(&error_details));
EXPECT_TRUE(error_details.empty());
- params.max_packet_size.set_value(65535);
+ params.max_udp_payload_size.set_value(65535);
EXPECT_TRUE(params.AreValid(&error_details));
EXPECT_TRUE(error_details.empty());
- params.max_packet_size.set_value(9999999);
+ params.max_udp_payload_size.set_value(9999999);
EXPECT_TRUE(params.AreValid(&error_details));
EXPECT_TRUE(error_details.empty());
- params.max_packet_size.set_value(0);
+ params.max_udp_payload_size.set_value(0);
error_details = "";
EXPECT_FALSE(params.AreValid(&error_details));
- EXPECT_EQ(
- error_details,
- "Invalid transport parameters [Client max_packet_size 0 (Invalid)]");
- params.max_packet_size.set_value(1199);
+ EXPECT_EQ(error_details,
+ "Invalid transport parameters [Client max_udp_payload_size 0 "
+ "(Invalid)]");
+ params.max_udp_payload_size.set_value(1199);
error_details = "";
EXPECT_FALSE(params.AreValid(&error_details));
- EXPECT_EQ(
- error_details,
- "Invalid transport parameters [Client max_packet_size 1199 (Invalid)]");
+ EXPECT_EQ(error_details,
+ "Invalid transport parameters [Client max_udp_payload_size 1199 "
+ "(Invalid)]");
}
{
TransportParameters params;
@@ -436,9 +438,9 @@
TransportParameters orig_params;
orig_params.perspective = Perspective::IS_CLIENT;
orig_params.version = kFakeVersionLabel;
- orig_params.idle_timeout_milliseconds.set_value(kFakeIdleTimeoutMilliseconds);
+ orig_params.max_idle_timeout_ms.set_value(kFakeIdleTimeoutMilliseconds);
orig_params.stateless_reset_token = CreateFakeStatelessResetToken();
- orig_params.max_packet_size.set_value(kFakeMaxPacketSize);
+ orig_params.max_udp_payload_size.set_value(kFakeMaxPacketSize);
std::vector<uint8_t> out;
bool ok;
@@ -453,11 +455,11 @@
// clang-format off
const uint8_t kClientParamsOld[] = {
0x00, 0x6a, // length of the parameters array that follows
- // idle_timeout
+ // max_idle_timeout
0x00, 0x01, // parameter id
0x00, 0x02, // length
0x6e, 0xec, // value
- // max_packet_size
+ // max_udp_payload_size
0x00, 0x03, // parameter id
0x00, 0x02, // length
0x63, 0x29, // value
@@ -493,7 +495,7 @@
0x00, 0x0b, // parameter id
0x00, 0x01, // length
0x33, // value
- // disable_migration
+ // disable_active_migration
0x00, 0x0c, // parameter id
0x00, 0x00, // length
// active_connection_id_limit
@@ -520,11 +522,11 @@
0x01, 0x23, 0x45, 0x67, // initial version
};
const uint8_t kClientParams[] = {
- // idle_timeout
+ // max_idle_timeout
0x01, // parameter id
0x02, // length
0x6e, 0xec, // value
- // max_packet_size
+ // max_udp_payload_size
0x03, // parameter id
0x02, // length
0x63, 0x29, // value
@@ -560,7 +562,7 @@
0x0b, // parameter id
0x01, // length
0x33, // value
- // disable_migration
+ // disable_active_migration
0x0c, // parameter id
0x00, // length
// active_connection_id_limit
@@ -604,11 +606,11 @@
EXPECT_EQ(Perspective::IS_CLIENT, new_params.perspective);
EXPECT_EQ(kFakeVersionLabel, new_params.version);
EXPECT_TRUE(new_params.supported_versions.empty());
- EXPECT_FALSE(new_params.original_connection_id.has_value());
+ EXPECT_FALSE(new_params.original_destination_connection_id.has_value());
EXPECT_EQ(kFakeIdleTimeoutMilliseconds,
- new_params.idle_timeout_milliseconds.value());
+ new_params.max_idle_timeout_ms.value());
EXPECT_TRUE(new_params.stateless_reset_token.empty());
- EXPECT_EQ(kFakeMaxPacketSize, new_params.max_packet_size.value());
+ EXPECT_EQ(kFakeMaxPacketSize, new_params.max_udp_payload_size.value());
EXPECT_EQ(kFakeInitialMaxData, new_params.initial_max_data.value());
EXPECT_EQ(kFakeInitialMaxStreamDataBidiLocal,
new_params.initial_max_stream_data_bidi_local.value());
@@ -622,7 +624,7 @@
new_params.initial_max_streams_uni.value());
EXPECT_EQ(kFakeAckDelayExponent, new_params.ack_delay_exponent.value());
EXPECT_EQ(kFakeMaxAckDelay, new_params.max_ack_delay.value());
- EXPECT_EQ(kFakeDisableMigration, new_params.disable_migration);
+ EXPECT_EQ(kFakeDisableMigration, new_params.disable_active_migration);
EXPECT_EQ(kFakeActiveConnectionIdLimit,
new_params.active_connection_id_limit.value());
EXPECT_EQ(kFakeInitialRoundTripTime,
@@ -639,7 +641,7 @@
// clang-format off
const uint8_t kClientParamsWithFullTokenOld[] = {
0x00, 0x26, // length parameters array that follows
- // idle_timeout
+ // max_idle_timeout
0x00, 0x01, // parameter id
0x00, 0x02, // length
0x6e, 0xec, // value
@@ -648,7 +650,7 @@
0x00, 0x10, // length
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
- // max_packet_size
+ // max_udp_payload_size
0x00, 0x03, // parameter id
0x00, 0x02, // length
0x63, 0x29, // value
@@ -658,7 +660,7 @@
0x40, 0x65, // value
};
const uint8_t kClientParamsWithFullToken[] = {
- // idle_timeout
+ // max_idle_timeout
0x01, // parameter id
0x02, // length
0x6e, 0xec, // value
@@ -667,7 +669,7 @@
0x10, // length
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
- // max_packet_size
+ // max_udp_payload_size
0x03, // parameter id
0x02, // length
0x63, 0x29, // value
@@ -698,14 +700,14 @@
// clang-format off
const uint8_t kClientParamsWithEmptyTokenOld[] = {
0x00, 0x16, // length parameters array that follows
- // idle_timeout
+ // max_idle_timeout
0x00, 0x01, // parameter id
0x00, 0x02, // length
0x6e, 0xec, // value
// stateless_reset_token
0x00, 0x02, // parameter id
0x00, 0x00,
- // max_packet_size
+ // max_udp_payload_size
0x00, 0x03, // parameter id
0x00, 0x02, // length
0x63, 0x29, // value
@@ -715,14 +717,14 @@
0x40, 0x65, // value
};
const uint8_t kClientParamsWithEmptyToken[] = {
- // idle_timeout
+ // max_idle_timeout
0x01, // parameter id
0x02, // length
0x6e, 0xec, // value
// stateless_reset_token
0x02, // parameter id
0x00, // length
- // max_packet_size
+ // max_udp_payload_size
0x03, // parameter id
0x02, // length
0x63, 0x29, // value
@@ -746,36 +748,36 @@
client_params, client_params_length,
&out_params, &error_details));
EXPECT_EQ(error_details,
- "Received stateless reset token of invalid length 0");
+ "Received stateless_reset_token of invalid length 0");
}
TEST_P(TransportParametersTest, ParseClientParametersRepeated) {
// clang-format off
const uint8_t kClientParamsRepeatedOld[] = {
0x00, 0x12, // length parameters array that follows
- // idle_timeout
+ // max_idle_timeout
0x00, 0x01, // parameter id
0x00, 0x02, // length
0x6e, 0xec, // value
- // max_packet_size
+ // max_udp_payload_size
0x00, 0x03, // parameter id
0x00, 0x02, // length
0x63, 0x29, // value
- // idle_timeout (repeated)
+ // max_idle_timeout (repeated)
0x00, 0x01, // parameter id
0x00, 0x02, // length
0x6e, 0xec, // value
};
const uint8_t kClientParamsRepeated[] = {
- // idle_timeout
+ // max_idle_timeout
0x01, // parameter id
0x02, // length
0x6e, 0xec, // value
- // max_packet_size
+ // max_udp_payload_size
0x03, // parameter id
0x02, // length
0x63, 0x29, // value
- // idle_timeout (repeated)
+ // max_idle_timeout (repeated)
0x01, // parameter id
0x02, // length
0x6e, 0xec, // value
@@ -793,18 +795,18 @@
EXPECT_FALSE(ParseTransportParameters(version_, Perspective::IS_CLIENT,
client_params, client_params_length,
&out_params, &error_details));
- EXPECT_EQ(error_details, "Received a second idle_timeout");
+ EXPECT_EQ(error_details, "Received a second max_idle_timeout");
}
TEST_P(TransportParametersTest, ParseServerParams) {
// clang-format off
const uint8_t kServerParamsOld[] = {
0x00, 0xb7, // length of parameters array that follows
- // original_connection_id
+ // original_destination_connection_id
0x00, 0x00, // parameter id
0x00, 0x08, // length
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x37,
- // idle_timeout
+ // max_idle_timeout
0x00, 0x01, // parameter id
0x00, 0x02, // length
0x6e, 0xec, // value
@@ -813,7 +815,7 @@
0x00, 0x10, // length
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
- // max_packet_size
+ // max_udp_payload_size
0x00, 0x03, // parameter id
0x00, 0x02, // length
0x63, 0x29, // value
@@ -849,7 +851,7 @@
0x00, 0x0b, // parameter id
0x00, 0x01, // length
0x33, // value
- // disable_migration
+ // disable_active_migration
0x00, 0x0c, // parameter id
0x00, 0x00, // length
// preferred_address
@@ -883,11 +885,11 @@
0x89, 0xab, 0xcd, 0xef,
};
const uint8_t kServerParams[] = {
- // original_connection_id
+ // original_destination_connection_id
0x00, // parameter id
0x08, // length
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x37,
- // idle_timeout
+ // max_idle_timeout
0x01, // parameter id
0x02, // length
0x6e, 0xec, // value
@@ -896,7 +898,7 @@
0x10, // length
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
- // max_packet_size
+ // max_udp_payload_size
0x03, // parameter id
0x02, // length
0x63, 0x29, // value
@@ -932,7 +934,7 @@
0x0b, // parameter id
0x01, // length
0x33, // value
- // disable_migration
+ // disable_active_migration
0x0c, // parameter id
0x00, // length
// preferred_address
@@ -985,13 +987,13 @@
EXPECT_EQ(2u, new_params.supported_versions.size());
EXPECT_EQ(kFakeVersionLabel, new_params.supported_versions[0]);
EXPECT_EQ(kFakeVersionLabel2, new_params.supported_versions[1]);
- ASSERT_TRUE(new_params.original_connection_id.has_value());
- EXPECT_EQ(CreateFakeOriginalConnectionId(),
- new_params.original_connection_id.value());
+ ASSERT_TRUE(new_params.original_destination_connection_id.has_value());
+ EXPECT_EQ(CreateFakeOriginalDestinationConnectionId(),
+ new_params.original_destination_connection_id.value());
EXPECT_EQ(kFakeIdleTimeoutMilliseconds,
- new_params.idle_timeout_milliseconds.value());
+ new_params.max_idle_timeout_ms.value());
EXPECT_EQ(CreateFakeStatelessResetToken(), new_params.stateless_reset_token);
- EXPECT_EQ(kFakeMaxPacketSize, new_params.max_packet_size.value());
+ EXPECT_EQ(kFakeMaxPacketSize, new_params.max_udp_payload_size.value());
EXPECT_EQ(kFakeInitialMaxData, new_params.initial_max_data.value());
EXPECT_EQ(kFakeInitialMaxStreamDataBidiLocal,
new_params.initial_max_stream_data_bidi_local.value());
@@ -1005,7 +1007,7 @@
new_params.initial_max_streams_uni.value());
EXPECT_EQ(kFakeAckDelayExponent, new_params.ack_delay_exponent.value());
EXPECT_EQ(kFakeMaxAckDelay, new_params.max_ack_delay.value());
- EXPECT_EQ(kFakeDisableMigration, new_params.disable_migration);
+ EXPECT_EQ(kFakeDisableMigration, new_params.disable_active_migration);
ASSERT_NE(nullptr, new_params.preferred_address.get());
EXPECT_EQ(CreateFakeV4SocketAddress(),
new_params.preferred_address->ipv4_socket_address);
@@ -1027,11 +1029,11 @@
// clang-format off
const uint8_t kServerParamsRepeatedOld[] = {
0x00, 0x2c, // length of parameters array that follows
- // original_connection_id
+ // original_destination_connection_id
0x00, 0x00, // parameter id
0x00, 0x08, // length
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x37,
- // idle_timeout
+ // max_idle_timeout
0x00, 0x01, // parameter id
0x00, 0x02, // length
0x6e, 0xec, // value
@@ -1040,17 +1042,17 @@
0x00, 0x10, // length
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
- // idle_timeout (repeated)
+ // max_idle_timeout (repeated)
0x00, 0x01, // parameter id
0x00, 0x02, // length
0x6e, 0xec, // value
};
const uint8_t kServerParamsRepeated[] = {
- // original_connection_id
+ // original_destination_connection_id
0x00, // parameter id
0x08, // length
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x37,
- // idle_timeout
+ // max_idle_timeout
0x01, // parameter id
0x02, // length
0x6e, 0xec, // value
@@ -1059,7 +1061,7 @@
0x10, // length
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
- // idle_timeout (repeated)
+ // max_idle_timeout (repeated)
0x01, // parameter id
0x02, // length
0x6e, 0xec, // value
@@ -1077,7 +1079,7 @@
EXPECT_FALSE(ParseTransportParameters(version_, Perspective::IS_SERVER,
server_params, server_params_length,
&out_params, &error_details));
- EXPECT_EQ(error_details, "Received a second idle_timeout");
+ EXPECT_EQ(error_details, "Received a second max_idle_timeout");
}
TEST_P(TransportParametersTest,
@@ -1085,10 +1087,10 @@
// clang-format off
const uint8_t kServerParamsEmptyOriginalConnectionIdOld[] = {
0x00, 0x1e, // length of parameters array that follows
- // original_connection_id
+ // original_destination_connection_id
0x00, 0x00, // parameter id
0x00, 0x00, // length
- // idle_timeout
+ // max_idle_timeout
0x00, 0x01, // parameter id
0x00, 0x02, // length
0x6e, 0xec, // value
@@ -1099,10 +1101,10 @@
0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
};
const uint8_t kServerParamsEmptyOriginalConnectionId[] = {
- // original_connection_id
+ // original_destination_connection_id
0x00, // parameter id
0x00, // length
- // idle_timeout
+ // max_idle_timeout
0x01, // parameter id
0x02, // length
0x6e, 0xec, // value
@@ -1129,15 +1131,16 @@
server_params, server_params_length,
&out_params, &error_details))
<< error_details;
- ASSERT_TRUE(out_params.original_connection_id.has_value());
- EXPECT_EQ(out_params.original_connection_id.value(), EmptyQuicConnectionId());
+ ASSERT_TRUE(out_params.original_destination_connection_id.has_value());
+ EXPECT_EQ(out_params.original_destination_connection_id.value(),
+ EmptyQuicConnectionId());
}
TEST_P(TransportParametersTest, CryptoHandshakeMessageRoundtrip) {
TransportParameters orig_params;
orig_params.perspective = Perspective::IS_CLIENT;
orig_params.version = kFakeVersionLabel;
- orig_params.max_packet_size.set_value(kFakeMaxPacketSize);
+ orig_params.max_udp_payload_size.set_value(kFakeMaxPacketSize);
orig_params.google_quic_params = std::make_unique<CryptoHandshakeMessage>();
const std::string kTestString = "test string";
@@ -1166,7 +1169,7 @@
IsQuicNoError());
EXPECT_EQ(test_value, kTestValue);
EXPECT_EQ(kFakeVersionLabel, new_params.version);
- EXPECT_EQ(kFakeMaxPacketSize, new_params.max_packet_size.value());
+ EXPECT_EQ(kFakeMaxPacketSize, new_params.max_udp_payload_size.value());
}
TEST_P(TransportParametersTest, VeryLongCustomParameter) {
diff --git a/quic/core/quic_config.cc b/quic/core/quic_config.cc
index 8cdc121..1948077 100644
--- a/quic/core/quic_config.cc
+++ b/quic/core/quic_config.cc
@@ -434,7 +434,7 @@
max_undecryptable_packets_(0),
connection_options_(kCOPT, PRESENCE_OPTIONAL),
client_connection_options_(kCLOP, PRESENCE_OPTIONAL),
- idle_timeout_to_send_(QuicTime::Delta::Infinite()),
+ max_idle_timeout_to_send_(QuicTime::Delta::Infinite()),
max_bidirectional_streams_(kMIBS, PRESENCE_REQUIRED),
max_unidirectional_streams_(kMIUS, PRESENCE_OPTIONAL),
bytes_for_connection_id_(kTCID, PRESENCE_OPTIONAL),
@@ -452,7 +452,7 @@
stateless_reset_token_(kSRST, PRESENCE_OPTIONAL),
max_ack_delay_ms_(kMAD, PRESENCE_OPTIONAL),
ack_delay_exponent_(kADE, PRESENCE_OPTIONAL),
- max_packet_size_(0, PRESENCE_OPTIONAL),
+ max_udp_payload_size_(0, PRESENCE_OPTIONAL),
max_datagram_frame_size_(0, PRESENCE_OPTIONAL),
active_connection_id_limit_(0, PRESENCE_OPTIONAL) {
SetDefaults();
@@ -543,17 +543,17 @@
QUIC_BUG << "Invalid idle network timeout " << idle_network_timeout;
return;
}
- idle_timeout_to_send_ = idle_network_timeout;
+ max_idle_timeout_to_send_ = idle_network_timeout;
}
QuicTime::Delta QuicConfig::IdleNetworkTimeout() const {
// TODO(b/152032210) add a QUIC_BUG to ensure that is not called before we've
// received the peer's values. This is true in production code but not in all
// of our tests that use a fake QuicConfig.
- if (!received_idle_timeout_.has_value()) {
- return idle_timeout_to_send_;
+ if (!received_max_idle_timeout_.has_value()) {
+ return max_idle_timeout_to_send_;
}
- return received_idle_timeout_.value();
+ return received_max_idle_timeout_.value();
}
void QuicConfig::SetMaxBidirectionalStreamsToSend(uint32_t max_streams) {
@@ -620,20 +620,20 @@
return ack_delay_exponent_.GetReceivedValue();
}
-void QuicConfig::SetMaxPacketSizeToSend(uint64_t max_packet_size) {
- max_packet_size_.SetSendValue(max_packet_size);
+void QuicConfig::SetMaxPacketSizeToSend(uint64_t max_udp_payload_size) {
+ max_udp_payload_size_.SetSendValue(max_udp_payload_size);
}
uint64_t QuicConfig::GetMaxPacketSizeToSend() const {
- return max_packet_size_.GetSendValue();
+ return max_udp_payload_size_.GetSendValue();
}
bool QuicConfig::HasReceivedMaxPacketSize() const {
- return max_packet_size_.HasReceivedValue();
+ return max_udp_payload_size_.HasReceivedValue();
}
uint64_t QuicConfig::ReceivedMaxPacketSize() const {
- return max_packet_size_.GetReceivedValue();
+ return max_udp_payload_size_.GetReceivedValue();
}
void QuicConfig::SetMaxDatagramFrameSizeToSend(
@@ -871,12 +871,13 @@
}
void QuicConfig::SetOriginalConnectionIdToSend(
- const QuicConnectionId& original_connection_id) {
- original_connection_id_to_send_ = original_connection_id;
+ const QuicConnectionId& original_destination_connection_id) {
+ original_destination_connection_id_to_send_ =
+ original_destination_connection_id;
}
bool QuicConfig::HasReceivedOriginalConnectionId() const {
- return received_original_connection_id_.has_value();
+ return received_original_destination_connection_id_.has_value();
}
QuicConnectionId QuicConfig::ReceivedOriginalConnectionId() const {
@@ -884,7 +885,7 @@
QUIC_BUG << "No received original connection ID";
return EmptyQuicConnectionId();
}
- return received_original_connection_id_.value();
+ return received_original_destination_connection_id_.value();
}
void QuicConfig::SetStatelessResetTokenToSend(
@@ -938,14 +939,16 @@
// the one received. Additionally, when QUIC_CRYPTO is used, the server
// MUST send an idle timeout no greater than the idle timeout it received
// from the client. We therefore send the received value if it is lower.
- QuicFixedUint32 idle_timeout_seconds(kICSL, PRESENCE_REQUIRED);
- uint32_t idle_timeout_to_send_seconds = idle_timeout_to_send_.ToSeconds();
- if (received_idle_timeout_.has_value() &&
- received_idle_timeout_->ToSeconds() < idle_timeout_to_send_seconds) {
- idle_timeout_to_send_seconds = received_idle_timeout_->ToSeconds();
+ QuicFixedUint32 max_idle_timeout_seconds(kICSL, PRESENCE_REQUIRED);
+ uint32_t max_idle_timeout_to_send_seconds =
+ max_idle_timeout_to_send_.ToSeconds();
+ if (received_max_idle_timeout_.has_value() &&
+ received_max_idle_timeout_->ToSeconds() <
+ max_idle_timeout_to_send_seconds) {
+ max_idle_timeout_to_send_seconds = received_max_idle_timeout_->ToSeconds();
}
- idle_timeout_seconds.SetSendValue(idle_timeout_to_send_seconds);
- idle_timeout_seconds.ToHandshakeMessage(out);
+ max_idle_timeout_seconds.SetSendValue(max_idle_timeout_to_send_seconds);
+ max_idle_timeout_seconds.ToHandshakeMessage(out);
// Do not need a version check here, max...bi... will encode
// as "MIDS" -- the max initial dynamic streams tag -- if
@@ -986,12 +989,12 @@
// the one received. Additionally, when QUIC_CRYPTO is used, the server
// MUST send an idle timeout no greater than the idle timeout it received
// from the client.
- QuicFixedUint32 idle_timeout_seconds(kICSL, PRESENCE_REQUIRED);
- error = idle_timeout_seconds.ProcessPeerHello(peer_hello, hello_type,
- error_details);
+ QuicFixedUint32 max_idle_timeout_seconds(kICSL, PRESENCE_REQUIRED);
+ error = max_idle_timeout_seconds.ProcessPeerHello(peer_hello, hello_type,
+ error_details);
if (error == QUIC_NO_ERROR) {
- if (idle_timeout_seconds.GetReceivedValue() >
- idle_timeout_to_send_.ToSeconds()) {
+ if (max_idle_timeout_seconds.GetReceivedValue() >
+ max_idle_timeout_to_send_.ToSeconds()) {
// The received value is higher than ours, ignore it if from the client
// and raise an error if from the server.
if (hello_type == SERVER) {
@@ -1000,8 +1003,8 @@
"Invalid value received for " + QuicTagToString(kICSL);
}
} else {
- received_idle_timeout_ = QuicTime::Delta::FromSeconds(
- idle_timeout_seconds.GetReceivedValue());
+ received_max_idle_timeout_ = QuicTime::Delta::FromSeconds(
+ max_idle_timeout_seconds.GetReceivedValue());
}
}
}
@@ -1073,12 +1076,13 @@
}
bool QuicConfig::FillTransportParameters(TransportParameters* params) const {
- if (original_connection_id_to_send_.has_value()) {
- params->original_connection_id = original_connection_id_to_send_.value();
+ if (original_destination_connection_id_to_send_.has_value()) {
+ params->original_destination_connection_id =
+ original_destination_connection_id_to_send_.value();
}
- params->idle_timeout_milliseconds.set_value(
- idle_timeout_to_send_.ToMilliseconds());
+ params->max_idle_timeout_ms.set_value(
+ max_idle_timeout_to_send_.ToMilliseconds());
if (stateless_reset_token_.HasSendValue()) {
QuicUint128 stateless_reset_token = stateless_reset_token_.GetSendValue();
@@ -1088,7 +1092,7 @@
sizeof(stateless_reset_token));
}
- params->max_packet_size.set_value(GetMaxPacketSizeToSend());
+ params->max_udp_payload_size.set_value(GetMaxPacketSizeToSend());
params->max_datagram_frame_size.set_value(GetMaxDatagramFrameSizeToSend());
params->initial_max_data.set_value(
GetInitialSessionFlowControlWindowToSend());
@@ -1113,7 +1117,7 @@
params->max_ack_delay.set_value(GetMaxAckDelayToSendMs());
}
params->ack_delay_exponent.set_value(GetAckDelayExponentToSend());
- params->disable_migration =
+ params->disable_active_migration =
connection_migration_disabled_.HasSendValue() &&
connection_migration_disabled_.GetSendValue() != 0;
@@ -1171,18 +1175,19 @@
HelloType hello_type,
bool is_resumption,
std::string* error_details) {
- if (!is_resumption && params.original_connection_id.has_value()) {
- received_original_connection_id_ = params.original_connection_id.value();
+ if (!is_resumption && params.original_destination_connection_id.has_value()) {
+ received_original_destination_connection_id_ =
+ params.original_destination_connection_id.value();
}
- if (params.idle_timeout_milliseconds.value() > 0 &&
- params.idle_timeout_milliseconds.value() <
- static_cast<uint64_t>(idle_timeout_to_send_.ToMilliseconds())) {
+ if (params.max_idle_timeout_ms.value() > 0 &&
+ params.max_idle_timeout_ms.value() <
+ static_cast<uint64_t>(max_idle_timeout_to_send_.ToMilliseconds())) {
// An idle timeout of zero indicates it is disabled.
// We also ignore values higher than ours which will cause us to use the
// smallest value between ours and our peer's.
- received_idle_timeout_ = QuicTime::Delta::FromMilliseconds(
- params.idle_timeout_milliseconds.value());
+ received_max_idle_timeout_ =
+ QuicTime::Delta::FromMilliseconds(params.max_idle_timeout_ms.value());
}
if (!is_resumption && !params.stateless_reset_token.empty()) {
@@ -1198,8 +1203,8 @@
stateless_reset_token_.SetReceivedValue(stateless_reset_token);
}
- if (params.max_packet_size.IsValid()) {
- max_packet_size_.SetReceivedValue(params.max_packet_size.value());
+ if (params.max_udp_payload_size.IsValid()) {
+ max_udp_payload_size_.SetReceivedValue(params.max_udp_payload_size.value());
}
if (params.max_datagram_frame_size.IsValid()) {
@@ -1252,7 +1257,7 @@
}
}
- if (params.disable_migration) {
+ if (params.disable_active_migration) {
connection_migration_disabled_.SetReceivedValue(1u);
}
diff --git a/quic/core/quic_config.h b/quic/core/quic_config.h
index 6809c28..b7206c3 100644
--- a/quic/core/quic_config.h
+++ b/quic/core/quic_config.h
@@ -394,9 +394,9 @@
bool HasReceivedIPv4AlternateServerAddress() const;
const QuicSocketAddress& ReceivedIPv4AlternateServerAddress() const;
- // Original connection ID.
+ // Original destination connection ID.
void SetOriginalConnectionIdToSend(
- const QuicConnectionId& original_connection_id);
+ const QuicConnectionId& original_destination_connection_id);
bool HasReceivedOriginalConnectionId() const;
QuicConnectionId ReceivedOriginalConnectionId() const;
@@ -420,8 +420,8 @@
bool HasReceivedAckDelayExponent() const;
uint32_t ReceivedAckDelayExponent() const;
- // IETF QUIC max_packet_size transport parameter.
- void SetMaxPacketSizeToSend(uint64_t max_packet_size);
+ // IETF QUIC max_udp_payload_size transport parameter.
+ void SetMaxPacketSizeToSend(uint64_t max_udp_payload_size);
uint64_t GetMaxPacketSizeToSend() const;
bool HasReceivedMaxPacketSize() const;
uint64_t ReceivedMaxPacketSize() const;
@@ -501,12 +501,12 @@
QuicFixedTagVector connection_options_;
// Connection options which only affect the client side.
QuicFixedTagVector client_connection_options_;
- // Idle network timeout.
+ // Maximum idle network timeout.
// Uses the max_idle_timeout transport parameter in IETF QUIC.
- // Note that received_idle_timeout_ is only populated if we receive the
+ // Note that received_max_idle_timeout_ is only populated if we receive the
// peer's value, which isn't guaranteed in IETF QUIC as sending is optional.
- QuicTime::Delta idle_timeout_to_send_;
- quiche::QuicheOptional<QuicTime::Delta> received_idle_timeout_;
+ QuicTime::Delta max_idle_timeout_to_send_;
+ quiche::QuicheOptional<QuicTime::Delta> received_max_idle_timeout_;
// Maximum number of dynamic streams that a Google QUIC connection
// can support or the maximum number of bidirectional streams that
// an IETF QUIC connection can support.
@@ -583,8 +583,8 @@
QuicFixedUint32 ack_delay_exponent_;
// Maximum packet size in bytes.
- // Uses the max_packet_size transport parameter in IETF QUIC.
- QuicFixedUint62 max_packet_size_;
+ // Uses the max_udp_payload_size transport parameter in IETF QUIC.
+ QuicFixedUint62 max_udp_payload_size_;
// Maximum DATAGRAM/MESSAGE frame size in bytes.
// Uses the max_datagram_frame_size transport parameter in IETF QUIC.
@@ -595,9 +595,12 @@
QuicFixedUint62 active_connection_id_limit_;
// Sent by the server when it has previously sent a RETRY packet.
- // Uses the original_connection_id transport parameter in IETF QUIC.
- quiche::QuicheOptional<QuicConnectionId> original_connection_id_to_send_;
- quiche::QuicheOptional<QuicConnectionId> received_original_connection_id_;
+ // Uses the original_destination_connection_id transport parameter in
+ // IETF QUIC.
+ quiche::QuicheOptional<QuicConnectionId>
+ original_destination_connection_id_to_send_;
+ quiche::QuicheOptional<QuicConnectionId>
+ received_original_destination_connection_id_;
// Custom transport parameters that can be sent and received in the TLS
// handshake.
diff --git a/quic/core/quic_config_test.cc b/quic/core/quic_config_test.cc
index 4aa10ef..6d29cc9 100644
--- a/quic/core/quic_config_test.cc
+++ b/quic/core/quic_config_test.cc
@@ -442,7 +442,7 @@
// Since the received value is above ours, we should then use ours.
config_.SetIdleNetworkTimeout(quic::QuicTime::Delta::FromSeconds(60));
TransportParameters params;
- params.idle_timeout_milliseconds.set_value(120000);
+ params.max_idle_timeout_ms.set_value(120000);
std::string error_details = "foobar";
EXPECT_THAT(config_.ProcessTransportParameters(
@@ -479,9 +479,9 @@
params.initial_max_stream_data_uni.value());
EXPECT_EQ(static_cast<uint64_t>(kMaximumIdleTimeoutSecs * 1000),
- params.idle_timeout_milliseconds.value());
+ params.max_idle_timeout_ms.value());
- EXPECT_EQ(kMaxPacketSizeForTest, params.max_packet_size.value());
+ EXPECT_EQ(kMaxPacketSizeForTest, params.max_udp_payload_size.value());
EXPECT_EQ(kMaxDatagramFrameSizeForTest,
params.max_datagram_frame_size.value());
EXPECT_EQ(kFakeActiveConnectionIdLimit,
@@ -502,7 +502,7 @@
3 * kMinimumFlowControlSendWindow);
params.initial_max_stream_data_uni.set_value(4 *
kMinimumFlowControlSendWindow);
- params.max_packet_size.set_value(kMaxPacketSizeForTest);
+ params.max_udp_payload_size.set_value(kMaxPacketSizeForTest);
params.max_datagram_frame_size.set_value(kMaxDatagramFrameSizeForTest);
params.initial_max_streams_bidi.set_value(kDefaultMaxStreamsPerConnection);
params.stateless_reset_token = CreateFakeStatelessResetToken();
@@ -559,11 +559,11 @@
4 * kMinimumFlowControlSendWindow);
params.initial_max_stream_data_uni.set_value(5 *
kMinimumFlowControlSendWindow);
- params.max_packet_size.set_value(2 * kMaxPacketSizeForTest);
+ params.max_udp_payload_size.set_value(2 * kMaxPacketSizeForTest);
params.max_datagram_frame_size.set_value(2 * kMaxDatagramFrameSizeForTest);
params.initial_max_streams_bidi.set_value(2 *
kDefaultMaxStreamsPerConnection);
- params.disable_migration = true;
+ params.disable_active_migration = true;
EXPECT_THAT(config_.ProcessTransportParameters(
params, SERVER, /* is_resumption = */ false, &error_details),
@@ -617,7 +617,7 @@
return;
}
TransportParameters params;
- params.disable_migration = true;
+ params.disable_active_migration = true;
std::string error_details;
EXPECT_THAT(config_.ProcessTransportParameters(
params, SERVER, /* is_resumption = */ false, &error_details),
diff --git a/quic/test_tools/quic_config_peer.cc b/quic/test_tools/quic_config_peer.cc
index 3e75215..78904c4 100644
--- a/quic/test_tools/quic_config_peer.cc
+++ b/quic/test_tools/quic_config_peer.cc
@@ -94,8 +94,8 @@
// static
void QuicConfigPeer::SetReceivedMaxPacketSize(QuicConfig* config,
- uint32_t max_packet_size) {
- config->max_packet_size_.SetReceivedValue(max_packet_size);
+ uint32_t max_udp_payload_size) {
+ config->max_udp_payload_size_.SetReceivedValue(max_udp_payload_size);
}
// static
@@ -106,8 +106,9 @@
// static
void QuicConfigPeer::SetReceivedOriginalConnectionId(
QuicConfig* config,
- const QuicConnectionId& original_connection_id) {
- config->received_original_connection_id_ = original_connection_id;
+ const QuicConnectionId& original_destination_connection_id) {
+ config->received_original_destination_connection_id_ =
+ original_destination_connection_id;
}
// static
diff --git a/quic/test_tools/quic_config_peer.h b/quic/test_tools/quic_config_peer.h
index c435f22..e72c429 100644
--- a/quic/test_tools/quic_config_peer.h
+++ b/quic/test_tools/quic_config_peer.h
@@ -58,13 +58,13 @@
QuicUint128 token);
static void SetReceivedMaxPacketSize(QuicConfig* config,
- uint32_t max_packet_size);
+ uint32_t max_udp_payload_size);
static void SetNegotiated(QuicConfig* config, bool negotiated);
static void SetReceivedOriginalConnectionId(
QuicConfig* config,
- const QuicConnectionId& original_connection_id);
+ const QuicConnectionId& original_destination_connection_id);
static void SetReceivedMaxDatagramFrameSize(QuicConfig* config,
uint64_t max_datagram_frame_size);
