commit d262e25c15f14979bac018b85a5ca27a4c621ec0
author renjietang <renjietang@google.com> Fri Jun 19 15:11:24 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 19 15:12:17 2020 -0700
tree b0cb0f29bd612ffec3da99ee902ae32c971d8c69
parent a42442adf7b63f266451896de0c1093752ade8fd

Add version guard to QuicUtil methods which are IETF QUIC only.

This includes some minor method parameter changes along the way.

No behavior change. not protected.

PiperOrigin-RevId: 317388565
Change-Id: Ia73f1028212a318d4640afa2fbdd0239e095e1f2

quic/core/uber_quic_stream_id_manager.cc

diff --git a/quic/core/uber_quic_stream_id_manager.cc b/quic/core/uber_quic_stream_id_manager.cc
index 64cbd58..2f33594 100644
--- a/quic/core/uber_quic_stream_id_manager.cc
+++ b/quic/core/uber_quic_stream_id_manager.cc
@@ -17,7 +17,8 @@
     QuicStreamCount max_open_outgoing_unidirectional_streams,
     QuicStreamCount max_open_incoming_bidirectional_streams,
     QuicStreamCount max_open_incoming_unidirectional_streams)
-    : bidirectional_stream_id_manager_(delegate,
+    : version_(version),
+      bidirectional_stream_id_manager_(delegate,
                                        /*unidirectional=*/false,
                                        perspective,
                                        version,
@@ -69,7 +70,7 @@
 bool UberQuicStreamIdManager::MaybeIncreaseLargestPeerStreamId(
     QuicStreamId id,
     std::string* error_details) {
-  if (QuicUtils::IsBidirectionalStreamId(id)) {
+  if (QuicUtils::IsBidirectionalStreamId(id, version_)) {
     return bidirectional_stream_id_manager_.MaybeIncreaseLargestPeerStreamId(
         id, error_details);
   }
@@ -78,7 +79,7 @@
 }
 
 void UberQuicStreamIdManager::OnStreamClosed(QuicStreamId id) {
-  if (QuicUtils::IsBidirectionalStreamId(id)) {
+  if (QuicUtils::IsBidirectionalStreamId(id, version_)) {
     bidirectional_stream_id_manager_.OnStreamClosed(id);
     return;
   }
@@ -97,7 +98,7 @@
 }
 
 bool UberQuicStreamIdManager::IsAvailableStream(QuicStreamId id) const {
-  if (QuicUtils::IsBidirectionalStreamId(id)) {
+  if (QuicUtils::IsBidirectionalStreamId(id, version_)) {
     return bidirectional_stream_id_manager_.IsAvailableStream(id);
   }
   return unidirectional_stream_id_manager_.IsAvailableStream(id);