Unify the QUIC dispatcher and make the QuicServer work.

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 23 matching lines @@
 
 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 ProcessPacketInterface,
+                       public QuicBlockedWriterInterface {
  public:
   // Creates per-connection packet writers out of the QuicDispatcher's shared
   // QuicPacketWriter. The per-connection writers' IsWriteBlocked() state must
   // always be the same as the shared writer's IsWriteBlocked(), or else the
   // QuicDispatcher::OnCanWrite logic will not work. (This will hopefully be
   // cleaned up for bug 16950226.)
   class PacketWriterFactory {
    public:
     virtual ~PacketWriterFactory() {}
 
@@ skipping 18 matching lines @@
   // of supported QUIC versions. Takes ownership of |packet_writer_factory|,
   // which is used to create per-connection writers.
   QuicDispatcher(const QuicConfig& config,
                  const QuicCryptoServerConfig& crypto_config,
                  const QuicVersionVector& supported_versions,
                  PacketWriterFactory* packet_writer_factory,
                  QuicConnectionHelperInterface* helper);
 
   ~QuicDispatcher() override;
 
-  virtual void Initialize(int fd);
+  // Takes ownership of |writer|.
+  void InitializeWithWriter(QuicPacketWriter* writer);
 
   // Process the incoming packet by creating a new session, passing it to
   // an existing session, or passing it to the TimeWaitListManager.
   void ProcessPacket(const IPEndPoint& server_address,
                      const IPEndPoint& client_address,
                      const QuicEncryptedPacket& packet) override;
 
-  // Called when the socket becomes writable to allow queued writes to happen.
-  virtual void OnCanWrite();
+  // Called When the socket becomes writable to allow queued writes to happen.

[ramant (doing other things), 2015/03/26 00:01:38]

overly overly nit: "Called When" -> "Called when"? (I could be wrong and hope it
is not a test for me. :-)).

[Ryan Hamilton, 2015/03/26 03:50:26]

Done.

+  void OnCanWrite() override;
 
   // Returns true if there's anything in the blocked writer list.
   virtual bool HasPendingWrites() const;
 
   // Sends ConnectionClose frames to all connected clients.
   void Shutdown();
 
   // QuicServerSessionVisitor interface implementation:
   // Ensure that the closed connection is cleaned up asynchronously.
   void OnConnectionClosed(QuicConnectionId connection_id,
@@ skipping 12 matching lines @@
       QuicConnectionId connection_id) override;
 
   typedef base::hash_map<QuicConnectionId, QuicServerSession*> SessionMap;
 
   const SessionMap& session_map() const { return session_map_; }
 
   // Deletes all sessions on the closed session list and clears the list.
   void DeleteSessions();
 
  protected:
-  // Instantiates a new low-level packet writer. Caller takes ownership of the
-  // returned object.
-  virtual QuicPacketWriter* CreateWriter(int fd);
-
   virtual QuicServerSession* CreateQuicSession(
       QuicConnectionId connection_id,
       const IPEndPoint& server_address,
       const IPEndPoint& client_address);
 
   // Called by |framer_visitor_| when the public header has been parsed.
   virtual bool OnUnauthenticatedPublicHeader(
       const QuicPacketPublicHeader& header);
 
   // Called by OnUnauthenticatedPublicHeader when the packet is not for a
@@ skipping 116 matching lines @@
   QuicFramer framer_;
   scoped_ptr<QuicFramerVisitor> framer_visitor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicDispatcher);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_DISPATCHER_H_