Remove QuicIetfStatelessResetPacket, because it was never being used. PiperOrigin-RevId: 918432081
diff --git a/quiche/quic/core/chlo_extractor.cc b/quiche/quic/core/chlo_extractor.cc index c50c7bd..7a9689b 100644 --- a/quiche/quic/core/chlo_extractor.cc +++ b/quiche/quic/core/chlo_extractor.cc
@@ -89,8 +89,7 @@ void OnPacketComplete() override {} bool IsValidStatelessResetToken( const StatelessResetToken& token) const override; - void OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& /*packet*/) override {} + void OnAuthenticatedIetfStatelessResetPacket() override {} void OnKeyUpdate(KeyUpdateReason /*reason*/) override; void OnDecryptedFirstPacketInKeyPhase() override; void OnSconePacket(uint8_t /*signal*/) override {}
diff --git a/quiche/quic/core/quic_connection.cc b/quiche/quic/core/quic_connection.cc index a7edde6..11f2088 100644 --- a/quiche/quic/core/quic_connection.cc +++ b/quiche/quic/core/quic_connection.cc
@@ -2415,8 +2415,7 @@ } } -void QuicConnection::OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& /*packet*/) { +void QuicConnection::OnAuthenticatedIetfStatelessResetPacket() { // TODO(fayang): Add OnAuthenticatedIetfStatelessResetPacket to // debug_visitor_. QUICHE_DCHECK_EQ(perspective_, Perspective::IS_CLIENT);
diff --git a/quiche/quic/core/quic_connection.h b/quiche/quic/core/quic_connection.h index 12fdafc..b01c79a 100644 --- a/quiche/quic/core/quic_connection.h +++ b/quiche/quic/core/quic_connection.h
@@ -800,8 +800,7 @@ void OnPacketComplete() override; bool IsValidStatelessResetToken( const StatelessResetToken& token) const override; - void OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& packet) override; + void OnAuthenticatedIetfStatelessResetPacket() override; void OnKeyUpdate(KeyUpdateReason reason) override; void OnDecryptedFirstPacketInKeyPhase() override; void OnSconePacket(uint8_t signal) override;
diff --git a/quiche/quic/core/quic_framer.cc b/quiche/quic/core/quic_framer.cc index e2c9f6e..79931e8 100644 --- a/quiche/quic/core/quic_framer.cc +++ b/quiche/quic/core/quic_framer.cc
@@ -1818,10 +1818,7 @@ if (hp_removal_failed || !IsValidFullPacketNumber(full_packet_number, version())) { if (IsIetfStatelessResetPacket(*header)) { - // This is a stateless reset packet. - QuicIetfStatelessResetPacket reset_packet( - *header, header->possible_stateless_reset_token); - visitor_->OnAuthenticatedIetfStatelessResetPacket(reset_packet); + visitor_->OnAuthenticatedIetfStatelessResetPacket(); return true; } if (hp_removal_failed) { @@ -1886,10 +1883,7 @@ decrypted_buffer, buffer_length, &decrypted_length, &decrypted_level)) { if (IsIetfStatelessResetPacket(*header)) { - // This is a stateless reset packet. - QuicIetfStatelessResetPacket reset_packet( - *header, header->possible_stateless_reset_token); - visitor_->OnAuthenticatedIetfStatelessResetPacket(reset_packet); + visitor_->OnAuthenticatedIetfStatelessResetPacket(); return true; } const EncryptionLevel decryption_level = GetEncryptionLevel(*header);
diff --git a/quiche/quic/core/quic_framer.h b/quiche/quic/core/quic_framer.h index 0726d7f..d614bae 100644 --- a/quiche/quic/core/quic_framer.h +++ b/quiche/quic/core/quic_framer.h
@@ -242,8 +242,7 @@ // Called when an IETF stateless reset packet has been parsed and validated // with the stateless reset token. - virtual void OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& packet) = 0; + virtual void OnAuthenticatedIetfStatelessResetPacket() = 0; // Called when an IETF MaxStreams frame has been parsed. virtual bool OnMaxStreamsFrame(const QuicMaxStreamsFrame& frame) = 0;
diff --git a/quiche/quic/core/quic_framer_test.cc b/quiche/quic/core/quic_framer_test.cc index 96530d5..3d3ae5d 100644 --- a/quiche/quic/core/quic_framer_test.cc +++ b/quiche/quic/core/quic_framer_test.cc
@@ -611,10 +611,7 @@ return token == kTestStatelessResetToken; } - void OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& packet) override { - stateless_reset_packet_ = - std::make_unique<QuicIetfStatelessResetPacket>(packet); + void OnAuthenticatedIetfStatelessResetPacket() override { EXPECT_EQ(0u, framer_->current_received_frame_type()); } @@ -657,7 +654,6 @@ bool accept_public_header_; std::unique_ptr<QuicPacketHeader> header_; - std::unique_ptr<QuicIetfStatelessResetPacket> stateless_reset_packet_; std::unique_ptr<QuicVersionNegotiationPacket> version_negotiation_packet_; std::unique_ptr<QuicConnectionId> retry_original_connection_id_; std::unique_ptr<QuicConnectionId> retry_new_connection_id_; @@ -5287,9 +5283,6 @@ QuicEncryptedPacket encrypted(AsChars(packet), ABSL_ARRAYSIZE(packet), false); EXPECT_TRUE(framer_.ProcessPacket(encrypted)); ASSERT_THAT(framer_.error(), IsQuicNoError()); - ASSERT_TRUE(visitor_.stateless_reset_packet_.get()); - EXPECT_EQ(kTestStatelessResetToken, - visitor_.stateless_reset_packet_->stateless_reset_token); } TEST_P(QuicFramerTest, IetfStatelessResetPacketInvalidStatelessResetToken) { @@ -5325,7 +5318,6 @@ QuicEncryptedPacket encrypted(AsChars(packet), ABSL_ARRAYSIZE(packet), false); EXPECT_FALSE(framer_.ProcessPacket(encrypted)); EXPECT_THAT(framer_.error(), IsError(QUIC_DECRYPTION_FAILURE)); - ASSERT_FALSE(visitor_.stateless_reset_packet_); } TEST_P(QuicFramerTest, VersionNegotiationPacketClient) {
diff --git a/quiche/quic/core/quic_packets.cc b/quiche/quic/core/quic_packets.cc index 430a984..f59c5cc 100644 --- a/quiche/quic/core/quic_packets.cc +++ b/quiche/quic/core/quic_packets.cc
@@ -204,18 +204,6 @@ QuicVersionNegotiationPacket::~QuicVersionNegotiationPacket() {} -QuicIetfStatelessResetPacket::QuicIetfStatelessResetPacket() - : stateless_reset_token({}) {} - -QuicIetfStatelessResetPacket::QuicIetfStatelessResetPacket( - const QuicPacketHeader& header, StatelessResetToken token) - : header(header), stateless_reset_token(token) {} - -QuicIetfStatelessResetPacket::QuicIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& other) = default; - -QuicIetfStatelessResetPacket::~QuicIetfStatelessResetPacket() {} - std::ostream& operator<<(std::ostream& os, const QuicPacketHeader& header) { os << "{ destination_connection_id: " << header.destination_connection_id << " ("
diff --git a/quiche/quic/core/quic_packets.h b/quiche/quic/core/quic_packets.h index 9eb2041..ee1c27d 100644 --- a/quiche/quic/core/quic_packets.h +++ b/quiche/quic/core/quic_packets.h
@@ -207,17 +207,6 @@ ParsedQuicVersionVector versions; }; -struct QUICHE_EXPORT QuicIetfStatelessResetPacket { - QuicIetfStatelessResetPacket(); - QuicIetfStatelessResetPacket(const QuicPacketHeader& header, - StatelessResetToken token); - QuicIetfStatelessResetPacket(const QuicIetfStatelessResetPacket& other); - ~QuicIetfStatelessResetPacket(); - - QuicPacketHeader header; - StatelessResetToken stateless_reset_token; -}; - class QUICHE_EXPORT QuicData { public: // Creates a QuicData from a buffer and length. Does not own the buffer.
diff --git a/quiche/quic/core/quic_time_wait_list_manager_test.cc b/quiche/quic/core/quic_time_wait_list_manager_test.cc index 4012d0d..5646440 100644 --- a/quiche/quic/core/quic_time_wait_list_manager_test.cc +++ b/quiche/quic/core/quic_time_wait_list_manager_test.cc
@@ -63,17 +63,17 @@ return token == QuicUtils::GenerateStatelessResetToken(connection_id_); } - void OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& packet) override { - stateless_reset_packet_ = packet; + void OnAuthenticatedIetfStatelessResetPacket() override { + stateless_reset_token_ = + QuicUtils::GenerateStatelessResetToken(connection_id_); } - QuicIetfStatelessResetPacket stateless_reset_packet() { - return stateless_reset_packet_; + StatelessResetToken stateless_reset_token() const { + return stateless_reset_token_; } private: - QuicIetfStatelessResetPacket stateless_reset_packet_; + StatelessResetToken stateless_reset_token_; QuicConnectionId connection_id_; }; @@ -205,14 +205,10 @@ std::get<1>(packet_buffer)); framer.ProcessPacket(encrypted); - QuicIetfStatelessResetPacket stateless_reset = - visitor.stateless_reset_packet(); - StatelessResetToken expected_stateless_reset_token = QuicUtils::GenerateStatelessResetToken(expected_connection_id); - return stateless_reset.stateless_reset_token == - expected_stateless_reset_token; + return visitor.stateless_reset_token() == expected_stateless_reset_token; } Matcher<const std::tuple<const char*, int>> PublicResetPacketEq(
diff --git a/quiche/quic/core/tls_chlo_extractor.h b/quiche/quic/core/tls_chlo_extractor.h index 26f0cbc..bd988c2 100644 --- a/quiche/quic/core/tls_chlo_extractor.h +++ b/quiche/quic/core/tls_chlo_extractor.h
@@ -205,8 +205,7 @@ const StatelessResetToken& /*token*/) const override { return true; } - void OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& /*packet*/) override {} + void OnAuthenticatedIetfStatelessResetPacket() override {} void OnKeyUpdate(KeyUpdateReason /*reason*/) override {} void OnDecryptedFirstPacketInKeyPhase() override {} void OnSconePacket(uint8_t /*signal*/) override {}
diff --git a/quiche/quic/test_tools/quic_test_utils.h b/quiche/quic/test_tools/quic_test_utils.h index 3ecd487..b45bf97 100644 --- a/quiche/quic/test_tools/quic_test_utils.h +++ b/quiche/quic/test_tools/quic_test_utils.h
@@ -375,8 +375,7 @@ MOCK_METHOD(void, OnPacketComplete, (), (override)); MOCK_METHOD(bool, IsValidStatelessResetToken, (const StatelessResetToken&), (const, override)); - MOCK_METHOD(void, OnAuthenticatedIetfStatelessResetPacket, - (const QuicIetfStatelessResetPacket&), (override)); + MOCK_METHOD(void, OnAuthenticatedIetfStatelessResetPacket, (), (override)); MOCK_METHOD(void, OnKeyUpdate, (KeyUpdateReason), (override)); MOCK_METHOD(void, OnDecryptedFirstPacketInKeyPhase, (), (override)); MOCK_METHOD(void, OnSconePacket, (uint8_t), (override)); @@ -445,8 +444,7 @@ void OnPacketComplete() override {} bool IsValidStatelessResetToken( const StatelessResetToken& token) const override; - void OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& /*packet*/) override {} + void OnAuthenticatedIetfStatelessResetPacket() override {} void OnKeyUpdate(KeyUpdateReason /*reason*/) override {} void OnDecryptedFirstPacketInKeyPhase() override {} void OnSconePacket(uint8_t /*signal*/) override {}
diff --git a/quiche/quic/test_tools/simple_quic_framer.cc b/quiche/quic/test_tools/simple_quic_framer.cc index 329c8c8..9590ed8 100644 --- a/quiche/quic/test_tools/simple_quic_framer.cc +++ b/quiche/quic/test_tools/simple_quic_framer.cc
@@ -260,11 +260,7 @@ return false; } - void OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& packet) override { - stateless_reset_packet_ = - std::make_unique<QuicIetfStatelessResetPacket>(packet); - } + void OnAuthenticatedIetfStatelessResetPacket() override {} void OnKeyUpdate(KeyUpdateReason /*reason*/) override {} void OnDecryptedFirstPacketInKeyPhase() override {} @@ -333,7 +329,6 @@ bool has_header_; QuicPacketHeader header_; std::unique_ptr<QuicVersionNegotiationPacket> version_negotiation_packet_; - std::unique_ptr<QuicIetfStatelessResetPacket> stateless_reset_packet_; std::vector<QuicFrameType> frame_types_; std::vector<QuicAckFrame> ack_frames_; std::vector<QuicStopWaitingFrame> stop_waiting_frames_;
diff --git a/quiche/quic/tools/quic_packet_printer_bin.cc b/quiche/quic/tools/quic_packet_printer_bin.cc index 25fabb7..561c374 100644 --- a/quiche/quic/tools/quic_packet_printer_bin.cc +++ b/quiche/quic/tools/quic_packet_printer_bin.cc
@@ -230,8 +230,7 @@ std::cerr << "IsValidStatelessResetToken\n"; return false; } - void OnAuthenticatedIetfStatelessResetPacket( - const QuicIetfStatelessResetPacket& /*packet*/) override { + void OnAuthenticatedIetfStatelessResetPacket() override { std::cerr << "OnAuthenticatedIetfStatelessResetPacket\n"; } void OnKeyUpdate(KeyUpdateReason reason) override {