Fix QuicSession to unbuffer data when the QuicTransportChannel reconnects

webrtc/p2p/quic/quicsession.cc

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 44 matching lines @@
   net::QuicSession::OnCryptoHandshakeEvent(event);
   if (event == HANDSHAKE_CONFIRMED) {
     LOG(LS_INFO) << "QuicSession handshake complete";
     RTC_DCHECK(IsEncryptionEstablished());
     RTC_DCHECK(IsCryptoHandshakeConfirmed());
 
     SignalHandshakeComplete();
   }
 }
 
+void QuicSession::CloseStream(net::QuicStreamId stream_id) {
+  if (IsClosedStream(stream_id)) {
+    // When CloseStream has been called recursively (via
+    // ReliableQuicStream::OnClose), the stream is already closed so return.
+    return;
+  }
+  if (!IsIncomingStream(stream_id)) {

[pthatcher1, 2016/04/29 20:15:46]

What happens if we call write_blocked_streams()->UnregisterStream(stream_id);
without this check and it's not in the write_blocked_streams()?  Does it blow
up?  Or does it just ignore it?  If it just ignores it, it might not be worth
doing the check.

[mikescarlett, 2016/04/29 23:29:50]

write_blocked_streams()->UnregisterStream(stream_id) fails if the stream is not
in write_blocked_streams().

I had to change this anyway because incoming streams have to be registered also,
apparently, or else QUIC will crash.

+    write_blocked_streams()->UnregisterStream(stream_id);
+  }
+  net::QuicSession::CloseStream(stream_id);
+}
+
 ReliableQuicStream* QuicSession::CreateIncomingDynamicStream(
     net::QuicStreamId id) {
   ReliableQuicStream* stream = CreateDataStream(id);
   if (stream) {
     SignalIncomingStream(stream);
   }
   return stream;
 }
 
 ReliableQuicStream* QuicSession::CreateOutgoingDynamicStream(
     net::SpdyPriority priority) {
   ReliableQuicStream* stream = CreateDataStream(GetNextOutgoingStreamId());
   if (stream) {
     ActivateStream(stream);  // QuicSession owns the 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;
 }
 
 ReliableQuicStream* QuicSession::CreateDataStream(net::QuicStreamId id) {
   if (crypto_stream_ == nullptr || !crypto_stream_->encryption_established()) {
     // Encryption not active so no stream created
     return nullptr;
   }
   return new ReliableQuicStream(id, this);
 }
 
 void QuicSession::OnConnectionClosed(net::QuicErrorCode error,
                                      net::ConnectionCloseSource source) {
   net::QuicSession::OnConnectionClosed(error, source);
   SignalConnectionClosed(error,
                          source == net::ConnectionCloseSource::FROM_PEER);
 }
 
 bool QuicSession::OnReadPacket(const char* data, size_t data_len) {
   net::QuicEncryptedPacket packet(data, data_len);
   connection()->ProcessUdpPacket(connection()->self_address(),
                                  connection()->peer_address(), packet);
   return true;
 }
 
 }  // namespace cricket