Landing Recent QUIC changes until 12/18/2015 13:57 UTC

net/tools/quic/quic_client_bin.cc

Index: net/tools/quic/quic_client_bin.cc
diff --git a/net/tools/quic/quic_client_bin.cc b/net/tools/quic/quic_client_bin.cc
index 96046e4b9c772df19ce8090f99df9840a8caa4bf..41f75cbc99473f0fcc27f62be3088bc01d7f3156 100644
--- a/net/tools/quic/quic_client_bin.cc
+++ b/net/tools/quic/quic_client_bin.cc
@@ -47,6 +47,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/privacy_mode.h"
@@ -133,6 +134,22 @@ static bool DecodeHexString(const base::StringPiece& hex, std::string* bytes) {
   return true;
 };
 
+// Converts binary data into an ASCII string. Each character in the resulting
+// string is preceeded by a space, and replaced with a '.' if not printable.
+string BinaryToAscii(const string& binary) {
+  string out = "";
+  for (const unsigned char c : binary) {
+    // Leading space.
+    out += " ";
+    if (isprint(c)) {
+      out += c;
+    } else {
+      out += '.';
+    }
+  }
+  return out;
+}
+
 int main(int argc, char* argv[]) {
   base::CommandLine::Init(argc, argv);
   base::CommandLine* line = base::CommandLine::ForCurrentProcess();
@@ -335,11 +352,28 @@ int main(int argc, char* argv[]) {
   if (!FLAGS_quiet) {
     cout << "Request:" << endl;
     cout << "headers:" << header_block.DebugString();
-    cout << "body: " << body << endl;
+    if (!FLAGS_body_hex.empty()) {
+      // Print the user provided hex, rather than binary body.
+      cout << "body hex:   " << FLAGS_body_hex << endl;
+      string bytes;
+      DecodeHexString(FLAGS_body_hex, &bytes);
+      cout << "body ascii: " << BinaryToAscii(bytes) << endl;
+    } else {
+      cout << "body: " << body << endl;
+    }
     cout << endl;
     cout << "Response:" << endl;
     cout << "headers: " << client.latest_response_headers() << endl;
-    cout << "body: " << client.latest_response_body() << endl;
+    string response_body = client.latest_response_body();
+    if (!FLAGS_body_hex.empty()) {
+      // Assume response is binary data.
+      string bytes;
+      DecodeHexString(response_body, &bytes);
+      cout << "body hex:   " << bytes << endl;
+      cout << "body ascii: " << BinaryToAscii(response_body) << endl;
+    } else {
+      cout << "body: " << response_body << endl;
+    }
     cout << "trailers: " << client.latest_response_trailers() << endl;
   }