Landing Recent QUIC Changes.

net/quic/quic_session.cc

 // Copyright (c) 2012 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/quic_session.h"
 
 #include "base/stl_util.h"
 #include "net/quic/crypto/proof_verifier.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_flags.h"
@@ skipping 254 matching lines @@
       // individual stream.
       DVLOG(1) << ENDPOINT
                << "Received connection level flow control window update with "
                   "byte offset: " << frames[i].byte_offset;
       if (flow_controller_->UpdateSendWindowOffset(frames[i].byte_offset)) {
         connection_window_updated = true;
       }
       continue;
     }
 
-    if (connection_->version() <= QUIC_VERSION_20 &&
+    if (connection_->version() <= QUIC_VERSION_21 &&
         (stream_id == kCryptoStreamId || stream_id == kHeadersStreamId)) {
       DLOG(DFATAL) << "WindowUpdate for stream " << stream_id << " in version "
                    << QuicVersionToString(connection_->version());
       return;
     }
 
     ReliableQuicStream* stream = GetStream(stream_id);
     if (stream) {
       stream->OnWindowUpdateFrame(frames[i]);
     }
@@ skipping 207 matching lines @@
       // Streams which were created before the SHLO was received (0-RTT
       // requests) are now informed of the peer's initial flow control window.
       uint32 new_window = config_.ReceivedInitialFlowControlWindowBytes();
       OnNewStreamFlowControlWindow(new_window);
       OnNewSessionFlowControlWindow(new_window);
     }
 
     return;
   }
 
-  // QUIC_VERSION_20 and higher can have independent stream and session flow
+  // QUIC_VERSION_21 and higher can have independent stream and session flow
   // control windows.
   if (config_.HasReceivedInitialStreamFlowControlWindowBytes()) {
     // Streams which were created before the SHLO was received (0-RTT
     // requests) are now informed of the peer's initial flow control window.
     OnNewStreamFlowControlWindow(
         config_.ReceivedInitialStreamFlowControlWindowBytes());
   }
   if (config_.HasReceivedInitialSessionFlowControlWindowBytes()) {
     OnNewSessionFlowControlWindow(
         config_.ReceivedInitialSessionFlowControlWindowBytes());
   }
 }
 
 void QuicSession::OnNewStreamFlowControlWindow(uint32 new_window) {
   if (new_window < kDefaultFlowControlSendWindow) {
     LOG(ERROR)
         << "Peer sent us an invalid stream flow control send window: "
         << new_window << ", below default: " << kDefaultFlowControlSendWindow;
     if (connection_->connected()) {
       connection_->SendConnectionClose(QUIC_FLOW_CONTROL_INVALID_WINDOW);
     }
     return;
   }
 
   // Inform all existing streams about the new window.
-  if (connection_->version() > QUIC_VERSION_20) {
+  if (connection_->version() >= QUIC_VERSION_21) {
     GetCryptoStream()->flow_controller()->UpdateSendWindowOffset(new_window);
     headers_stream_->flow_controller()->UpdateSendWindowOffset(new_window);
   }
   for (DataStreamMap::iterator it = stream_map_.begin();
        it != stream_map_.end(); ++it) {
     it->second->flow_controller()->UpdateSendWindowOffset(new_window);
   }
 }
 
 void QuicSession::OnNewSessionFlowControlWindow(uint32 new_window) {
@@ skipping 212 matching lines @@
   closed_streams_.clear();
 }
 
 void QuicSession::OnSuccessfulVersionNegotiation(const QuicVersion& version) {
   if (version < QUIC_VERSION_19) {
     flow_controller_->Disable();
   }
 
   // Disable stream level flow control based on negotiated version. Streams may
   // have been created with a different version.
-  if (version <= QUIC_VERSION_20) {
+  if (version < QUIC_VERSION_21) {
     GetCryptoStream()->flow_controller()->Disable();
     headers_stream_->flow_controller()->Disable();
   }
   for (DataStreamMap::iterator it = stream_map_.begin();
        it != stream_map_.end(); ++it) {
     if (version <= QUIC_VERSION_16) {
       it->second->flow_controller()->Disable();
     }
   }
 }
 
 }  // namespace net