Break out the basic reliable QUIC stream functionality from the

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>
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/linked_hash_map.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_crypto_stream.h"
+#include "net/quic/quic_data_stream.h"
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_spdy_compressor.h"
 #include "net/quic/quic_spdy_decompressor.h"
 #include "net/quic/reliable_quic_stream.h"
 #include "net/spdy/write_blocked_list.h"
 
 namespace net {
 
 class QuicCryptoStream;
@@ skipping 30 matching lines @@
 
   virtual ~QuicSession();
 
   // QuicConnectionVisitorInterface methods:
   virtual bool OnStreamFrames(
       const std::vector<QuicStreamFrame>& frames) OVERRIDE;
   virtual void OnRstStream(const QuicRstStreamFrame& frame) OVERRIDE;
   virtual void OnGoAway(const QuicGoAwayFrame& frame) OVERRIDE;
   virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) OVERRIDE;
   virtual void OnSuccessfulVersionNegotiation(
-      const QuicVersion& version) OVERRIDE{}
+      const QuicVersion& version) OVERRIDE {}
   virtual void OnConfigNegotiated() OVERRIDE;
   // Not needed for HTTP.
   virtual bool OnCanWrite() OVERRIDE;
   virtual bool HasPendingHandshake() const OVERRIDE;
 
   // Called by streams when they want to write data to the peer.
   // Returns a pair with the number of bytes consumed from data, and a boolean
   // indicating if the fin bit was consumed.  This does not indicate the data
   // has been sent on the wire: it may have been turned into a packet and queued
   // if the socket was unexpectedly blocked.
@@ skipping 89 matching lines @@
   QuicSpdyCompressor* compressor() { return &compressor_; }
 
   // Gets the SSL connection information.
   virtual bool GetSSLInfo(SSLInfo* ssl_info);
 
   QuicErrorCode error() const { return error_; }
 
   bool is_server() const { return is_server_; }
 
  protected:
+  typedef base::hash_map<QuicStreamId, QuicDataStream*> DataStreamMap;
+
   // Creates a new stream, owned by the caller, to handle a peer-initiated
   // stream.  Returns NULL and does error handling if the stream can not be
   // created.
-  virtual ReliableQuicStream* CreateIncomingReliableStream(QuicStreamId id) = 0;
+  virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) = 0;
 
   // Create a new stream, owned by the caller, to handle a locally-initiated
   // stream.  Returns NULL if max streams have already been opened.
-  virtual ReliableQuicStream* CreateOutgoingReliableStream() = 0;
+  virtual QuicDataStream* CreateOutgoingDataStream() = 0;
 
   // Return the reserved crypto stream.
   virtual QuicCryptoStream* GetCryptoStream() = 0;
 
   // Adds 'stream' to the active stream map.
-  virtual void ActivateStream(ReliableQuicStream* stream);
+  virtual void ActivateStream(QuicDataStream* stream);
 
   // Returns the stream id for a new stream.
   QuicStreamId GetNextStreamId();
 
-  ReliableQuicStream* GetIncomingReliableStream(QuicStreamId stream_id);
+  QuicDataStream* GetIncomingReliableStream(QuicStreamId stream_id);
+
+  QuicDataStream* GetDataStream(const QuicStreamId stream_id);
 
   ReliableQuicStream* GetStream(const QuicStreamId stream_id);
 
   // This is called after every call other than OnConnectionClose from the
   // QuicConnectionVisitor to allow post-processing once the work has been done.
   // In this case, it deletes streams given that it's safe to do so (no other
   // operations are being done on the streams at this time)
   virtual void PostProcessAfterData();
 
-  base::hash_map<QuicStreamId, ReliableQuicStream*>* streams() {
+  base::hash_map<QuicStreamId, QuicDataStream*>* streams() {
     return &stream_map_;
   }
 
-  const base::hash_map<QuicStreamId, ReliableQuicStream*>* streams() const {
+  const base::hash_map<QuicStreamId, QuicDataStream*>* streams() const {
     return &stream_map_;
   }
 
-  std::vector<ReliableQuicStream*>* closed_streams() {
-    return &closed_streams_;
-  }
+  std::vector<QuicDataStream*>* closed_streams() { return &closed_streams_; }
 
   size_t get_max_open_streams() const {
     return max_open_streams_;
   }
 
  private:
   friend class test::QuicSessionPeer;
   friend class VisitorShim;
 
-  typedef base::hash_map<QuicStreamId, ReliableQuicStream*> ReliableStreamMap;
-
   // Performs the work required to close |stream_id|.  If |locally_reset|
   // then the stream has been reset by this endpoint, not by the peer.  This
   // means the stream may become a zombie stream which needs to stay
   // around until headers have been decompressed.
   void CloseStreamInner(QuicStreamId stream_id, bool locally_reset);
 
   // Adds |stream_id| to the zobmie stream map, closing the oldest
   // zombie stream if the set is full.
   void AddZombieStream(QuicStreamId stream_id);
 
@@ skipping 15 matching lines @@
   // Streams which have been locally reset before decompressing headers
   // from the peer.  These streams need to stay open long enough to
   // process any headers from the peer.
   // Ideally this would be a linked_hash_set as the boolean is unused.
   linked_hash_map<QuicStreamId, bool> zombie_streams_;
 
   // A shim to stand between the connection and the session, to handle stream
   // deletions.
   scoped_ptr<VisitorShim> visitor_shim_;
 
-  std::vector<ReliableQuicStream*> closed_streams_;
+  std::vector<QuicDataStream*> closed_streams_;
 
   QuicSpdyDecompressor decompressor_;
   QuicSpdyCompressor compressor_;
 
   QuicConfig config_;
 
   // Returns the maximum number of streams this connection can open.
   size_t max_open_streams_;
 
   // Map from StreamId to pointers to streams that are owned by the caller.
-  ReliableStreamMap stream_map_;
+  DataStreamMap 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_;
 
   // A list of streams which need to write more data.
   WriteBlockedList<QuicStreamId> write_blocked_streams_;
 
@@ skipping 13 matching lines @@
 
   // Indicate if there is pending data for the crypto stream.
   bool has_pending_handshake_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SESSION_H_