Land Recent QUIC changes.

net/tools/quic/quic_server.cc

 // 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.
 
 #include "net/tools/quic/quic_server.h"
 
 #include <errno.h>
 #include <features.h>
 #include <netinet/in.h>
 #include <string.h>
@@ skipping 21 matching lines @@
 static const char kSourceAddressTokenSecret[] = "secret";
 
 namespace net {
 namespace tools {
 
 QuicServer::QuicServer()
     : port_(0),
       packets_dropped_(0),
       overflow_supported_(false),
       use_recvmmsg_(false),
-      crypto_config_(kSourceAddressTokenSecret) {
+      crypto_config_(kSourceAddressTokenSecret, QuicRandom::GetInstance()) {
   // Use hardcoded crypto parameters for now.
   config_.SetDefaults();
   Initialize();
 }
 
 QuicServer::QuicServer(const QuicConfig& config)
     : port_(0),
       packets_dropped_(0),
       overflow_supported_(false),
       use_recvmmsg_(false),
       config_(config),
-      crypto_config_(kSourceAddressTokenSecret) {
+      crypto_config_(kSourceAddressTokenSecret, QuicRandom::GetInstance()) {
   Initialize();
 }
 
 void QuicServer::Initialize() {
 #if MMSG_MORE
   use_recvmmsg_ = true;
 #endif
   epoll_server_.set_timeout_in_us(50 * 1000);
   // Initialize the in memory cache now.
   QuicInMemoryCache::GetInstance();
 
   QuicEpollClock clock(&epoll_server_);
 
   scoped_ptr<CryptoHandshakeMessage> scfg(
       crypto_config_.AddDefaultConfig(
           QuicRandom::GetInstance(), &clock,
-          QuicCryptoServerConfig::kDefaultExpiry));
+          QuicCryptoServerConfig::ConfigOptions()));
 }
 
 QuicServer::~QuicServer() {
 }
 
 bool QuicServer::Listen(const IPEndPoint& address) {
   port_ = address.port();
   int address_family = address.GetSockAddrFamily();
   fd_ = socket(address_family, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP);
   if (fd_ < 0) {
@@ skipping 93 matching lines @@
     if (can_write_more) {
       event->out_ready_mask |= EPOLLOUT;
     }
   }
   if (event->in_events & EPOLLERR) {
     LOG(INFO) << "Epollerr";
   }
 }
 
 bool QuicServer::ReadAndDispatchSinglePacket(int fd,
-                                       int port,
-                                       QuicDispatcher* dispatcher,
-                                       int* packets_dropped) {
+                                             int port,
+                                             QuicDispatcher* dispatcher,
+                                             int* packets_dropped) {
   // Allocate some extra space so we can send an error if the client goes over
   // the limit.
   char buf[2 * kMaxPacketSize];
 
   IPEndPoint client_address;
   IPAddressNumber server_ip;
   int bytes_read =
       QuicSocketUtils::ReadPacket(fd, buf, arraysize(buf),
                                   packets_dropped,
                                   &server_ip, &client_address);
@@ skipping 15 matching lines @@
   }
 
   IPEndPoint server_address(server_ip, port);
   dispatcher->ProcessPacket(server_address, client_address, guid, packet);
 
   return true;
 }
 
 }  // namespace tools
 }  // namespace net