Move OnZeroRttRejected() debug event from HTTP layer to QUIC transport layer.
This gives a more general logging for other QUIC applications.
No behavior change.
PiperOrigin-RevId: 327055691
Change-Id: Ic2e566af30827d119bccb82a30cde2617e84c772
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index 9a9f445..3345fea 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -1419,13 +1419,6 @@
quiche::QuicheStrCat(type, " stream is received twice."));
}
-void QuicSpdySession::OnZeroRttRejected() {
- if (debug_visitor_ != nullptr) {
- debug_visitor_->OnZeroRttRejected();
- }
- QuicSession::OnZeroRttRejected();
-}
-
// static
void QuicSpdySession::LogHeaderCompressionRatioHistogram(
bool using_qpack,
diff --git a/quic/core/http/quic_spdy_session.h b/quic/core/http/quic_spdy_session.h
index 5c5758b..4c50e7f 100644
--- a/quic/core/http/quic_spdy_session.h
+++ b/quic/core/http/quic_spdy_session.h
@@ -133,7 +133,6 @@
// 0-RTT related events.
virtual void OnSettingsFrameResumed(const SettingsFrame& /*frame*/) {}
- virtual void OnZeroRttRejected() {}
};
// A QUIC session for HTTP.
@@ -391,9 +390,6 @@
// Decode SETTINGS from |cached_state| and apply it to the session.
bool ResumeApplicationState(ApplicationState* cached_state) override;
- // Let the debug visitor know that 0-RTT is rejected.
- void OnZeroRttRejected() override;
-
protected:
// Override CreateIncomingStream(), CreateOutgoingBidirectionalStream() and
// CreateOutgoingUnidirectionalStream() with QuicSpdyStream return type to
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 99c7957..11b5ad2 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -2450,6 +2450,9 @@
}
void QuicConnection::MarkZeroRttPacketsForRetransmission() {
+ if (debug_visitor_ != nullptr && version().UsesTls()) {
+ debug_visitor_->OnZeroRttRejected();
+ }
sent_packet_manager_.MarkZeroRttPacketsForRetransmission();
}
diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h
index 29c29a8..ba04b9f 100644
--- a/quic/core/quic_connection.h
+++ b/quic/core/quic_connection.h
@@ -359,6 +359,9 @@
// 0-RTT.
virtual void OnTransportParametersResumed(
const TransportParameters& /*transport_parameters*/) {}
+
+ // Called for QUIC+TLS versions when 0-RTT is rejected.
+ virtual void OnZeroRttRejected() {}
};
class QUIC_EXPORT_PRIVATE QuicConnectionHelperInterface {
