Land Recent QUIC Changes.

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_
 
@@ skipping 29 matching lines @@
  public:
   class ResponseListener {
    public:
     ResponseListener() {}
     virtual ~ResponseListener() {}
     virtual void OnCompleteResponse(QuicStreamId id,
                                     const BalsaHeaders& response_headers,
                                     const string& response_body) = 0;
   };
 
-  QuicClient(IPEndPoint server_address,
-             const QuicServerId& server_id,
-             const QuicVersionVector& supported_versions,
-             bool print_response);
+  // Create a quic client, which will have events managed by an externally owned
+  // EpollServer.
   QuicClient(IPEndPoint server_address,
              const QuicServerId& server_id,
              const QuicVersionVector& supported_versions,
              bool print_response,
-             const QuicConfig& config);
+             EpollServer* epoll_server);
+  QuicClient(IPEndPoint server_address,
+             const QuicServerId& server_id,
+             const QuicVersionVector& supported_versions,
+             bool print_response,
+             const QuicConfig& config,
+             EpollServer* epoll_server);
 
   virtual ~QuicClient();
 
   // Initializes the client to create a connection. Should be called exactly
   // once before calling StartConnect or Connect. Returns true if the
   // initialization succeeds, false otherwise.
   bool Initialize();
 
   // "Connect" to the QUIC server, including performing synchronous crypto
   // handshake.
@@ skipping 55 matching lines @@
   }
 
   IPAddressNumber bind_to_address() const { return bind_to_address_; }
 
   void set_local_port(int local_port) { local_port_ = local_port; }
 
   const IPEndPoint& server_address() const { return server_address_; }
 
   const IPEndPoint& client_address() const { return client_address_; }
 
-  EpollServer* epoll_server() { return &epoll_server_; }
+  EpollServer* epoll_server() { return epoll_server_; }
 
   int fd() { return fd_; }
 
   const QuicServerId& server_id() const { return server_id_; }
 
   // This should only be set before the initial Connect()
   void set_server_id(const QuicServerId& server_id) {
     server_id_ = server_id;
   }
 
+  void SetUserAgentID(const string& user_agent_id) {
+    crypto_config_.set_user_agent_id(user_agent_id);
+  }
+
   // SetProofVerifier sets the ProofVerifier that will be used to verify the
   // server's certificate and takes ownership of |verifier|.
   void SetProofVerifier(ProofVerifier* verifier) {
     // TODO(rtenneti): We should set ProofVerifier in QuicClientSession.
     crypto_config_.SetProofVerifier(verifier);
   }
 
   // SetChannelIDSource sets a ChannelIDSource that will be called, when the
   // server supports channel IDs, to obtain a channel ID for signing a message
   // proving possession of the channel ID. This object takes ownership of
@@ skipping 46 matching lines @@
   IPEndPoint client_address_;
 
   // If initialized, the address to bind to.
   IPAddressNumber bind_to_address_;
   // Local port to bind to. Initialize to 0.
   int local_port_;
 
   // Session which manages streams.
   scoped_ptr<QuicClientSession> session_;
   // Listens for events on the client socket.
-  EpollServer epoll_server_;
+  EpollServer* epoll_server_;
   // UDP socket.
   int fd_;
 
   // Helper to be used by created connections.
   scoped_ptr<QuicEpollConnectionHelper> helper_;
 
   // Listens for full responses.
   scoped_ptr<ResponseListener> response_listener_;
 
   // Writer used to actually send packets to the wire.
@@ skipping 22 matching lines @@
   // when the stream is closed (in OnClose).
   bool print_response_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicClient);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_H_