Land Recent QUIC changes.

net/quic/quic_session.h

 // 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.
 //
 // A QuicSession, which demuxes a single connection to individual streams.
 
 #ifndef NET_QUIC_QUIC_SESSION_H_
 #define NET_QUIC_QUIC_SESSION_H_
 
 #include <vector>
@@ skipping 32 matching lines @@
     // the server and thus the encryption key has been updated. Therefore the
     // connection should resend any packets that were sent under
     // ENCRYPTION_INITIAL. (Client only.)
     ENCRYPTION_REESTABLISHED,
     // HANDSHAKE_CONFIRMED, in a client, indicates the the server has accepted
     // our handshake. In a server it indicates that a full, valid client hello
     // has been received. (Client and server.)
     HANDSHAKE_CONFIRMED,
   };
 
-  QuicSession(QuicConnection* connection, bool is_server);
+  QuicSession(QuicConnection* connection,
+              const QuicConfig& config,
+              bool is_server);
 
   virtual ~QuicSession();
 
   // QuicConnectionVisitorInterface methods:
   virtual bool OnPacket(const IPEndPoint& self_address,
                         const IPEndPoint& peer_address,
                         const QuicPacketHeader& header,
                         const std::vector<QuicStreamFrame>& frame) OVERRIDE;
   virtual void OnRstStream(const QuicRstStreamFrame& frame) OVERRIDE;
   virtual void OnGoAway(const QuicGoAwayFrame& frame) OVERRIDE;
@@ skipping 31 matching lines @@
   // Called by the QuicCryptoStream when the handshake enters a new state.
   //
   // Clients will call this function in the order:
   //   ENCRYPTION_FIRST_ESTABLISHED
   //   zero or more ENCRYPTION_REESTABLISHED
   //   HANDSHAKE_CONFIRMED
   //
   // Servers will simply call it once with HANDSHAKE_CONFIRMED.
   virtual void OnCryptoHandshakeEvent(CryptoHandshakeEvent event);
 
+  virtual QuicConfig* config();
+
   // Returns true if the stream existed previously and has been closed.
   // Returns false if the stream is still active or if the stream has
   // not yet been created.
   bool IsClosedStream(QuicStreamId id);
 
   QuicConnection* connection() { return connection_.get(); }
   size_t num_active_requests() const { return stream_map_.size(); }
   const IPEndPoint& peer_address() const {
     return connection_->peer_address();
   }
@@ skipping 54 matching lines @@
     return &stream_map_;
   }
   std::vector<ReliableQuicStream*>* closed_streams() {
     return &closed_streams_;
   }
 
   size_t get_max_open_streams() const {
     return max_open_streams_;
   }
 
+  void set_max_open_streams(size_t max_open_streams) {
+    max_open_streams_ = max_open_streams;
+  }
+
  private:
   friend class test::QuicSessionPeer;
   friend class VisitorShim;
 
   typedef base::hash_map<QuicStreamId, ReliableQuicStream*> ReliableStreamMap;
 
   ReliableQuicStream* GetStream(const QuicStreamId stream_id);
 
   scoped_ptr<QuicConnection> connection_;
 
   // A shim to stand between the connection and the session, to handle stream
   // deletions.
   scoped_ptr<VisitorShim> visitor_shim_;
 
   std::vector<ReliableQuicStream*> closed_streams_;
 
   QuicSpdyDecompressor decompressor_;
   QuicSpdyCompressor compressor_;
 
+  QuicConfig config_;
+
   // Returns the maximum number of streams this connection can open.
-  const size_t max_open_streams_;
+  size_t max_open_streams_;
 
   // Map from StreamId to pointers to streams that are owned by the caller.
   ReliableStreamMap stream_map_;
   QuicStreamId next_stream_id_;
   bool is_server_;
 
   // Set of stream ids that have been "implicitly created" by receipt
   // of a stream id larger than the next expected stream id.
   base::hash_set<QuicStreamId> implicitly_created_streams_;
 
@@ skipping 10 matching lines @@
   bool goaway_received_;
   // Whether a GoAway has been sent.
   bool goaway_sent_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SESSION_H_