Land 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 78 matching lines @@
 
   virtual bool HasOpenDataStreams() const OVERRIDE {
     return session_->HasOpenDataStreams();
   }
 
  private:
   QuicSession* session_;
 };
 
 QuicSession::QuicSession(QuicConnection* connection,
-                         uint32 max_flow_control_receive_window_bytes,
                          const QuicConfig& config)
     : connection_(connection),
       visitor_shim_(new VisitorShim(this)),
       config_(config),
       max_open_streams_(config_.max_streams_per_connection()),
       next_stream_id_(is_server() ? 2 : 3),
       largest_peer_created_stream_id_(0),
       error_(QUIC_NO_ERROR),
       goaway_received_(false),
       goaway_sent_(false),
-      has_pending_handshake_(false),
-      max_flow_control_receive_window_bytes_(
-          max_flow_control_receive_window_bytes) {
-  if (max_flow_control_receive_window_bytes_ < kDefaultFlowControlSendWindow) {
-    LOG(ERROR) << "Initial receive window ("
-               << max_flow_control_receive_window_bytes_
-               << ") cannot be set lower than default ("
-               << kDefaultFlowControlSendWindow << ").";
-    max_flow_control_receive_window_bytes_ = kDefaultFlowControlSendWindow;
-  }
+      has_pending_handshake_(false) {
   flow_controller_.reset(new QuicFlowController(
       connection_.get(), 0, is_server(), kDefaultFlowControlSendWindow,
-      max_flow_control_receive_window_bytes_,
-      max_flow_control_receive_window_bytes_));
+      config_.GetInitialFlowControlWindowToSend(),
+      config_.GetInitialFlowControlWindowToSend()));
 
   connection_->set_visitor(visitor_shim_.get());
   connection_->SetFromConfig(config_);
   if (connection_->connected()) {
     connection_->SetOverallConnectionTimeout(
         config_.max_time_before_crypto_handshake());
   }
   headers_stream_.reset(new QuicHeadersStream(this));
   if (!is_server()) {
     // For version above QUIC v12, the headers stream is stream 3, so the
@@ skipping 336 matching lines @@
   return GetCryptoStream()->handshake_confirmed();
 }
 
 void QuicSession::OnConfigNegotiated() {
   connection_->SetFromConfig(config_);
   // Tell all streams about the newly received peer receive window.
   if (connection()->version() >= QUIC_VERSION_17 &&
       config_.HasReceivedInitialFlowControlWindowBytes()) {
     // Streams which were created before the SHLO was received (0RTT requests)
     // are now informed of the peer's initial flow control window.
-    uint32 new_flow_control_send_window =
-        config_.ReceivedInitialFlowControlWindowBytes();
-    if (new_flow_control_send_window < kDefaultFlowControlSendWindow) {
-      LOG(ERROR)
-          << "Peer sent us an invalid flow control send window: "
-          << new_flow_control_send_window
-          << ", below default: " << kDefaultFlowControlSendWindow;
-      connection_->SendConnectionClose(QUIC_FLOW_CONTROL_INVALID_WINDOW);
-      return;
-    }
-    DataStreamMap::iterator it = stream_map_.begin();
-    while (it != stream_map_.end()) {
-      it->second->flow_controller()->UpdateSendWindowOffset(
-          new_flow_control_send_window);
-      it++;
-    }
-
-    // Update connection level window.
-    flow_controller_->UpdateSendWindowOffset(new_flow_control_send_window);
+    uint32 new_window = config_.ReceivedInitialFlowControlWindowBytes();
+    OnNewStreamFlowControlWindow(new_window);
+    OnNewSessionFlowControlWindow(new_window);
   }
 }
 
+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;
+  }
+
+  DataStreamMap::iterator it = stream_map_.begin();
+  while (it != stream_map_.end()) {
+    it->second->flow_controller()->UpdateSendWindowOffset(new_window);
+    it++;

[wtc, 2014/06/16 19:35:56]

Nit: ++it is more efficient.

You can also write this loop as a for loop. See lines 717-718.

[ramant (doing other things), 2014/06/16 21:13:53]

Done.

+  }
+}
+
+void QuicSession::OnNewSessionFlowControlWindow(uint32 new_window) {
+  if (new_window < kDefaultFlowControlSendWindow) {
+    LOG(ERROR)
+        << "Peer sent us an invalid session flow control send window: "
+        << new_window << ", below default: " << kDefaultFlowControlSendWindow;
+    if (connection_->connected()) {
+      connection_->SendConnectionClose(QUIC_FLOW_CONTROL_INVALID_WINDOW);
+    }
+    return;
+  }
+
+  flow_controller_->UpdateSendWindowOffset(new_window);
+}
+
 void QuicSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
   switch (event) {
     // TODO(satyamshekhar): Move the logic of setting the encrypter/decrypter
     // to QuicSession since it is the glue.
     case ENCRYPTION_FIRST_ESTABLISHED:
       break;
 
     case ENCRYPTION_REESTABLISHED:
       // Retransmit originally packets that were sent, since they can't be
       // decrypted by the peer.
@@ skipping 198 matching lines @@
   // with a different version.
   for (DataStreamMap::iterator it = stream_map_.begin();
        it != stream_map_.end(); ++it) {
     if (version < QUIC_VERSION_17) {
       it->second->flow_controller()->Disable();
     }
   }
 }
 
 }  // namespace net