Landing Recent QUIC changes until 03:18 AM, May 28, UTC

net/quic/quartc/quartc_session.cc

 // Copyright (c) 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quartc/quartc_session.h"
 
 #include "net/quic/platform/api/quic_ptr_util.h"
 
 using std::string;
 
@@ skipping 131 matching lines @@
 const QuicCryptoStream* QuartcSession::GetCryptoStream() const {
   return crypto_stream_.get();
 }
 
 QuicCryptoStream* QuartcSession::GetMutableCryptoStream() {
   return crypto_stream_.get();
 }
 
 QuartcStream* QuartcSession::CreateOutgoingDynamicStream(
     SpdyPriority priority) {
-  return CreateDataStream(GetNextOutgoingStreamId(), priority);
+  return ActivateDataStream(
+      CreateDataStream(GetNextOutgoingStreamId(), priority));
 }
 
 void QuartcSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
   QuicSession::OnCryptoHandshakeEvent(event);
   if (event == HANDSHAKE_CONFIRMED) {
     DCHECK(IsEncryptionEstablished());
     DCHECK(IsCryptoHandshakeConfirmed());
 
     DCHECK(session_delegate_);
     session_delegate_->OnCryptoHandshakeComplete();
   }
 }
 
 void QuartcSession::CloseStream(QuicStreamId stream_id) {
   if (IsClosedStream(stream_id)) {
     // When CloseStream has been called recursively (via
     // QuicStream::OnClose), the stream is already closed so return.
     return;
   }
   write_blocked_streams()->UnregisterStream(stream_id);
   QuicSession::CloseStream(stream_id);
 }
 
+void QuartcSession::CancelStream(QuicStreamId stream_id) {
+  ResetStream(stream_id, QuicRstStreamErrorCode::QUIC_STREAM_CANCELLED);
+}
+
+void QuartcSession::ResetStream(QuicStreamId stream_id,
+                                QuicRstStreamErrorCode error) {
+  if (!IsOpenStream(stream_id)) {
+    return;
+  }
+  QuicStream* stream = QuicSession::GetOrCreateStream(stream_id);
+  if (stream) {
+    stream->Reset(error);
+  }
+}
+
 void QuartcSession::OnConnectionClosed(QuicErrorCode error,
                                        const string& error_details,
                                        ConnectionCloseSource source) {
   QuicSession::OnConnectionClosed(error, error_details, source);
   DCHECK(session_delegate_);
   session_delegate_->OnConnectionClosed(
       error, source == ConnectionCloseSource::FROM_PEER);
 }
 
 void QuartcSession::StartCryptoHandshake() {
@@ skipping 74 matching lines @@
     QuicCryptoClientConfig* client_config) {
   quic_crypto_client_config_.reset(client_config);
 }
 
 void QuartcSession::SetServerCryptoConfig(
     QuicCryptoServerConfig* server_config) {
   quic_crypto_server_config_.reset(server_config);
 }
 
 QuicStream* QuartcSession::CreateIncomingDynamicStream(QuicStreamId id) {
-  QuartcStream* stream = CreateDataStream(id, kDefaultPriority);
+  return ActivateDataStream(CreateDataStream(id, kDefaultPriority));
+}
+
+std::unique_ptr<QuicStream> QuartcSession::CreateStream(QuicStreamId id) {
+  return CreateDataStream(id, kDefaultPriority);
+}
+
+std::unique_ptr<QuartcStream> QuartcSession::CreateDataStream(
+    QuicStreamId id,
+    SpdyPriority priority) {
+  if (crypto_stream_ == nullptr || !crypto_stream_->encryption_established()) {
+    // Encryption not active so no stream created
+    return nullptr;
+  }
+  auto stream = QuicMakeUnique<QuartcStream>(id, this);
   if (stream) {
-    DCHECK(session_delegate_);
-    session_delegate_->OnIncomingStream(stream);
+    // Register the stream to the QuicWriteBlockedList. |priority| is clamped
+    // between 0 and 7, with 0 being the highest priority and 7 the lowest
+    // priority.
+    write_blocked_streams()->RegisterStream(stream->id(), priority);
+
+    if (IsIncomingStream(id)) {
+      DCHECK(session_delegate_);
+      // Incoming streams need to be registered with the session_delegate_.
+      session_delegate_->OnIncomingStream(stream.get());
+      // Quartc doesn't send on incoming streams.
+      stream->set_fin_sent(true);
+    } else {
+      // Quartc doesn't receive on outgoing streams.
+      stream->set_fin_received(true);
+    }
   }
   return stream;
 }
 
-std::unique_ptr<QuicStream> QuartcSession::CreateStream(QuicStreamId id) {
-  QuartcStream* stream = CreateDataStream(id, kDefaultPriority);
-  return QuicWrapUnique(stream);
-}
-
-QuartcStream* QuartcSession::CreateDataStream(QuicStreamId id,
-                                              SpdyPriority priority) {
-  if (crypto_stream_ == nullptr || !crypto_stream_->encryption_established()) {
-    // Encryption not active so no stream created
-    return nullptr;
+QuartcStream* QuartcSession::ActivateDataStream(
+    std::unique_ptr<QuartcStream> stream) {
+  // Transfer ownership of the data stream to the session via ActivateStream().
+  QuartcStream* raw = stream.release();
+  if (raw) {
+    // Make QuicSession take ownership of the stream.
+    ActivateStream(std::unique_ptr<QuicStream>(raw));
   }
-  QuartcStream* stream = new QuartcStream(id, this);
-  if (stream) {
-    // Make QuicSession take ownership of the stream.
-    ActivateStream(std::unique_ptr<QuicStream>(stream));
-    // Register the stream to the QuicWriteBlockedList. |priority| is clamped
-    // between 0 and 7, with 0 being the highest priority and 7 the lowest
-    // priority.
-    write_blocked_streams()->RegisterStream(stream->id(), priority);
-  }
-  return stream;
+  return raw;
 }
 
 }  // namespace net