Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(576)

Unified Diff: net/quic/quic_chromium_client_session.cc

Issue 1692253004: QUIC - chromium server push support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initial for-review version Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/quic_chromium_client_session.cc
diff --git a/net/quic/quic_chromium_client_session.cc b/net/quic/quic_chromium_client_session.cc
index 78044e810cd85da5ab136382fcabdf956d98836b..0593fb39979ec0a6e8868491aa4895d84492a8c0 100644
--- a/net/quic/quic_chromium_client_session.cc
+++ b/net/quic/quic_chromium_client_session.cc
@@ -58,7 +58,8 @@ enum Location {
CREATE_OUTGOING_RELIABLE_STREAM = 3,
NOTIFY_FACTORY_OF_SESSION_CLOSED_LATER = 4,
NOTIFY_FACTORY_OF_SESSION_CLOSED = 5,
- NUM_LOCATIONS = 6,
+ CREATE_INCOMING_RELIABLE_STREAM = 6,
+ NUM_LOCATIONS = 7,
};
void RecordUnexpectedOpenStreams(Location location) {
@@ -577,10 +578,38 @@ bool QuicChromiumClientSession::CanPool(const std::string& hostname,
server_id_.host(), hostname);
}
-QuicSpdyStream* QuicChromiumClientSession::CreateIncomingDynamicStream(
- QuicStreamId id) {
- DLOG(ERROR) << "Server push not supported";
- return nullptr;
+QuicChromiumClientStream*
+QuicChromiumClientSession::CreateIncomingDynamicStream(QuicStreamId id) {
+ if (!connection()->connected()) {
+ LOG(DFATAL) << "ShouldCreateIncomingDynamicStream called when disconnected";
+ return nullptr;
+ }
+ if (goaway_received()) {
+ DVLOG(1) << "Failed to create a new outgoing stream. "
+ << "Already received goaway.";
+ return nullptr;
+ }
+ if (going_away_) {
+ RecordUnexpectedOpenStreams(CREATE_INCOMING_RELIABLE_STREAM);
Ryan Hamilton 2016/02/24 00:33:59 I'm not sure this is unexpected in the sense that
Buck 2016/02/26 23:54:15 Done.
+ return nullptr;
+ }
+ if (id % 2 != 0) {
+ LOG(WARNING) << "Received invalid push stream id " << id;
+ connection()->SendConnectionCloseWithDetails(
+ QUIC_INVALID_STREAM_ID, "Server created odd numbered stream");
+ return nullptr;
+ }
+ return CreateIncomingReliableStreamImpl(id);
+}
+
+QuicChromiumClientStream*
+QuicChromiumClientSession::CreateIncomingReliableStreamImpl(QuicStreamId id) {
+ DCHECK(connection()->connected());
+ QuicChromiumClientStream* stream =
+ new QuicChromiumClientStream(id, this, net_log_);
+ stream->CloseWriteSide();
+ ++num_total_streams_;
+ return stream;
}
void QuicChromiumClientSession::CloseStream(QuicStreamId stream_id) {

Powered by Google App Engine
This is Rietveld 408576698