Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/tools/quic/quic_packet_printer_bin.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.
 
 // clang-format off
 
 // Dumps out the decryptable contents of a QUIC packet in a human-readable way.
 // If the packet is null encrypted, this will dump full packet contents.
 // Otherwise it will dump the public header, and fail with an error that the
 // packet is undecryptable.
 //
 // Usage: quic_packet_printer server|client <hex dump of packet>
 //
 // Example input:
 // quic_packet_printer server 0c6b810308320f24c004a939a38a2e3fd6ca589917f200400
 // 201b80b0100501c0700060003023d0000001c00556e656e637279707465642073747265616d2
 // 064617461207365656e
 //
 // Example output:
 // OnPacket
 // OnUnauthenticatedPublicHeader
 // OnUnauthenticatedHeader: { connection_id: 13845207862000976235,
 // connection_id_length:8, packet_number_length:1, multipath_flag: 0,
-// reset_flag: 0, version_flag: 0, entropy_flag: 0, entropy hash: 0, path_id: ,
-// packet_number: 4}
+// reset_flag: 0, version_flag: 0, path_id: , packet_number: 4}
 // OnDecryptedPacket
 // OnPacketHeader
-// OnAckFrame:  entropy_hash: 2 largest_observed: 1 ack_delay_time: 3000
+// OnAckFrame:  largest_observed: 1 ack_delay_time: 3000
 // missing_packets: [  ] is_truncated: 0 received_packets: [ 1 at 466016  ]
 // OnStopWaitingFrame
 // OnConnectionCloseFrame: error_code { 61 } error_details { Unencrypted stream
 // data seen }
 
 // clang-format on
 
 #include <iostream>
 #include <string>
 
@@ skipping 20 matching lines @@
 }
 }
 
 namespace net {
 
 class QuicPacketPrinter : public QuicFramerVisitorInterface {
  public:
   explicit QuicPacketPrinter(QuicFramer* framer) : framer_(framer) {}
 
   void OnError(QuicFramer* framer) override {
-    cerr << "OnError: " << QuicUtils::ErrorToString(framer->error())
+    cerr << "OnError: " << QuicErrorCodeToString(framer->error())
          << " detail: " << framer->detailed_error() << "\n";
   }
   bool OnProtocolVersionMismatch(QuicVersion received_version) override {
     framer_->set_version(received_version);
     cerr << "OnProtocolVersionMismatch: "
          << QuicVersionToString(received_version) << "\n";
     return true;
   }
   void OnPacket() override { cerr << "OnPacket\n"; }
   void OnPublicResetPacket(const QuicPublicResetPacket& packet) override {
@@ skipping 112 matching lines @@
       if (net::QuicVersionToString(version) == FLAGS_quic_version) {
         framer.set_version(version);
       }
     }
   }
   net::QuicPacketPrinter visitor(&framer);
   framer.set_visitor(&visitor);
   net::QuicEncryptedPacket encrypted(hex.c_str(), hex.length());
   return framer.ProcessPacket(encrypted);
 }