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 109 matching lines @@
 bool QuicClient::Connect() {
   if (!StartConnect()) {
     return false;
   }
   while (CryptoHandshakeInProgress()) {
     WaitForEvents();
   }
   return session_->connection()->connected();
 }
 
-
 bool QuicClient::StartConnect() {
   DCHECK(!connected() && initialized_);
 
   QuicGuid guid = QuicRandom::GetInstance()->RandUint64();
   session_.reset(new QuicClientSession(
       server_hostname_,
       config_,
       new QuicConnection(guid, server_address_,
                          new QuicEpollConnectionHelper(fd_, &epoll_server_),
                          false),
       &crypto_config_));
   return session_->CryptoConnect();
 }
 
 bool QuicClient::CryptoHandshakeInProgress() {
   return !session_->IsCryptoHandshakeComplete() &&
       session_->connection()->connected();
 }
 
 void QuicClient::Disconnect() {
   DCHECK(connected());
 
   session()->connection()->SendConnectionClose(QUIC_PEER_GOING_AWAY);
   epoll_server_.UnregisterFD(fd_);
   close(fd_);
   fd_ = -1;
-  session_.reset();
 }
 
 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 17 matching lines @@
   DCHECK(connected());
 
   epoll_server_.WaitForEventsAndExecuteCallbacks();
   return session_->num_active_requests() != 0;
 }
 
 void QuicClient::OnEvent(int fd, EpollEvent* event) {
   DCHECK_EQ(fd, fd_);
 
   if (event->in_events & EPOLLIN) {
-    while (ReadAndProcessPacket()) {
+    while (connected() && ReadAndProcessPacket()) {
     }
   }
-  if (event->in_events & EPOLLOUT) {
+  if (connected() && (event->in_events & EPOLLOUT)) {
     session_->connection()->OnCanWrite();
   }
   if (event->in_events & EPOLLERR) {
     DLOG(INFO) << "Epollerr";
   }
 }
 
 QuicPacketCreator::Options* QuicClient::options() {
   if (session() == NULL) {
     return NULL;
@@ skipping 37 matching lines @@
   }
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net