Merge internal change: 132864057

net/quic/core/quic_connection.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/core/quic_connection.h"
 
 #include <string.h>
 #include <sys/types.h>
 
 #include <algorithm>
@@ skipping 1386 matching lines @@
 bool QuicConnection::ProcessValidatedPacket(const QuicPacketHeader& header) {
   if (header.fec_flag) {
     // Drop any FEC packet.
     return false;
   }
 
   if (perspective_ == Perspective::IS_SERVER &&
       IsInitializedIPEndPoint(self_address_) &&
       IsInitializedIPEndPoint(last_packet_destination_address_) &&
       (!(self_address_ == last_packet_destination_address_))) {
-    CloseConnection(QUIC_ERROR_MIGRATING_ADDRESS,
-                    "Self address migration is not supported at the server.",
-                    ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
-    return false;
+    if (!FLAGS_quic_allow_server_address_change_for_mapped_ipv4) {
+      CloseConnection(QUIC_ERROR_MIGRATING_ADDRESS,
+                      "Self address migration is not supported at the server.",
+                      ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
+      return false;
+    }
+    // Allow change between pure IPv4 and equivalent mapped IPv4 address.
+    IPAddress self_ip = self_address_.address();
+    if (self_ip.IsIPv4MappedIPv6()) {
+      self_ip = ConvertIPv4MappedIPv6ToIPv4(self_ip);
+    }
+    IPAddress last_packet_destination_ip =
+        last_packet_destination_address_.address();
+    if (last_packet_destination_ip.IsIPv4MappedIPv6()) {
+      last_packet_destination_ip =
+          ConvertIPv4MappedIPv6ToIPv4(last_packet_destination_ip);
+    }
+    if (self_address_.port() != last_packet_destination_address_.port() ||
+        self_ip != last_packet_destination_ip) {
+      CloseConnection(QUIC_ERROR_MIGRATING_ADDRESS,
+                      "Self address migration is not supported at the server.",
+                      ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
+      return false;
+    }
+    self_address_ = last_packet_destination_address_;
   }
 
   if (!Near(header.packet_number, last_header_.packet_number)) {
     DVLOG(1) << ENDPOINT << "Packet " << header.packet_number
              << " out of bounds.  Discarding";
     CloseConnection(QUIC_INVALID_PACKET_HEADER, "packet number out of bounds.",
                     ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
     return false;
   }
 
@@ skipping 1138 matching lines @@
 
 void QuicConnection::CheckIfApplicationLimited() {
   if (queued_packets_.empty() &&
       !sent_packet_manager_->HasPendingRetransmissions() &&
       !visitor_->WillingAndAbleToWrite()) {
     sent_packet_manager_->OnApplicationLimited();
   }
 }
 
 }  // namespace net