Landing Recent QUIC changes until 4/15/2016 17:20 UTC

net/tools/quic/quic_simple_server.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/tools/quic/quic_simple_server.h"
 
 #include <string.h>
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 18 matching lines @@
 
 // Allocate some extra space so we can send an error if the client goes over
 // the limit.
 const int kReadBufferSize = 2 * kMaxPacketSize;
 
 class SimpleQuicDispatcher : public QuicDispatcher {
  public:
   SimpleQuicDispatcher(const QuicConfig& config,
                        const QuicCryptoServerConfig* crypto_config,
                        const QuicVersionVector& supported_versions,
-                       QuicConnectionHelperInterface* helper)
-      : QuicDispatcher(config, crypto_config, supported_versions, helper) {}
+                       QuicConnectionHelperInterface* helper,
+                       QuicAlarmFactory* alarm_factory)
+      : QuicDispatcher(config,
+                       crypto_config,
+                       supported_versions,
+                       std::unique_ptr<QuicConnectionHelperInterface>(helper),
+                       std::unique_ptr<QuicAlarmFactory>(alarm_factory)) {}
 
  protected:
   QuicServerSessionBase* CreateQuicSession(
       QuicConnectionId connection_id,
       const IPEndPoint& client_address) override {
     QuicServerSessionBase* session =
         QuicDispatcher::CreateQuicSession(connection_id, client_address);
     static_cast<QuicSimplePerConnectionPacketWriter*>(
         session->connection()->writer())
         ->set_connection(session->connection());
     return session;
   }
 
   QuicPacketWriter* CreatePerConnectionWriter() override {
     return new QuicSimplePerConnectionPacketWriter(
         static_cast<QuicSimpleServerPacketWriter*>(writer()));
   }
 };
 
 }  // namespace
 
 QuicSimpleServer::QuicSimpleServer(ProofSource* proof_source,
                                    const QuicConfig& config,
                                    const QuicVersionVector& supported_versions)
     : helper_(
-          new QuicChromiumConnectionHelper(base::ThreadTaskRunnerHandle::Get()
-                                               .get(),
-                                           &clock_,
-                                           QuicRandom::GetInstance())),
+          new QuicChromiumConnectionHelper(&clock_, QuicRandom::GetInstance())),
+      alarm_factory_(new QuicChromiumAlarmFactory(
+          base::ThreadTaskRunnerHandle::Get().get(),
+          &clock_)),
       config_(config),
       crypto_config_(kSourceAddressTokenSecret,
                      QuicRandom::GetInstance(),
                      proof_source),
       supported_versions_(supported_versions),
       read_pending_(false),
       synchronous_read_count_(0),
       read_buffer_(new IOBufferWithSize(kReadBufferSize)),
       weak_factory_(this) {
   Initialize();
@@ skipping 57 matching lines @@
   rc = socket->GetLocalAddress(&server_address_);
   if (rc < 0) {
     LOG(ERROR) << "GetLocalAddress() failed: " << ErrorToString(rc);
     return rc;
   }
 
   DVLOG(1) << "Listening on " << server_address_.ToString();
 
   socket_.swap(socket);
 
-  dispatcher_.reset(new SimpleQuicDispatcher(config_, &crypto_config_,
-                                             supported_versions_, helper_));
+  dispatcher_.reset(new SimpleQuicDispatcher(
+      config_, &crypto_config_, supported_versions_, helper_, alarm_factory_));
   QuicSimpleServerPacketWriter* writer =
       new QuicSimpleServerPacketWriter(socket_.get(), dispatcher_.get());
   dispatcher_->InitializeWithWriter(writer);
 
   StartReading();
 
   return OK;
 }
 
 void QuicSimpleServer::Shutdown() {
@@ skipping 44 matching lines @@
   }
 
   QuicReceivedPacket packet(read_buffer_->data(), result,
                             helper_->GetClock()->Now(), false);
   dispatcher_->ProcessPacket(server_address_, client_address_, packet);
 
   StartReading();
 }
 
 }  // namespace net