Landing Recent QUIC changes until Sun Sep 4 03:41:00

net/quic/core/quic_utils.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_utils.h"
 
 #include <ctype.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 372 matching lines @@
 }
 
 string QuicUtils::PeerAddressChangeTypeToString(PeerAddressChangeType type) {
   switch (type) {
     RETURN_STRING_LITERAL(NO_CHANGE);
     RETURN_STRING_LITERAL(PORT_CHANGE);
     RETURN_STRING_LITERAL(IPV4_SUBNET_CHANGE);
     RETURN_STRING_LITERAL(IPV4_TO_IPV6_CHANGE);
     RETURN_STRING_LITERAL(IPV6_TO_IPV4_CHANGE);
     RETURN_STRING_LITERAL(IPV6_TO_IPV6_CHANGE);
-    RETURN_STRING_LITERAL(UNSPECIFIED_CHANGE);
+    RETURN_STRING_LITERAL(IPV4_TO_IPV4_CHANGE);
   }
   return "INVALID_PEER_ADDRESS_CHANGE_TYPE";
 }
 
 // static
 void QuicUtils::DeleteFrames(QuicFrames* frames) {
   for (QuicFrame& frame : *frames) {
     switch (frame.type) {
       // Frames smaller than a pointer are inlined, so don't need to be deleted.
       case PADDING_FRAME:
@@ skipping 102 matching lines @@
     return migrating_ip_is_ipv4 ? IPV6_TO_IPV4_CHANGE : IPV6_TO_IPV6_CHANGE;
   }
 
   if (IPAddressMatchesPrefix(old_address.address(), new_address.address(),
                              24)) {
     // Subnet part does not change (here, we use /24), which is considered to be
     // caused by NATs.
     return IPV4_SUBNET_CHANGE;
   }
 
-  return UNSPECIFIED_CHANGE;
+  return IPV4_TO_IPV4_CHANGE;
 }
 
 string QuicUtils::HexEncode(const char* data, size_t length) {
   return HexEncode(StringPiece(data, length));
 }
 
 string QuicUtils::HexEncode(StringPiece data) {
   return ::base::HexEncode(data.data(), data.size());
 }
 
@@ skipping 39 matching lines @@
 
     bytes_remaining -= line_bytes;
     offset += line_bytes;
     p += line_bytes;
     s += '\n';
   }
   return s;
 }
 
 }  // namespace net