Landing recent QUIC changes until 7:19 PM, Feb 26, 2016 UTC-5.

net/tools/quic/quic_client.h

 // 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.
 //
 // A toy client, which connects to a specified port and sends QUIC
 // request to that endpoint.
 
 #ifndef NET_TOOLS_QUIC_QUIC_CLIENT_H_
 #define NET_TOOLS_QUIC_QUIC_CLIENT_H_
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "net/quic/quic_client_push_promise_index.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_spdy_stream.h"
 #include "net/tools/balsa/balsa_headers.h"
 #include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/quic/quic_client_base.h"
 #include "net/tools/quic/quic_client_session.h"
+#include "net/tools/quic/quic_packet_reader.h"
 #include "net/tools/quic/quic_process_packet_interface.h"
 
 namespace net {
 
 class QuicServerId;
 
 class QuicEpollConnectionHelper;
-class QuicPacketReader;
 
 namespace test {
 class QuicClientPeer;
 }  // namespace test
 
 class QuicClient : public QuicClientBase,
                    public EpollCallbackInterface,
                    public QuicSpdyStream::Visitor,
                    public ProcessPacketInterface,
                    public QuicClientPushPromiseIndex::Delegate {
@@ skipping 140 matching lines @@
   // Implements ProcessPacketInterface. This will be called for each received
   // packet.
   void ProcessPacket(const IPEndPoint& self_address,
                      const IPEndPoint& peer_address,
                      const QuicEncryptedPacket& packet) override;
 
   QuicClientPushPromiseIndex* push_promise_index() {
     return &push_promise_index_;
   }
 
- protected:
   virtual QuicPacketWriter* CreateQuicPacketWriter();
-  virtual QuicPacketReader* CreateQuicPacketReader();
-
-  virtual int ReadPacket(char* buffer,
-                         int buffer_len,
-                         IPEndPoint* server_address,
-                         IPAddress* client_ip);
 
   // If |fd| is an open UDP socket, unregister and close it. Otherwise, do
   // nothing.
   virtual void CleanUpUDPSocket(int fd);
 
   // Unregister and close all open UDP sockets.
   virtual void CleanUpAllUDPSockets();
 
   EpollServer* epoll_server() { return epoll_server_; }
 
@@ skipping 22 matching lines @@
     void Resend() override;
 
    private:
     QuicClient* client_;
 
     DISALLOW_COPY_AND_ASSIGN(ClientQuicDataToResend);
   };
 
   // Used during initialization: creates the UDP socket FD, sets socket options,
   // and binds the socket to our address.
-  bool CreateUDPSocket();
+  bool CreateUDPSocketAndBind();
 
   // Actually clean up |fd|.
   void CleanUpUDPSocketImpl(int fd);
 
-  // Read a UDP packet and hand it to the framer.
-  bool ReadAndProcessPacket();
-
-  // Read available UDP packets up to kNumPacketsPerReadCall
-  // and hand them to the connection.
-  // TODO(rtenneti): Add support for ReadAndProcessPackets().
-  // bool ReadAndProcessPackets();
-
   // If the request URL matches a push promise, bypass sending the
   // request.
   bool MaybeHandlePromised(const BalsaHeaders& headers,
                            const SpdyHeaderBlock& spdy_headers,
                            base::StringPiece body,
                            bool fin);
 
   // Address of the server.
   const IPEndPoint server_address_;
 
@@ skipping 20 matching lines @@
   bool initialized_;
 
   // If overflow_supported_ is true, this will be the number of packets dropped
   // during the lifetime of the server.
   QuicPacketCount packets_dropped_;
 
   // True if the kernel supports SO_RXQ_OVFL, the number of packets dropped
   // because the socket would otherwise overflow.
   bool overflow_supported_;
 
+  // If true, use recvmmsg for reading.
+  bool use_recvmmsg_;
+
   // If true, store the latest response code, headers, and body.
   bool store_response_;
   // HTTP response code from most recent response.
   size_t latest_response_code_;
   // HTTP/2 headers from most recent response.
   std::string latest_response_headers_;
   // Body of most recent response.
   std::string latest_response_body_;
   // HTTP/2 trailers from most recent response.
   std::string latest_response_trailers_;
 
   // Keeps track of any data sent before the handshake.
   std::vector<QuicDataToResend*> data_sent_before_handshake_;
 
   // Once the client receives a stateless reject, keeps track of any data that
   // must be resent upon a subsequent successful connection.
   std::vector<QuicDataToResend*> data_to_resend_on_connect_;
 
   // Point to a QuicPacketReader object on the heap. The reader allocates more
   // space than allowed on the stack.
   //
   // TODO(rtenneti): Chromium code doesn't use |packet_reader_|. Add support for
   // QuicPacketReader
-  QuicPacketReader* packet_reader_;
+  scoped_ptr<QuicPacketReader> packet_reader_;
 
   std::unique_ptr<ClientQuicDataToResend> push_promise_data_to_resend_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicClient);
 };
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_H_