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/quic_connection.h"
 
 using base::StringPiece;
@@ skipping 46 matching lines @@
 
   virtual void ConnectionClose(QuicErrorCode error, bool from_peer) OVERRIDE {
     session_->ConnectionClose(error, from_peer);
     // The session will go away, so don't bother with cleanup.
   }
 
  private:
   QuicSession* session_;
 };
 
-QuicSession::QuicSession(QuicConnection* connection, bool is_server)
+QuicSession::QuicSession(QuicConnection* connection,
+                         const QuicConfig& config,
+                         bool is_server)
     : connection_(connection),
       visitor_shim_(new VisitorShim(this)),
+      config_(config),
       max_open_streams_(kDefaultMaxStreamsPerConnection),
       next_stream_id_(is_server ? 2 : 3),
       is_server_(is_server),
       largest_peer_created_stream_id_(0),
       goaway_received_(false),
       goaway_sent_(false) {
   connection->set_visitor(visitor_shim_.get());
 }
 
 QuicSession::~QuicSession() {
@@ skipping 127 matching lines @@
 bool QuicSession::IsEncryptionEstablished() {
   return GetCryptoStream()->encryption_established();
 }
 
 bool QuicSession::IsCryptoHandshakeConfirmed() {
   return GetCryptoStream()->handshake_confirmed();
 }
 
 void QuicSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
   if (event == QuicSession::HANDSHAKE_CONFIRMED) {
-    connection_->SetConnectionTimeout(
-        GetCryptoStream()->negotiated_params().idle_connection_state_lifetime);
+    LOG_IF(DFATAL, !config_.negotiated())
+        << "Handshake confirmed without parameter negotiation.";
+    connection_->SetConnectionTimeout(config_.idle_connection_state_lifetime());
+    max_open_streams_ = config_.max_streams_per_connection();
   }
 }
 
+QuicConfig* QuicSession::config() {
+  return &config_;
+}
+
 void QuicSession::ActivateStream(ReliableQuicStream* stream) {
   DLOG(INFO) << "num_streams: " << stream_map_.size()
             << ". activating " << stream->id();
   DCHECK(stream_map_.count(stream->id()) == 0);
   stream_map_[stream->id()] = stream;
 }
 
 QuicStreamId QuicSession::GetNextStreamId() {
   QuicStreamId id = next_stream_id_;
   next_stream_id_ += 2;
@@ skipping 92 matching lines @@
                                            QuicStreamId stream_id) {
   decompression_blocked_streams_[header_id] = stream_id;
 }
 
 void QuicSession::PostProcessAfterData() {
   STLDeleteElements(&closed_streams_);
   closed_streams_.clear();
 }
 
 }  // namespace net