Implements migration of a QUIC connection to a different destination address if specified by the se…

net/quic/quic_stream_factory.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/quic/quic_stream_factory.h"
 
 #include <openssl/aead.h>
 
 #include <algorithm>
 #include <tuple>
@@ skipping 1425 matching lines @@
           session->connection_id(), "Non-migratable stream");
       if (force_close) {
         // Close sessions with non-migratable streams.
         session->CloseSessionOnError(
             ERR_NETWORK_CHANGED,
             QUIC_CONNECTION_MIGRATION_NON_MIGRATABLE_STREAM);
       }
       continue;
     }
 
-    MigrateSessionToNetwork(session, new_network, bound_net_log, nullptr);
+    MigrateSessionToNewSocket(session, session->connection()->peer_address(),
+                              new_network, bound_net_log, nullptr);
   }
 }
 
 void QuicStreamFactory::MaybeMigrateSingleSession(
     QuicChromiumClientSession* session,
     MigrationCause migration_cause,
     scoped_refptr<StringIOBuffer> packet) {
   ScopedConnectionMigrationEventLog scoped_event_log(
       net_log_,
       migration_cause == EARLY_MIGRATION ? "EarlyMigration" : "WriteError");
@@ skipping 11 matching lines @@
   if (new_network == NetworkChangeNotifier::kInvalidNetworkHandle) {
     // No alternate network found.
     // TODO (jri): Add histogram for this failure case.
     scoped_event_log.net_log().AddEvent(
         NetLog::TYPE_QUIC_CONNECTION_MIGRATION_FAILURE,
         base::Bind(&NetLogQuicConnectionMigrationFailureCallback,
                    session->connection_id(), "No new network"));
     return;
   }
   OnSessionGoingAway(session);
-  MigrateSessionToNetwork(session, new_network, scoped_event_log.net_log(),
-                          packet);
+  MigrateSessionToNewSocket(session, session->connection()->peer_address(),
+                            new_network, scoped_event_log.net_log(), packet);
 }
 
-void QuicStreamFactory::MigrateSessionToNetwork(
+void QuicStreamFactory::MigrateSessionToNewSocket(

[Ryan Hamilton, 2016/07/06 19:29:37]

(Alternative name "MigrateSession"?)

[Jana, 2016/07/12 22:34:10]

Done.

     QuicChromiumClientSession* session,
-    NetworkHandle new_network,
+    IPEndPoint peer_address,
+    NetworkHandle network,
     const BoundNetLog& bound_net_log,
     scoped_refptr<StringIOBuffer> packet) {
   // Use OS-specified port for socket (DEFAULT_BIND) instead of
   // using the PortSuggester since the connection is being migrated
   // and not being newly created.
   std::unique_ptr<DatagramClientSocket> socket(
       client_socket_factory_->CreateDatagramClientSocket(
           DatagramSocket::DEFAULT_BIND, RandIntCallback(),
           session->net_log().net_log(), session->net_log().source()));
-  QuicConnection* connection = session->connection();
-  if (ConfigureSocket(socket.get(), connection->peer_address(), new_network) !=
-      OK) {
+  if (ConfigureSocket(socket.get(), peer_address, network) != OK) {
     session->CloseSessionOnError(ERR_NETWORK_CHANGED, QUIC_INTERNAL_ERROR);
     HistogramAndLogMigrationFailure(
         bound_net_log, MIGRATION_STATUS_INTERNAL_ERROR,
         session->connection_id(), "Socket configuration failed");
     return;
   }
   std::unique_ptr<QuicChromiumPacketReader> new_reader(
       new QuicChromiumPacketReader(socket.get(), clock_.get(), session,
                                    yield_after_packets_, yield_after_duration_,
                                    session->net_log()));
@@ skipping 369 matching lines @@
   // Since the session was active, there's no longer an
   // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP
   // job also fails. So to avoid not using QUIC when we otherwise could, we mark
   // it as recently broken, which means that 0-RTT will be disabled but we'll
   // still race.
   http_server_properties_->MarkAlternativeServiceRecentlyBroken(
       alternative_service);
 }
 
 }  // namespace net