Modify push_promise related methods to prepare for H3 push promise.
WritePushPromise() now returns void as no caller uses the returned size.
OnPushPromiseFrameStart() now takes in the frame lengths so that the frame can be consumed properly.
gfe-relnote: no prod behavior change, not protected.
PiperOrigin-RevId: 259377914
Change-Id: Ic89cdd785acf216e7fa5715426bbac30bf9b6045
diff --git a/quic/core/http/http_decoder.cc b/quic/core/http/http_decoder.cc
index b1aba79..f8de083 100644
--- a/quic/core/http/http_decoder.cc
+++ b/quic/core/http/http_decoder.cc
@@ -225,7 +225,10 @@
return false;
}
remaining_frame_length_ -= bytes_remaining - reader->BytesRemaining();
- if (!visitor_->OnPushPromiseFrameStart(push_id)) {
+ if (!visitor_->OnPushPromiseFrameStart(
+ push_id, Http3FrameLengths(current_length_field_length_ +
+ current_type_field_length_,
+ current_frame_length_))) {
continue_processing = false;
break;
}
diff --git a/quic/core/http/http_decoder.h b/quic/core/http/http_decoder.h
index 16cc5d2..99c4d10 100644
--- a/quic/core/http/http_decoder.h
+++ b/quic/core/http/http_decoder.h
@@ -97,7 +97,8 @@
virtual bool OnHeadersFrameEnd() = 0;
// Called when a PUSH_PROMISE frame has been received for |push_id|.
- virtual bool OnPushPromiseFrameStart(PushId push_id) = 0;
+ virtual bool OnPushPromiseFrameStart(PushId push_id,
+ Http3FrameLengths frame_length) = 0;
// Called when part of the payload of a PUSH_PROMISE frame has been read.
// May be called multiple times for a single frame. |payload| is guaranteed
// to be non-empty.
diff --git a/quic/core/http/http_decoder_test.cc b/quic/core/http/http_decoder_test.cc
index cf32171..635268b 100644
--- a/quic/core/http/http_decoder_test.cc
+++ b/quic/core/http/http_decoder_test.cc
@@ -51,7 +51,8 @@
MOCK_METHOD1(OnHeadersFramePayload, bool(QuicStringPiece payload));
MOCK_METHOD0(OnHeadersFrameEnd, bool());
- MOCK_METHOD1(OnPushPromiseFrameStart, bool(PushId push_id));
+ MOCK_METHOD2(OnPushPromiseFrameStart,
+ bool(PushId push_id, Http3FrameLengths frame_lengths));
MOCK_METHOD1(OnPushPromiseFramePayload, bool(QuicStringPiece payload));
MOCK_METHOD0(OnPushPromiseFrameEnd, bool());
@@ -77,7 +78,8 @@
ON_CALL(visitor_, OnHeadersFrameStart(_)).WillByDefault(Return(true));
ON_CALL(visitor_, OnHeadersFramePayload(_)).WillByDefault(Return(true));
ON_CALL(visitor_, OnHeadersFrameEnd()).WillByDefault(Return(true));
- ON_CALL(visitor_, OnPushPromiseFrameStart(_)).WillByDefault(Return(true));
+ ON_CALL(visitor_, OnPushPromiseFrameStart(_, _))
+ .WillByDefault(Return(true));
ON_CALL(visitor_, OnPushPromiseFramePayload(_)).WillByDefault(Return(true));
ON_CALL(visitor_, OnPushPromiseFrameEnd()).WillByDefault(Return(true));
ON_CALL(visitor_, OnUnknownFrameStart(_, _)).WillByDefault(Return(true));
@@ -207,7 +209,8 @@
"Headers"; // Header Block
// Visitor pauses processing.
- EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1)).WillOnce(Return(false));
+ EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1, Http3FrameLengths(2, 8)))
+ .WillOnce(Return(false));
QuicStringPiece remaining_input(input);
QuicByteCount processed_bytes =
ProcessInputWithGarbageAppended(remaining_input);
@@ -225,7 +228,7 @@
EXPECT_EQ("", decoder_.error_detail());
// Process the full frame.
- EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1));
+ EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1, Http3FrameLengths(2, 8)));
EXPECT_CALL(visitor_, OnPushPromiseFramePayload(QuicStringPiece("Headers")));
EXPECT_CALL(visitor_, OnPushPromiseFrameEnd());
EXPECT_EQ(input.size(), ProcessInput(input));
@@ -233,7 +236,7 @@
EXPECT_EQ("", decoder_.error_detail());
// Process the frame incrementally.
- EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1));
+ EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1, Http3FrameLengths(2, 8)));
EXPECT_CALL(visitor_, OnPushPromiseFramePayload(QuicStringPiece("H")));
EXPECT_CALL(visitor_, OnPushPromiseFramePayload(QuicStringPiece("e")));
EXPECT_CALL(visitor_, OnPushPromiseFramePayload(QuicStringPiece("a")));
@@ -714,7 +717,8 @@
"\x01"; // Push Id
// Visitor pauses processing.
- EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1)).WillOnce(Return(false));
+ EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1, Http3FrameLengths(2, 1)))
+ .WillOnce(Return(false));
EXPECT_EQ(input.size(), ProcessInputWithGarbageAppended(input));
EXPECT_CALL(visitor_, OnPushPromiseFrameEnd()).WillOnce(Return(false));
@@ -723,14 +727,14 @@
EXPECT_EQ("", decoder_.error_detail());
// Process the full frame.
- EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1));
+ EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1, Http3FrameLengths(2, 1)));
EXPECT_CALL(visitor_, OnPushPromiseFrameEnd());
EXPECT_EQ(input.size(), ProcessInput(input));
EXPECT_EQ(QUIC_NO_ERROR, decoder_.error());
EXPECT_EQ("", decoder_.error_detail());
// Process the frame incrementally.
- EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1));
+ EXPECT_CALL(visitor_, OnPushPromiseFrameStart(1, Http3FrameLengths(2, 1)));
EXPECT_CALL(visitor_, OnPushPromiseFrameEnd());
ProcessInputCharByChar(input);
EXPECT_EQ(QUIC_NO_ERROR, decoder_.error());
diff --git a/quic/core/http/quic_receive_control_stream.cc b/quic/core/http/quic_receive_control_stream.cc
index bc36589..93fae3a 100644
--- a/quic/core/http/quic_receive_control_stream.cc
+++ b/quic/core/http/quic_receive_control_stream.cc
@@ -105,7 +105,8 @@
return false;
}
- bool OnPushPromiseFrameStart(PushId /*push_id*/) override {
+ bool OnPushPromiseFrameStart(PushId /*push_id*/,
+ Http3FrameLengths /*frame_length*/) override {
CloseConnectionOnWrongFrame("Push Promise");
return false;
}
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index 8bbe7a4..6f39445 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -513,12 +513,12 @@
send_control_stream_->WritePriority(priority);
}
-size_t QuicSpdySession::WritePushPromise(QuicStreamId original_stream_id,
- QuicStreamId promised_stream_id,
- SpdyHeaderBlock headers) {
+void QuicSpdySession::WritePushPromise(QuicStreamId original_stream_id,
+ QuicStreamId promised_stream_id,
+ SpdyHeaderBlock headers) {
if (perspective() == Perspective::IS_CLIENT) {
QUIC_BUG << "Client shouldn't send PUSH_PROMISE";
- return 0;
+ return;
}
SpdyPushPromiseIR push_promise(original_stream_id, promised_stream_id,
@@ -530,7 +530,6 @@
SpdySerializedFrame frame(spdy_framer_.SerializeFrame(push_promise));
headers_stream()->WriteOrBufferData(
QuicStringPiece(frame.data(), frame.size()), false, nullptr);
- return frame.size();
}
void QuicSpdySession::SendMaxHeaderListSize(size_t value) {
diff --git a/quic/core/http/quic_spdy_session.h b/quic/core/http/quic_spdy_session.h
index d381d8c..8dfc47a 100644
--- a/quic/core/http/quic_spdy_session.h
+++ b/quic/core/http/quic_spdy_session.h
@@ -127,10 +127,9 @@
// Write |headers| for |promised_stream_id| on |original_stream_id| in a
// PUSH_PROMISE frame to peer.
- // Return the size, in bytes, of the resulting PUSH_PROMISE frame.
- virtual size_t WritePushPromise(QuicStreamId original_stream_id,
- QuicStreamId promised_stream_id,
- spdy::SpdyHeaderBlock headers);
+ virtual void WritePushPromise(QuicStreamId original_stream_id,
+ QuicStreamId promised_stream_id,
+ spdy::SpdyHeaderBlock headers);
// Sends SETTINGS_MAX_HEADER_LIST_SIZE SETTINGS frame.
void SendMaxHeaderListSize(size_t value);
diff --git a/quic/core/http/quic_spdy_stream.cc b/quic/core/http/quic_spdy_stream.cc
index 11cc233..c731741 100644
--- a/quic/core/http/quic_spdy_stream.cc
+++ b/quic/core/http/quic_spdy_stream.cc
@@ -124,7 +124,8 @@
return stream_->OnHeadersFrameEnd();
}
- bool OnPushPromiseFrameStart(PushId /*push_id*/) override {
+ bool OnPushPromiseFrameStart(PushId /*push_id*/,
+ Http3FrameLengths /*frame_length*/) override {
// TODO(b/137554973): Consume frame header.
CloseConnectionOnWrongFrame("Push Promise");
return false;
diff --git a/quic/tools/quic_simple_server_session_test.cc b/quic/tools/quic_simple_server_session_test.cc
index 9bc3573..cef24b7 100644
--- a/quic/tools/quic_simple_server_session_test.cc
+++ b/quic/tools/quic_simple_server_session_test.cc
@@ -155,16 +155,16 @@
quic_simple_server_backend) {}
// Methods taking non-copyable types like SpdyHeaderBlock by value cannot be
// mocked directly.
- size_t WritePushPromise(QuicStreamId original_stream_id,
- QuicStreamId promised_stream_id,
- spdy::SpdyHeaderBlock headers) override {
+ void WritePushPromise(QuicStreamId original_stream_id,
+ QuicStreamId promised_stream_id,
+ spdy::SpdyHeaderBlock headers) override {
return WritePushPromiseMock(original_stream_id, promised_stream_id,
headers);
}
MOCK_METHOD3(WritePushPromiseMock,
- size_t(QuicStreamId original_stream_id,
- QuicStreamId promised_stream_id,
- const spdy::SpdyHeaderBlock& headers));
+ void(QuicStreamId original_stream_id,
+ QuicStreamId promised_stream_id,
+ const spdy::SpdyHeaderBlock& headers));
MOCK_METHOD1(SendBlocked, void(QuicStreamId));
};
