commit 241ba608c748048ddfb60a7a3d136b678f08c398
author renjietang <renjietang@google.com> Wed Apr 29 13:29:46 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Apr 29 13:30:14 2020 -0700
tree 2ebba662ced96d68ac1dbb71f88da42c2ee80da5
parent b5e1d5b061a631bc8ffc37b43a8ccbe2f463935d

remove num_expected_unidirectional_static_streams_ from QuicSession.

gfe-relnote: no behavior change. not protected.
PiperOrigin-RevId: 309085887
Change-Id: Iddcdb676c27e50e61654b41be754350f201a018a

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 43932bf..99d1ff4 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -100,8 +100,6 @@
       supported_versions_(supported_versions),
       use_http2_priority_write_scheduler_(false),
       is_configured_(false),
-      num_expected_unidirectional_static_streams_(
-          num_expected_unidirectional_static_streams),
       enable_round_robin_scheduling_(false),
       deprecate_draining_streams_(
           GetQuicReloadableFlag(quic_deprecate_draining_streams)),
@@ -114,6 +112,11 @@
       connection_->version().handshake_protocol == PROTOCOL_TLS1_3) {
     config_.SetStatelessResetTokenToSend(GetStatelessResetToken());
   }
+  if (VersionHasIetfQuicFrames(transport_version())) {
+    config_.SetMaxUnidirectionalStreamsToSend(
+        config_.GetMaxUnidirectionalStreamsToSend() +
+        num_expected_unidirectional_static_streams);
+  }
   if (break_close_loop_) {
     QUIC_RELOADABLE_FLAG_COUNT(quic_break_session_stream_close_loop);
   }
@@ -1144,21 +1147,8 @@
     if (config_.HasReceivedMaxUnidirectionalStreams()) {
       max_streams = config_.ReceivedMaxUnidirectionalStreams();
     }
-    // TODO(b/153726130): remove this check and
-    // num_expected_unidirectional_static_streams_.
-    if (max_streams < num_expected_unidirectional_static_streams_) {
-      QUIC_DLOG(ERROR) << "Received unidirectional stream limit of "
-                       << max_streams << " < "
-                       << num_expected_unidirectional_static_streams_;
-      connection_->CloseConnection(
-          QUIC_HTTP_STREAM_LIMIT_TOO_LOW,
-          "New unidirectional stream limit is too low.",
-          ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
-      return;
-    }
-    if (perspective_ == Perspective::IS_CLIENT &&
-        max_streams <
-            v99_streamid_manager_.max_outgoing_unidirectional_streams()) {
+    if (max_streams <
+        v99_streamid_manager_.max_outgoing_unidirectional_streams()) {
       connection_->CloseConnection(
           QUIC_MAX_STREAMS_ERROR,
           quiche::QuicheStrCat(
@@ -1655,14 +1645,6 @@
     stream_id_manager_.ActivateStream(
         /*is_incoming=*/IsIncomingStream(stream_id));
   }
-
-  if (VersionHasIetfQuicFrames(transport_version()) &&
-      !QuicUtils::IsBidirectionalStreamId(stream_id) && is_static) {
-    DCHECK_LE(num_incoming_static_streams_,
-              num_expected_unidirectional_static_streams_);
-    DCHECK_LE(num_outgoing_static_streams_,
-              num_expected_unidirectional_static_streams_);
-  }
 }
 
 QuicStreamId QuicSession::GetNextOutgoingBidirectionalStreamId() {