Remove unused member QuicFramer::last_serialized_server_connection_id_.
PiperOrigin-RevId: 769374804
diff --git a/quiche/quic/core/http/quic_spdy_client_session_test.cc b/quiche/quic/core/http/quic_spdy_client_session_test.cc
index 819584a..057f918 100644
--- a/quiche/quic/core/http/quic_spdy_client_session_test.cc
+++ b/quiche/quic/core/http/quic_spdy_client_session_test.cc
@@ -476,8 +476,6 @@
session_->ProcessUdpPacket(client_address, server_address, valid_packet);
// Verify that a non-decryptable packet doesn't close the connection.
- QuicFramerPeer::SetLastSerializedServerConnectionId(
- QuicConnectionPeer::GetFramer(connection_), connection_id);
ParsedQuicVersionVector versions = SupportedVersions(GetParam());
QuicConnectionId destination_connection_id = EmptyQuicConnectionId();
QuicConnectionId source_connection_id = connection_id;
@@ -519,8 +517,6 @@
QuicConnectionId destination_connection_id =
session_->connection()->connection_id();
QuicConnectionId source_connection_id = destination_connection_id;
- QuicFramerPeer::SetLastSerializedServerConnectionId(
- QuicConnectionPeer::GetFramer(connection_), destination_connection_id);
bool version_flag = true;
QuicConnectionIdIncluded scid_included = CONNECTION_ID_PRESENT;
std::unique_ptr<QuicEncryptedPacket> packet(ConstructMisFramedEncryptedPacket(
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index 915f65d..38a6389 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -654,8 +654,6 @@
peer_creator_.SetEncrypter(level,
std::make_unique<TaggingEncrypter>(level));
}
- QuicFramerPeer::SetLastSerializedServerConnectionId(
- QuicConnectionPeer::GetFramer(&connection_), connection_id_);
QuicFramerPeer::SetLastWrittenPacketNumberLength(
QuicConnectionPeer::GetFramer(&connection_), packet_number_length_);
QuicStreamId stream_id;
diff --git a/quiche/quic/core/quic_framer.cc b/quiche/quic/core/quic_framer.cc
index e01b1af..e99d996 100644
--- a/quiche/quic/core/quic_framer.cc
+++ b/quiche/quic/core/quic_framer.cc
@@ -399,7 +399,6 @@
uint8_t expected_server_connection_id_length)
: visitor_(nullptr),
error_(QUIC_NO_ERROR),
- last_serialized_server_connection_id_(EmptyQuicConnectionId()),
version_(ParsedQuicVersion::Unsupported()),
supported_versions_(supported_versions),
decrypter_level_(ENCRYPTION_INITIAL),
@@ -2054,8 +2053,6 @@
return false;
}
- last_serialized_server_connection_id_ = server_connection_id;
-
// TODO(b/141924462) Remove this QUIC_BUG once we do support sending RETRY.
QUIC_BUG_IF(quic_bug_12975_7,
header.version_flag && header.long_packet_type == RETRY)
diff --git a/quiche/quic/core/quic_framer.h b/quiche/quic/core/quic_framer.h
index 4b925aa..374b24b 100644
--- a/quiche/quic/core/quic_framer.h
+++ b/quiche/quic/core/quic_framer.h
@@ -1159,8 +1159,6 @@
// Largest successfully decrypted packet number per packet number space. Only
// used when supports_multiple_packet_number_spaces_ is true.
QuicPacketNumber largest_decrypted_packet_numbers_[NUM_PACKET_NUMBER_SPACES];
- // Last server connection ID seen on the wire.
- QuicConnectionId last_serialized_server_connection_id_;
// Version of the protocol being used.
ParsedQuicVersion version_;
// This vector contains QUIC versions which we currently support.
diff --git a/quiche/quic/core/quic_framer_test.cc b/quiche/quic/core/quic_framer_test.cc
index c8a79b3..337b6b8 100644
--- a/quiche/quic/core/quic_framer_test.cc
+++ b/quiche/quic/core/quic_framer_test.cc
@@ -1425,8 +1425,6 @@
return;
}
SetDecrypterLevel(ENCRYPTION_FORWARD_SECURE);
- QuicFramerPeer::SetLastSerializedServerConnectionId(&framer_,
- TestConnectionId(0x33));
QuicFramerPeer::SetPerspective(&framer_, Perspective::IS_CLIENT);
framer_.SetExpectedClientConnectionIdLength(kQuicDefaultConnectionIdLength);
// clang-format off
@@ -1483,8 +1481,6 @@
TEST_P(QuicFramerTest, PacketHeaderWith0ByteConnectionId) {
SetDecrypterLevel(ENCRYPTION_FORWARD_SECURE);
- QuicFramerPeer::SetLastSerializedServerConnectionId(&framer_,
- FramerTestConnectionId());
QuicFramerPeer::SetPerspective(&framer_, Perspective::IS_CLIENT);
// clang-format off
@@ -5088,8 +5084,6 @@
};
// clang-format on
QuicFramerPeer::SetPerspective(&framer_, Perspective::IS_CLIENT);
- QuicFramerPeer::SetLastSerializedServerConnectionId(&framer_,
- TestConnectionId(0x33));
decrypter_ = new test::TestDecrypter();
if (framer_.version().KnowsWhichDecrypterToUse()) {
framer_.InstallDecrypter(
@@ -5127,8 +5121,6 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
// clang-format on
- QuicFramerPeer::SetLastSerializedServerConnectionId(&framer_,
- TestConnectionId(0x33));
QuicFramerPeer::SetPerspective(&framer_, Perspective::IS_CLIENT);
decrypter_ = new test::TestDecrypter();
if (framer_.version().KnowsWhichDecrypterToUse()) {
diff --git a/quiche/quic/test_tools/crypto_test_utils.cc b/quiche/quic/test_tools/crypto_test_utils.cc
index 5b5d2cb..be20b68 100644
--- a/quiche/quic/test_tools/crypto_test_utils.cc
+++ b/quiche/quic/test_tools/crypto_test_utils.cc
@@ -105,13 +105,9 @@
QUICHE_CHECK(!packets.empty());
SimpleQuicFramer framer(source_conn.supported_versions(), dest_perspective);
- QuicFramerPeer::SetLastSerializedServerConnectionId(framer.framer(),
- TestConnectionId());
SimpleQuicFramer null_encryption_framer(source_conn.supported_versions(),
dest_perspective);
- QuicFramerPeer::SetLastSerializedServerConnectionId(
- null_encryption_framer.framer(), TestConnectionId());
for (const QuicEncryptedPacket* const packet : packets) {
if (!dest_conn.connected()) {
diff --git a/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc b/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc
index 9fff371..8caff25 100644
--- a/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc
+++ b/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc
@@ -201,10 +201,6 @@
receiver_perspective,
kQuicDefaultConnectionIdLength);
SetupFramer(&receiver_framer, &receiver_framer_visitor);
- if (receiver_perspective == Perspective::IS_CLIENT) {
- QuicFramerPeer::SetLastSerializedServerConnectionId(
- &receiver_framer, header.source_connection_id);
- }
std::array<char, kEthernetMTU> packet_buffer;
while (data_provider.remaining_bytes() > 16) {
diff --git a/quiche/quic/test_tools/quic_framer_peer.cc b/quiche/quic/test_tools/quic_framer_peer.cc
index 25e90a0..f9d361a 100644
--- a/quiche/quic/test_tools/quic_framer_peer.cc
+++ b/quiche/quic/test_tools/quic_framer_peer.cc
@@ -21,12 +21,6 @@
}
// static
-void QuicFramerPeer::SetLastSerializedServerConnectionId(
- QuicFramer* framer, QuicConnectionId server_connection_id) {
- framer->last_serialized_server_connection_id_ = server_connection_id;
-}
-
-// static
void QuicFramerPeer::SetLastWrittenPacketNumberLength(
QuicFramer* framer, size_t packet_number_length) {
framer->last_written_packet_number_length_ = packet_number_length;
diff --git a/quiche/quic/test_tools/quic_framer_peer.h b/quiche/quic/test_tools/quic_framer_peer.h
index 49df26a..9cbd7c7 100644
--- a/quiche/quic/test_tools/quic_framer_peer.h
+++ b/quiche/quic/test_tools/quic_framer_peer.h
@@ -20,8 +20,6 @@
static uint64_t CalculatePacketNumberFromWire(
QuicFramer* framer, QuicPacketNumberLength packet_number_length,
QuicPacketNumber last_packet_number, uint64_t packet_number);
- static void SetLastSerializedServerConnectionId(
- QuicFramer* framer, QuicConnectionId server_connection_id);
static void SetLastWrittenPacketNumberLength(QuicFramer* framer,
size_t packet_number_length);
static void SetLargestPacketNumber(QuicFramer* framer,
diff --git a/quiche/quic/test_tools/quic_test_utils.cc b/quiche/quic/test_tools/quic_test_utils.cc
index 2235653..47304be 100644
--- a/quiche/quic/test_tools/quic_test_utils.cc
+++ b/quiche/quic/test_tools/quic_test_utils.cc
@@ -1294,8 +1294,6 @@
framer_(SupportedVersions(version_),
QuicUtils::InvertPerspective(perspective)),
clock_(clock) {
- QuicFramerPeer::SetLastSerializedServerConnectionId(framer_.framer(),
- TestConnectionId());
framer_.framer()->SetInitialObfuscators(TestConnectionId());
for (int i = 0; i < 128; ++i) {