Remove unused TPCC QuicTag and rename the variables * kORBT -> kOBIT * kMIBS -> kMIDS to match their on-the-wire value. PiperOrigin-RevId: 695949206
diff --git a/quiche/quic/core/crypto/crypto_handshake_message.cc b/quiche/quic/core/crypto/crypto_handshake_message.cc index eeb0215..6ec7aed 100644 --- a/quiche/quic/core/crypto/crypto_handshake_message.cc +++ b/quiche/quic/core/crypto/crypto_handshake_message.cc
@@ -273,7 +273,7 @@ case kSFCW: case kIRTT: case kMIUS: - case kMIBS: + case kMIDS: case kTCID: case kMAD: // uint32_t value
diff --git a/quiche/quic/core/crypto/crypto_protocol.h b/quiche/quic/core/crypto/crypto_protocol.h index c9f697f..5b3cdfb 100644 --- a/quiche/quic/core/crypto/crypto_protocol.h +++ b/quiche/quic/core/crypto/crypto_protocol.h
@@ -31,7 +31,7 @@ // "QNZR", "B2HI", "H2PR", "FIFO", "LIFO", "RRWS", "QNSP", "B2CL", "CHSP", // "BPTE", "ACKD", "AKD2", "AKD4", "MAD1", "MAD4", "MAD5", "ACD0", "ACKQ", // "TLPR", "CCS\0", "PDP4", "NCHP", "NBPE", "2RTO", "3RTO", "4RTO", "6RTO", -// "PDP1", "PDP2", "PDP3", "PDP5", "QLVE", "RVCM", "BBPD" +// "PDP1", "PDP2", "PDP3", "PDP5", "QLVE", "RVCM", "BBPD", "TPC\0" // clang-format off const QuicTag kCHLO = TAG('C', 'H', 'L', 'O'); // Client hello @@ -129,8 +129,6 @@ // PROBE_UP if ever inflight_hi // limited in round const QuicTag kRENO = TAG('R', 'E', 'N', 'O'); // Reno Congestion Control -const QuicTag kTPCC = TAG('P', 'C', 'C', '\0'); // Performance-Oriented - // Congestion Control const QuicTag kBYTE = TAG('B', 'Y', 'T', 'E'); // TCP cubic or reno in bytes const QuicTag kIW03 = TAG('I', 'W', '0', '3'); // Force ICWND to 3 const QuicTag kIW10 = TAG('I', 'W', '1', '0'); // Force ICWND to 10 @@ -389,7 +387,7 @@ const QuicTag kCOPT = TAG('C', 'O', 'P', 'T'); // Connection options const QuicTag kCLOP = TAG('C', 'L', 'O', 'P'); // Client connection options const QuicTag kICSL = TAG('I', 'C', 'S', 'L'); // Idle network timeout -const QuicTag kMIBS = TAG('M', 'I', 'D', 'S'); // Max incoming bidi streams +const QuicTag kMIDS = TAG('M', 'I', 'D', 'S'); // Max incoming bidi streams const QuicTag kMIUS = TAG('M', 'I', 'U', 'S'); // Max incoming unidi streams const QuicTag kADE = TAG('A', 'D', 'E', 0); // Ack Delay Exponent (IETF // QUIC ACK Frame Only). @@ -401,7 +399,7 @@ // indication const QuicTag kPUBS = TAG('P', 'U', 'B', 'S'); // Public key values const QuicTag kSCID = TAG('S', 'C', 'I', 'D'); // Server config id -const QuicTag kORBT = TAG('O', 'B', 'I', 'T'); // Server orbit. +const QuicTag kOBIT = TAG('O', 'B', 'I', 'T'); // Server orbit. const QuicTag kPDMD = TAG('P', 'D', 'M', 'D'); // Proof demand. const QuicTag kPROF = TAG('P', 'R', 'O', 'F'); // Proof (signature). const QuicTag kCCRT = TAG('C', 'C', 'R', 'T'); // Cached certificate
diff --git a/quiche/quic/core/crypto/crypto_server_test.cc b/quiche/quic/core/crypto/crypto_server_test.cc index e987190..1bcd97c 100644 --- a/quiche/quic/core/crypto/crypto_server_test.cc +++ b/quiche/quic/core/crypto/crypto_server_test.cc
@@ -125,7 +125,7 @@ config_.AddConfig(primary_config, clock_.WallNow())); absl::string_view orbit; - QUICHE_CHECK(msg->GetStringPiece(kORBT, &orbit)); + QUICHE_CHECK(msg->GetStringPiece(kOBIT, &orbit)); QUICHE_CHECK_EQ(sizeof(orbit_), orbit.size()); memcpy(orbit_, orbit.data(), orbit.size());
diff --git a/quiche/quic/core/crypto/quic_crypto_client_config.cc b/quiche/quic/core/crypto/quic_crypto_client_config.cc index 3a3670b..773f92e 100644 --- a/quiche/quic/core/crypto/quic_crypto_client_config.cc +++ b/quiche/quic/core/crypto/quic_crypto_client_config.cc
@@ -515,7 +515,7 @@ } absl::string_view orbit; - if (!scfg->GetStringPiece(kORBT, &orbit) || orbit.size() != kOrbitSize) { + if (!scfg->GetStringPiece(kOBIT, &orbit) || orbit.size() != kOrbitSize) { *error_details = "SCFG missing OBIT"; return QUIC_CRYPTO_MESSAGE_PARAMETER_NOT_FOUND; }
diff --git a/quiche/quic/core/crypto/quic_crypto_server_config.cc b/quiche/quic/core/crypto/quic_crypto_server_config.cc index 4115f2e..6c8d52b 100644 --- a/quiche/quic/core/crypto/quic_crypto_server_config.cc +++ b/quiche/quic/core/crypto/quic_crypto_server_config.cc
@@ -374,7 +374,7 @@ QUICHE_DCHECK(options.orbit.empty()); rand->RandBytes(orbit_bytes, sizeof(orbit_bytes)); } - msg.SetStringPiece(kORBT, + msg.SetStringPiece(kOBIT, absl::string_view(orbit_bytes, sizeof(orbit_bytes))); if (options.channel_id_enabled) { @@ -1630,8 +1630,8 @@ } absl::string_view orbit; - if (!msg->GetStringPiece(kORBT, &orbit)) { - QUIC_LOG(WARNING) << "Server config message is missing ORBT"; + if (!msg->GetStringPiece(kOBIT, &orbit)) { + QUIC_LOG(WARNING) << "Server config message is missing OBIT"; return nullptr; }
diff --git a/quiche/quic/core/quic_config.cc b/quiche/quic/core/quic_config.cc index 308d2d9..23fb83a 100644 --- a/quiche/quic/core/quic_config.cc +++ b/quiche/quic/core/quic_config.cc
@@ -430,7 +430,7 @@ connection_options_(kCOPT, PRESENCE_OPTIONAL), client_connection_options_(kCLOP, PRESENCE_OPTIONAL), max_idle_timeout_to_send_(QuicTime::Delta::Infinite()), - max_bidirectional_streams_(kMIBS, PRESENCE_REQUIRED), + max_bidirectional_streams_(kMIDS, PRESENCE_REQUIRED), max_unidirectional_streams_(kMIUS, PRESENCE_OPTIONAL), bytes_for_connection_id_(kTCID, PRESENCE_OPTIONAL), initial_round_trip_time_us_(kIRTT, PRESENCE_OPTIONAL),
diff --git a/quiche/quic/core/quic_config_test.cc b/quiche/quic/core/quic_config_test.cc index 24a2ec1..e6324f8 100644 --- a/quiche/quic/core/quic_config_test.cc +++ b/quiche/quic/core/quic_config_test.cc
@@ -244,7 +244,7 @@ // Set all REQUIRED tags. msg.SetValue(kICSL, 1); - msg.SetValue(kMIBS, 1); + msg.SetValue(kMIDS, 1); // No error, as rest are optional. std::string error_details; @@ -263,7 +263,7 @@ // Set all REQUIRED tags. msg.SetValue(kICSL, 1); - msg.SetValue(kMIBS, 1); + msg.SetValue(kMIDS, 1); // No error, as rest are optional. std::string error_details;
diff --git a/quiche/quic/test_tools/crypto_test_utils.cc b/quiche/quic/test_tools/crypto_test_utils.cc index e3963c4..0beaa8e 100644 --- a/quiche/quic/test_tools/crypto_test_utils.cc +++ b/quiche/quic/test_tools/crypto_test_utils.cc
@@ -863,7 +863,7 @@ std::unique_ptr<CryptoHandshakeMessage> msg = crypto_config->AddConfig(primary_config, clock->WallNow()); absl::string_view orbit; - QUICHE_CHECK(msg->GetStringPiece(kORBT, &orbit)); + QUICHE_CHECK(msg->GetStringPiece(kOBIT, &orbit)); std::string nonce; CryptoUtils::GenerateNonce(clock->WallNow(), QuicRandom::GetInstance(), orbit, &nonce);
diff --git a/quiche/quic/test_tools/crypto_test_utils_test.cc b/quiche/quic/test_tools/crypto_test_utils_test.cc index 1c78944..1127f88 100644 --- a/quiche/quic/test_tools/crypto_test_utils_test.cc +++ b/quiche/quic/test_tools/crypto_test_utils_test.cc
@@ -149,7 +149,7 @@ std::unique_ptr<CryptoHandshakeMessage> msg = crypto_config.AddConfig(primary_config, clock.WallNow()); absl::string_view orbit; - ASSERT_TRUE(msg->GetStringPiece(kORBT, &orbit)); + ASSERT_TRUE(msg->GetStringPiece(kOBIT, &orbit)); std::string nonce; CryptoUtils::GenerateNonce(clock.WallNow(), QuicRandom::GetInstance(), orbit, &nonce);
diff --git a/quiche/quic/test_tools/simulator/quic_endpoint.cc b/quiche/quic/test_tools/simulator/quic_endpoint.cc index 1d26383..13d9304 100644 --- a/quiche/quic/test_tools/simulator/quic_endpoint.cc +++ b/quiche/quic/test_tools/simulator/quic_endpoint.cc
@@ -74,7 +74,7 @@ CryptoHandshakeMessage peer_hello; peer_hello.SetValue(kICSL, static_cast<uint32_t>(kMaximumIdleTimeoutSecs - 1)); - peer_hello.SetValue(kMIBS, + peer_hello.SetValue(kMIDS, static_cast<uint32_t>(kDefaultMaxStreamsPerConnection)); QuicConfig config; QuicErrorCode error_code = config.ProcessPeerHello(