Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher.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 server side dispatcher which dispatches a given client's data to their
 // stream.
 
 #ifndef NET_TOOLS_QUIC_QUIC_DISPATCHER_H_
 #define NET_TOOLS_QUIC_QUIC_DISPATCHER_H_
 
@@ skipping 32 matching lines @@
 
 class QuicPacketWriterWrapper;
 
 namespace test {
 class QuicDispatcherPeer;
 }  // namespace test
 
 class DeleteSessionsAlarm;
 class QuicEpollConnectionHelper;
 
-class QuicDispatcher : public QuicServerSessionVisitor {
+class ProcessPacketInterface {
+ public:
+  virtual ~ProcessPacketInterface() {}
+  virtual void ProcessPacket(const IPEndPoint& server_address,
+                             const IPEndPoint& client_address,
+                             const QuicEncryptedPacket& packet) = 0;
+};
+
+class QuicDispatcher : public QuicServerSessionVisitor,
+                       public ProcessPacketInterface {
  public:
   // Ideally we'd have a linked_hash_set: the  boolean is unused.
   typedef linked_hash_map<QuicBlockedWriterInterface*, bool> WriteBlockedList;
 
   // Due to the way delete_sessions_closure_ is registered, the Dispatcher
   // must live until epoll_server Shutdown. |supported_versions| specifies the
   // list of supported QUIC versions.
   QuicDispatcher(const QuicConfig& config,
                  const QuicCryptoServerConfig& crypto_config,
                  const QuicVersionVector& supported_versions,
                  EpollServer* epoll_server);
 
   virtual ~QuicDispatcher();
 
   virtual void Initialize(int fd);
 
   // Process the incoming packet by creating a new session, passing it to
   // an existing session, or passing it to the TimeWaitListManager.
   virtual void ProcessPacket(const IPEndPoint& server_address,
                              const IPEndPoint& client_address,
-                             const QuicEncryptedPacket& packet);
+                             const QuicEncryptedPacket& packet) OVERRIDE;
 
   // Called when the socket becomes writable to allow queued writes to happen.
   virtual void OnCanWrite();
 
   // Returns true if there's anything in the blocked writer list.
   virtual bool HasPendingWrites() const;
 
   // Sends ConnectionClose frames to all connected clients.
   void Shutdown();
 
@@ skipping 44 matching lines @@
   QuicTimeWaitListManager* time_wait_list_manager() {
     return time_wait_list_manager_.get();
   }
 
   EpollServer* epoll_server() { return epoll_server_; }
 
   const QuicVersionVector& supported_versions() const {
     return supported_versions_;
   }
 
-  const QuicVersionVector& supported_versions_no_flow_control() const {
-    return supported_versions_no_flow_control_;
-  }
-
   const QuicVersionVector& supported_versions_no_connection_flow_control()
       const {
     return supported_versions_no_connection_flow_control_;
   }
 
   const IPEndPoint& current_server_address() {
     return current_server_address_;
   }
   const IPEndPoint& current_client_address() {
     return current_client_address_;
@@ skipping 51 matching lines @@
 
   // The writer to write to the socket with.
   scoped_ptr<QuicPacketWriter> writer_;
 
   // This vector contains QUIC versions which we currently support.
   // This should be ordered such that the highest supported version is the first
   // element, with subsequent elements in descending order (versions can be
   // skipped as necessary).
   const QuicVersionVector supported_versions_;
 
-  // Versions which do not support flow control (introduced in QUIC_VERSION_17).
-  // This is used to construct new QuicConnections when flow control is disabled
-  // via flag.
-  // TODO(rjshade): Remove this when
-  // FLAGS_enable_quic_stream_flow_control_2 is removed.
-  QuicVersionVector supported_versions_no_flow_control_;
   // Versions which do not support *connection* flow control (introduced in
   // QUIC_VERSION_19).
   // This is used to construct new QuicConnections when connection flow control
   // is disabled via flag.
   // TODO(rjshade): Remove this when
   // FLAGS_enable_quic_connection_flow_control_2 is removed.
   QuicVersionVector supported_versions_no_connection_flow_control_;
 
   // Information about the packet currently being handled.
   IPEndPoint current_client_address_;
   IPEndPoint current_server_address_;
   const QuicEncryptedPacket* current_packet_;
 
   QuicFramer framer_;
   scoped_ptr<QuicFramerVisitor> framer_visitor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicDispatcher);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_DISPATCHER_H_