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

net/quic/quic_stream_factory.h

 // 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.
 
 #ifndef NET_QUIC_QUIC_STREAM_FACTORY_H_
 #define NET_QUIC_QUIC_STREAM_FACTORY_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 278 matching lines @@
                                    const BoundNetLog& bound_net_log);
 
   // Method that initiates migration of |session| if |session| is
   // active and if there is an alternate network than the one to which
   // |session| is currently bound. If not null, |packet| is sent on
   // the new network, else a PING frame is sent.
   void MaybeMigrateSingleSession(QuicChromiumClientSession* session,
                                  MigrationCause migration_cause,
                                  scoped_refptr<StringIOBuffer> packet);
 
-  // Method that migrates |session| over to using |new_network|. If
-  // not null, |packet| is sent on the new network, else a PING frame
-  // is sent. Returns ERR_QUIC_PROTOCOL_ERROR if migration fails.
-  void MigrateSessionToNetwork(QuicChromiumClientSession* session,
-                               NetworkChangeNotifier::NetworkHandle new_network,
-                               const BoundNetLog& bound_net_log,
-                               scoped_refptr<StringIOBuffer> packet);
+  // Migrates |session| over to using |network|. If |network| is
+  // kInvalidNetworkHandle, default network is used. If |packet| is
+  // not null, it is sent on the new network, else a PING frame is
+  // sent.
+  void MigrateSessionToNewNetwork(QuicChromiumClientSession* session,
+                                  NetworkChangeNotifier::NetworkHandle network,
+                                  const BoundNetLog& bound_net_log,
+                                  scoped_refptr<StringIOBuffer> packet);

[Ryan Hamilton, 2016/07/12 22:39:26]

Looks like the only caller of this method passes in nullptr here, so let's drop
this argument (and the impl of this method will pass nullptr to
MigrateSession()).

[Jana, 2016/07/12 23:21:53]

Done.

+
+  // Migrates |session| over to using |peer_address|. If |packet| is not null,
+  // it is sent
+  // on the new network, else a PING frame is sent.
+  void MigrateSessionToNewPeerAddress(QuicChromiumClientSession* session,
+                                      IPEndPoint peer_address,
+                                      const BoundNetLog& bound_net_log,
+                                      scoped_refptr<StringIOBuffer> packet);
 
   // NetworkChangeNotifier::IPAddressObserver methods:
 
   // Until the servers support roaming, close all connections when the local
   // IP address changes.
   void OnIPAddressChanged() override;
 
   // NetworkChangeNotifier::NetworkObserver methods:
   void OnNetworkConnected(
       NetworkChangeNotifier::NetworkHandle network) override;
@@ skipping 123 matching lines @@
 
   void ProcessGoingAwaySession(QuicChromiumClientSession* session,
                                const QuicServerId& server_id,
                                bool was_session_active);
 
   // Collect stats from recent connections, possibly disabling Quic.
   void MaybeDisableQuic(QuicChromiumClientSession* session);
 
   void MaybeDisableQuic(uint16_t port);
 
+  // Internal method that migrates |session| over to using
+  // |peer_address| and |network|. If |network| is kInvalidNetworkHandle,
+  // default network is used. If |packet| is not null, it is sent
+  // on the new network, else a PING frame is sent.
+  void MigrateSession(QuicChromiumClientSession* session,
+                      IPEndPoint peer_address,
+                      NetworkChangeNotifier::NetworkHandle network,
+                      const BoundNetLog& bound_net_log,
+                      scoped_refptr<StringIOBuffer> packet);
+
   bool require_confirmation_;
   NetLog* net_log_;
   HostResolver* host_resolver_;
   ClientSocketFactory* client_socket_factory_;
   HttpServerProperties* http_server_properties_;
   TransportSecurityState* transport_security_state_;
   CTVerifier* cert_transparency_verifier_;
   std::unique_ptr<QuicServerInfoFactory> quic_server_info_factory_;
   QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory_;
   QuicRandom* random_generator_;
@@ skipping 141 matching lines @@
   const scoped_refptr<SSLConfigService> ssl_config_service_;
 
   base::WeakPtrFactory<QuicStreamFactory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicStreamFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_STREAM_FACTORY_H_