Land Recent QUIC changes.

net/tools/quic/quic_dispatcher.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_dispatcher.h"
 
 #include <errno.h>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 19 matching lines @@
     dispatcher_->DeleteSessions();
     return 0;
   }
 
  private:
   QuicDispatcher* dispatcher_;
 };
 
 QuicDispatcher::QuicDispatcher(const QuicConfig& config,
                                const QuicCryptoServerConfig& crypto_config,
+                               const QuicVersionVector& supported_versions,
                                int fd,
                                EpollServer* epoll_server)
     : config_(config),
       crypto_config_(crypto_config),
       time_wait_list_manager_(
-          new QuicTimeWaitListManager(this, epoll_server)),
+          new QuicTimeWaitListManager(this, epoll_server, supported_versions)),
       delete_sessions_alarm_(new DeleteSessionsAlarm(this)),
       epoll_server_(epoll_server),
       fd_(fd),
       write_blocked_(false),
       helper_(new QuicEpollConnectionHelper(epoll_server_)),
-      writer_(new QuicDefaultPacketWriter(fd)) {
+      writer_(new QuicDefaultPacketWriter(fd)),
+      supported_versions_(supported_versions) {
 }
 
 QuicDispatcher::~QuicDispatcher() {
   STLDeleteValues(&session_map_);
   STLDeleteElements(&closed_session_list_);
 }
 
 void QuicDispatcher::set_fd(int fd) {
   fd_ = fd;
   writer_.reset(new QuicDefaultPacketWriter(fd));
@@ skipping 33 matching lines @@
       time_wait_list_manager_->ProcessPacket(server_address,
                                              client_address,
                                              guid,
                                              packet);
       return;
     }
     session = CreateQuicSession(guid, client_address);
 
     if (session == NULL) {
       DLOG(INFO) << "Failed to create session for " << guid;
-      // Add this guid fo the time-wait state, to safely nack future packets.
+      // Add this guid fo the time-wait state, to safely reject future packets.
       // We don't know the version here, so assume latest.
-      time_wait_list_manager_->AddGuidToTimeWait(guid, QuicVersionMax());
+      time_wait_list_manager_->AddGuidToTimeWait(guid,
+                                                 supported_versions_.front());
       time_wait_list_manager_->ProcessPacket(server_address,
                                              client_address,
                                              guid,
                                              packet);
       return;
     }
     DLOG(INFO) << "Created new session for " << guid;
     session_map_.insert(make_pair(guid, session));
   } else {
     session = it->second;
@@ skipping 77 matching lines @@
   }
   closed_session_list_.push_back(it->second);
   CleanUpSession(it);
 }
 
 QuicSession* QuicDispatcher::CreateQuicSession(
     QuicGuid guid,
     const IPEndPoint& client_address) {
   QuicServerSession* session = new QuicServerSession(
       config_, new QuicConnection(guid, client_address, helper_.get(), this,
-                                  true, QuicVersionMax()), this);
+                                  true, supported_versions_), this);
   session->InitializeSession(crypto_config_);
   return session;
 }
 
 }  // namespace tools
 }  // namespace net