Patch set 2 of Daniel Ziegler's CL

net/quic/quic_dispatcher.cc

 // Copyright 2014 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_dispatcher.h"
 
 #include <errno.h>
 
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "net/quic/quic_blocked_writer_interface.h"
 #include "net/quic/quic_connection_helper.h"
 #include "net/quic/quic_flags.h"
+#include "net/quic/quic_per_connection_packet_writer.h"
 #include "net/quic/quic_time_wait_list_manager.h"
 #include "net/quic/quic_utils.h"
 
 namespace net {
 
 using base::StringPiece;
 using std::make_pair;
 using std::find;
 
 class DeleteSessionsAlarm : public QuicAlarm::Delegate {
@@ skipping 122 matching lines @@
     DCHECK(false);
   }
 
  private:
   QuicDispatcher* dispatcher_;
 
   // Latched in OnUnauthenticatedPublicHeader for use later.
   QuicConnectionId connection_id_;
 };
 
+QuicPacketWriter* QuicDispatcher::DefaultPacketWriterFactory::Create(
+    QuicServerPacketWriter* writer,
+    QuicConnection* connection) {
+  return new QuicPerConnectionPacketWriter(writer, connection);
+}
+
+QuicDispatcher::PacketWriterFactoryAdapter::PacketWriterFactoryAdapter(
+    QuicDispatcher* dispatcher)
+    : dispatcher_(dispatcher) {}
+
+QuicDispatcher::PacketWriterFactoryAdapter::~PacketWriterFactoryAdapter() {}
+
+QuicPacketWriter* QuicDispatcher::PacketWriterFactoryAdapter::Create(
+    QuicConnection* connection) const {
+  return dispatcher_->packet_writer_factory_->Create(
+      dispatcher_->writer_.get(),
+      connection);
+}
+
 QuicDispatcher::QuicDispatcher(const QuicConfig& config,
                                const QuicCryptoServerConfig& crypto_config,
                                const QuicVersionVector& supported_versions,
+                               PacketWriterFactory* packet_writer_factory,
                                QuicConnectionHelperInterface* helper)
     : config_(config),
       crypto_config_(crypto_config),
       helper_(helper),
       delete_sessions_alarm_(
           helper_->CreateAlarm(new DeleteSessionsAlarm(this))),
+      packet_writer_factory_(packet_writer_factory),
+      connection_writer_factory_(this),
       supported_versions_(supported_versions),
       current_packet_(NULL),
       framer_(supported_versions, /*unused*/ QuicTime::Zero(), true),
       framer_visitor_(new QuicFramerVisitor(this)) {
   framer_.set_visitor(framer_visitor_.get());
 }
 
 QuicDispatcher::~QuicDispatcher() {
   STLDeleteValues(&session_map_);
   STLDeleteElements(&closed_session_list_);
@@ skipping 156 matching lines @@
     // infinite loops in OnCanWrite.
     return;
   }
   write_blocked_list_.insert(make_pair(blocked_writer, true));
 }
 
 QuicSession* QuicDispatcher::CreateQuicSession(
     QuicConnectionId connection_id,
     const IPEndPoint& server_address,
     const IPEndPoint& client_address) {
-  QuicPerConnectionPacketWriter* per_connection_packet_writer =
-      new QuicPerConnectionPacketWriter(writer_.get());
   QuicConnection* connection =
       CreateQuicConnection(connection_id,
                            server_address,
-                           client_address,
-                           per_connection_packet_writer);
+                           client_address);
   QuicServerSession* session = new QuicServerSession(
       config_,
       connection,
-      per_connection_packet_writer,
       this);
   session->InitializeSession(crypto_config_);
   return session;
 }
 
 QuicConnection* QuicDispatcher::CreateQuicConnection(
     QuicConnectionId connection_id,
     const IPEndPoint& server_address,
-    const IPEndPoint& client_address,
-    QuicPerConnectionPacketWriter* writer) {
+    const IPEndPoint& client_address) {
   QuicConnection* connection;
   connection = new QuicConnection(
       connection_id,
       client_address,
       helper_,
-      writer,
-      false  /* owns_writer */,
-      true   /* is_server */,
+      connection_writer_factory_,
+      /* owns_writer= */ true,
+      /* is_server= */ true,
       supported_versions_);
-  writer->set_connection(connection);
   return connection;
 }
 
 QuicTimeWaitListManager* QuicDispatcher::CreateQuicTimeWaitListManager() {
   return new QuicTimeWaitListManager(
       writer_.get(), this, helper_, supported_versions());
 }
 
 bool QuicDispatcher::HandlePacketForTimeWait(
     const QuicPacketPublicHeader& header) {
   if (header.reset_flag) {
     // Public reset packets do not have sequence numbers, so ignore the packet.
     return false;
   }
 
   // Switch the framer to the correct version, so that the sequence number can
   // be parsed correctly.
   framer_.set_version(time_wait_list_manager_->GetQuicVersionFromConnectionId(
       header.connection_id));
 
   // Continue parsing the packet to extract the sequence number.  Then
   // send it to the time wait manager in OnUnathenticatedHeader.
   return true;
 }
 
 }  // namespace net