Land Recent QUIC changes.

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 45 matching lines @@
 }
 
 QuicClient::~QuicClient() {
   if (connected()) {
     session()->connection()
         ->SendConnectionClosePacket(QUIC_PEER_GOING_AWAY, std::string());
   }
 }
 
 bool QuicClient::Initialize() {
+  DCHECK(!initialized_);
+
   epoll_server_.set_timeout_in_us(50 * 1000);
   crypto_config_.SetDefaults();
   int address_family = server_address_.GetSockAddrFamily();
 
   fd_ = socket(address_family, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP);
   if (fd_ < 0) {
     LOG(ERROR) << "CreateSocket() failed: " << strerror(errno);
     return false;
   }
 
@@ skipping 84 matching lines @@
       session_->connection()->connected();
 }
 
 void QuicClient::Disconnect() {
   DCHECK(connected());
 
   session()->connection()->SendConnectionClose(QUIC_PEER_GOING_AWAY);
   epoll_server_.UnregisterFD(fd_);
   close(fd_);
   fd_ = -1;
+  initialized_ = false;
 }
 
 void QuicClient::SendRequestsAndWaitForResponse(int argc, char *argv[]) {
   for (int i = 1; i < argc; ++i) {
     BalsaHeaders headers;
     headers.SetRequestFirstlineFromStringPieces("GET", argv[i], "HTTP/1.1");
     CreateReliableClientStream()->SendRequest(headers, "", true);
   }
 
   while (WaitForEvents()) { }
@@ skipping 78 matching lines @@
   }
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net