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 76 matching lines @@
                                              client_address,
                                              guid,
                                              packet);
       return;
     }
     session = CreateQuicSession(guid, client_address, fd_, epoll_server_);
 
     if (session == NULL) {
       DLOG(INFO) << "Failed to create session for " << guid;
       // Add this guid fo the time-wait state, to safely nack future packets.
-      time_wait_list_manager_->AddGuidToTimeWait(guid);
+      // We don't know the version here, so assume latest.
+      time_wait_list_manager_->AddGuidToTimeWait(guid, QuicVersionMax());
       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;
   }
 
   session->connection()->ProcessUdpPacket(
       server_address, client_address, packet);
 }
 
 void QuicDispatcher::CleanUpSession(SessionMap::iterator it) {
   QuicSession* session = it->second;
   write_blocked_list_.RemoveBlockedObject(session->connection());
-  time_wait_list_manager_->AddGuidToTimeWait(it->first);
+  time_wait_list_manager_->AddGuidToTimeWait(it->first,
+                                             session->connection()->version());
   session_map_.erase(it);
 }
 
 void QuicDispatcher::DeleteSessions() {
   STLDeleteElements(&closed_session_list_);
 }
 
 bool QuicDispatcher::OnCanWrite() {
   // We got an EPOLLOUT: the socket should not be blocked.
   write_blocked_ = false;
@@ skipping 53 matching lines @@
 }
 
 QuicSession* QuicDispatcher::CreateQuicSession(
     QuicGuid guid,
     const IPEndPoint& client_address,
     int fd,
     EpollServer* epoll_server) {
   QuicConnectionHelperInterface* helper =
       new QuicEpollConnectionHelper(this, epoll_server);
   QuicServerSession* session = new QuicServerSession(
-       config_, new QuicConnection(guid, client_address, helper, true), this);
+       config_, new QuicConnection(guid, client_address, helper, true,
+                                   QuicVersionMax()), this);
   session->InitializeSession(crypto_config_);
   return session;
 }
 
 }  // namespace tools
 }  // namespace net