Updates quic_client_bin.cc to be more user friendly, and support more

net/tools/quic/quic_client.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/tools/quic/quic_client.h"
 
 #include <errno.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <sys/epoll.h>
@@ skipping 10 matching lines @@
 #include "net/tools/balsa/balsa_headers.h"
 #include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
 #include "net/tools/quic/quic_socket_utils.h"
 #include "net/tools/quic/quic_spdy_client_stream.h"
 
 #ifndef SO_RXQ_OVFL
 #define SO_RXQ_OVFL 40
 #endif
 
+using std::string;
+
 namespace net {
 namespace tools {
 
 const int kEpollFlags = EPOLLIN | EPOLLOUT | EPOLLET;
 
 QuicClient::QuicClient(IPEndPoint server_address,
                        const QuicServerId& server_id,
                        const QuicVersionVector& supported_versions,
-                       bool print_response,
                        EpollServer* epoll_server)
     : server_address_(server_address),
       server_id_(server_id),
       local_port_(0),
       epoll_server_(epoll_server),
       fd_(-1),
       helper_(CreateQuicConnectionHelper()),
       initialized_(false),
       packets_dropped_(0),
       overflow_supported_(false),
       supported_versions_(supported_versions),
-      print_response_(print_response) {
+      store_response_(false),
+      latest_response_code_(-1) {
 }
 
 QuicClient::QuicClient(IPEndPoint server_address,
                        const QuicServerId& server_id,
                        const QuicVersionVector& supported_versions,
-                       bool print_response,
                        const QuicConfig& config,
                        EpollServer* epoll_server)
     : server_address_(server_address),
       server_id_(server_id),
       config_(config),
       local_port_(0),
       epoll_server_(epoll_server),
       fd_(-1),
       helper_(CreateQuicConnectionHelper()),
       initialized_(false),
       packets_dropped_(0),
       overflow_supported_(false),
       supported_versions_(supported_versions),
-      print_response_(print_response) {
+      store_response_(false),
+      latest_response_code_(-1) {
 }
 
 QuicClient::~QuicClient() {
   if (connected()) {
     session()->connection()->SendConnectionClosePacket(
         QUIC_PEER_GOING_AWAY, "");
   }
 
   CleanUpUDPSocket();
 }
@@ skipping 156 matching lines @@
 }
 
 void QuicClient::CleanUpUDPSocket() {
   if (fd_ > -1) {
     epoll_server_->UnregisterFD(fd_);
     close(fd_);
     fd_ = -1;
   }
 }
 
+void QuicClient::SendRequest(const BalsaHeaders& headers,
+                             StringPiece body,
+                             bool fin) {
+  QuicSpdyClientStream* stream = CreateReliableClientStream();
+  if (stream == nullptr) {
+    LOG(DFATAL) << "stream creation failed!";
+    return;
+  }
+  stream->SendRequest(headers, body, fin);
+  stream->set_visitor(this);
+}
+
+void QuicClient::SendRequestAndWaitForResponse(const BalsaHeaders& headers,
+                                               StringPiece body,
+                                               bool fin) {
+  SendRequest(headers, "", true);
+  while (WaitForEvents()) {
+  }
+}
+
 void QuicClient::SendRequestsAndWaitForResponse(
     const base::CommandLine::StringVector& args) {
   for (size_t i = 0; i < args.size(); ++i) {
     BalsaHeaders headers;
     headers.SetRequestFirstlineFromStringPieces("GET", args[i], "HTTP/1.1");
-    QuicSpdyClientStream* stream = CreateReliableClientStream();
-    DCHECK(stream != nullptr);
-    if (stream == nullptr) {
-      LOG(ERROR) << "stream creation failed!";
-      break;
-    }
-    stream->SendRequest(headers, "", true);
-    stream->set_visitor(this);
+    SendRequest(headers, "", true);
   }
-
   while (WaitForEvents()) {}
 }
 
 QuicSpdyClientStream* QuicClient::CreateReliableClientStream() {
   if (!connected()) {
     return nullptr;
   }
 
   return session_->CreateOutgoingDataStream();
 }
@@ skipping 38 matching lines @@
 }
 
 void QuicClient::OnClose(QuicDataStream* stream) {
   QuicSpdyClientStream* client_stream =
       static_cast<QuicSpdyClientStream*>(stream);
   if (response_listener_.get() != nullptr) {
     response_listener_->OnCompleteResponse(
         stream->id(), client_stream->headers(), client_stream->data());
   }
 
-  if (!print_response_) {
-    return;
+  // Store response headers and body.
+  if (store_response_) {
+    latest_response_code_ = client_stream->headers().parsed_response_code();
+    client_stream->headers().DumpHeadersToString(&latest_response_headers_);
+    latest_response_body_ = client_stream->data();
   }
-
-  const BalsaHeaders& headers = client_stream->headers();
-  printf("%s\n", headers.first_line().as_string().c_str());
-  for (BalsaHeaders::const_header_lines_iterator i =
-           headers.header_lines_begin();
-       i != headers.header_lines_end(); ++i) {
-    printf("%s: %s\n", i->first.as_string().c_str(),
-           i->second.as_string().c_str());
-  }
-  printf("%s\n", client_stream->data().c_str());
 }
 
 bool QuicClient::connected() const {
   return session_.get() && session_->connection() &&
       session_->connection()->connected();
 }
 
 bool QuicClient::goaway_received() const {
   return session_ != nullptr && session_->goaway_received();
 }
 
+size_t QuicClient::latest_response_code() const {
+  LOG_IF(DFATAL, !store_response_) << "Response not stored!";
+  return latest_response_code_;
+}
+
+const string& QuicClient::latest_response_headers() const {
+  LOG_IF(DFATAL, !store_response_) << "Response not stored!";
+  return latest_response_headers_;
+}
+
+const string& QuicClient::latest_response_body() const {
+  LOG_IF(DFATAL, !store_response_) << "Response not stored!";
+  return latest_response_body_;
+}
+
 QuicConnectionId QuicClient::GenerateConnectionId() {
   return QuicRandom::GetInstance()->RandUint64();
 }
 
 QuicEpollConnectionHelper* QuicClient::CreateQuicConnectionHelper() {
   return new QuicEpollConnectionHelper(epoll_server_);
 }
 
 QuicPacketWriter* QuicClient::CreateQuicPacketWriter() {
   return new QuicDefaultPacketWriter(fd_);
@@ skipping 26 matching lines @@
   QuicEncryptedPacket packet(buf, bytes_read, false);
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net