Landing Recent QUIC changes until Sun Apr 9 16:12:55

net/quic/core/crypto/crypto_handshake_message.cc

 // Copyright (c) 2013 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/crypto/crypto_handshake_message.h"
 
 #include <memory>
 
 #include "net/quic/core/crypto/crypto_framer.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/core/crypto/crypto_utils.h"
 #include "net/quic/core/quic_socket_address_coder.h"
 #include "net/quic/core/quic_utils.h"
+#include "net/quic/platform/api/quic_endian.h"
 #include "net/quic/platform/api/quic_map_util.h"
 #include "net/quic/platform/api/quic_str_cat.h"
 #include "net/quic/platform/api/quic_text_utils.h"
 
 using std::string;
 
 namespace net {
 
 CryptoHandshakeMessage::CryptoHandshakeMessage() : tag_(0), minimum_size_(0) {}
 
@@ skipping 215 matching lines @@
           memcpy(&value, it->second.data(), sizeof(value));
           ret += QuicTextUtils::Uint64ToString(value);
           done = true;
         }
         break;
       case kRCID:
         // uint64_t value
         if (it->second.size() == 8) {
           uint64_t value;
           memcpy(&value, it->second.data(), sizeof(value));
+          if (QuicUtils::IsConnectionIdWireFormatBigEndian(perspective)) {
+            value = QuicEndian::NetToHost64(value);
+          }
           ret += QuicTextUtils::Uint64ToString(value);
           done = true;
         }
         break;
       case kTBKP:
       case kKEXS:
       case kAEAD:
       case kCOPT:
       case kPDMD:
       case kVER:
@@ skipping 66 matching lines @@
       ret += "0x" + QuicTextUtils::HexEncode(it->second);
     }
     ret += "\n";
   }
   --indent;
   ret += string(2 * indent, ' ') + ">";
   return ret;
 }
 
 }  // namespace net