commit d1d0085ee4806a673bfb7635a1e938d6542108b5
author renjietang <renjietang@google.com> Fri Sep 06 10:43:12 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Sep 06 10:44:35 2019 -0700
tree bd034deb4f687d0dba82e67c63cd4407a0b1e714
parent 9e62e3c40c9777a475b3c1523123194f4c9f7122

Use QuicSession::transport_version() instead of QuicConnection::transport_version() to make code cleaner.

gfe-relnote: code cleanup, not protected.
PiperOrigin-RevId: 267628510
Change-Id: I2b28c42ec2345870905e7e5d7e88721be86ad6e4

quic/core/legacy_quic_stream_id_manager.cc

diff --git a/quic/core/legacy_quic_stream_id_manager.cc b/quic/core/legacy_quic_stream_id_manager.cc
index a7ec123..157e375 100644
--- a/quic/core/legacy_quic_stream_id_manager.cc
+++ b/quic/core/legacy_quic_stream_id_manager.cc
@@ -19,19 +19,17 @@
     : session_(session),
       max_open_outgoing_streams_(max_open_outgoing_streams),
       max_open_incoming_streams_(max_open_incoming_streams),
-      next_outgoing_stream_id_(QuicUtils::GetFirstBidirectionalStreamId(
-          session->connection()->transport_version(),
-          session->perspective())),
+      next_outgoing_stream_id_(
+          QuicUtils::GetFirstBidirectionalStreamId(session->transport_version(),
+                                                   session->perspective())),
       largest_peer_created_stream_id_(
           session->perspective() == Perspective::IS_SERVER
-              ? (QuicVersionUsesCryptoFrames(
-                     session->connection()->transport_version())
+              ? (QuicVersionUsesCryptoFrames(session->transport_version())
                      ? QuicUtils::GetInvalidStreamId(
-                           session->connection()->transport_version())
+                           session->transport_version())
                      : QuicUtils::GetCryptoStreamId(
-                           session->connection()->transport_version()))
-              : QuicUtils::GetInvalidStreamId(
-                    session->connection()->transport_version())) {}
+                           session->transport_version()))
+              : QuicUtils::GetInvalidStreamId(session->transport_version())) {}
 
 LegacyQuicStreamIdManager::~LegacyQuicStreamIdManager() {
   QUIC_LOG_IF(WARNING,
@@ -71,8 +69,7 @@
   available_streams_.erase(stream_id);
 
   if (largest_peer_created_stream_id_ !=
-          QuicUtils::GetInvalidStreamId(
-              session_->connection()->transport_version()) &&
+          QuicUtils::GetInvalidStreamId(session_->transport_version()) &&
       stream_id <= largest_peer_created_stream_id_) {
     return true;
   }
@@ -83,8 +80,7 @@
   size_t additional_available_streams =
       (stream_id - largest_peer_created_stream_id_) / 2 - 1;
   if (largest_peer_created_stream_id_ ==
-      QuicUtils::GetInvalidStreamId(
-          session_->connection()->transport_version())) {
+      QuicUtils::GetInvalidStreamId(session_->transport_version())) {
     additional_available_streams = (stream_id + 1) / 2 - 1;
   }
   size_t new_num_available_streams =
@@ -105,10 +101,9 @@
   }
   QuicStreamId first_available_stream = largest_peer_created_stream_id_ + 2;
   if (largest_peer_created_stream_id_ ==
-      QuicUtils::GetInvalidStreamId(
-          session_->connection()->transport_version())) {
+      QuicUtils::GetInvalidStreamId(session_->transport_version())) {
     first_available_stream = QuicUtils::GetFirstBidirectionalStreamId(
-        session_->connection()->transport_version(),
+        session_->transport_version(),
         QuicUtils::InvertPerspective(session_->perspective()));
   }
   for (QuicStreamId id = first_available_stream; id < stream_id; id += 2) {
@@ -133,8 +128,7 @@
   }
   // For peer created streams, we also need to consider available streams.
   return largest_peer_created_stream_id_ ==
-             QuicUtils::GetInvalidStreamId(
-                 session_->connection()->transport_version()) ||
+             QuicUtils::GetInvalidStreamId(session_->transport_version()) ||
          id > largest_peer_created_stream_id_ ||
          QuicContainsKey(available_streams_, id);
 }