Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/tools/quic/quic_dispatcher.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_dispatcher.h"
 
 #include <utility>
 
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
@@ skipping 72 matching lines @@
 class StatelessConnectionTerminator {
  public:
   StatelessConnectionTerminator(QuicConnectionId connection_id,
                                 QuicFramer* framer,
                                 QuicConnectionHelperInterface* helper,
                                 QuicTimeWaitListManager* time_wait_list_manager)
       : connection_id_(connection_id),
         framer_(framer),
         creator_(connection_id,
                  framer,
-                 helper->GetRandomGenerator(),
                  helper->GetBufferAllocator(),
                  &collector_),
         time_wait_list_manager_(time_wait_list_manager) {}
 
   // Generates a packet containing a CONNECTION_CLOSE frame specifying
   // |error_code| and |error_details| and add the connection to time wait.
   void CloseConnection(QuicErrorCode error_code,
                        const std::string& error_details) {
     QuicConnectionCloseFrame* frame = new QuicConnectionCloseFrame;
     frame->error_code = error_code;
@@ skipping 201 matching lines @@
     return HandlePacketForTimeWait(header);
   }
 
   // The packet has an unknown connection ID.
 
   // Unless the packet provides a version, assume that we can continue
   // processing using our preferred version.
   QuicVersion version = GetSupportedVersions().front();
   if (header.version_flag) {
     QuicVersion packet_version = header.versions.front();
+    if (FLAGS_quic_fix_version_manager &&
+        framer_.supported_versions() != GetSupportedVersions()) {
+      // Reset framer's version if version flags change in flight.
+      framer_.SetSupportedVersions(GetSupportedVersions());
+    }
     if (!framer_.IsSupportedVersion(packet_version)) {
       if (ShouldCreateSessionForUnknownVersion(framer_.last_version_tag())) {
         return true;
       }
       // Since the version is not supported, send a version negotiation
       // packet and stop processing the current packet.
       time_wait_list_manager()->SendVersionNegotiationPacket(
           connection_id, GetSupportedVersions(), current_server_address_,
           current_client_address_);
       return false;
@@ skipping 97 matching lines @@
   // set.  Since this may be a client continuing a connection we lost track of
   // via server restart, send a rejection to fast-fail the connection.
   if (!header.public_header.version_flag) {
     DVLOG(1) << "Packet without version arrived for unknown connection ID "
              << header.public_header.connection_id;
     return kFateTimeWait;
   }
 
   // Check that the sequence number is within the range that the client is
   // expected to send before receiving a response from the server.
+  const int kInvalidPacketNumber = 0;
   if (header.packet_number == kInvalidPacketNumber ||
       header.packet_number > kMaxReasonableInitialPacketNumber) {
     return kFateTimeWait;
   }
 
   return kFateProcess;
 }
 
 void QuicDispatcher::CleanUpSession(SessionMap::iterator it,
                                     QuicConnection* connection,
@@ skipping 44 matching lines @@
   DeleteSessions();
 }
 
 void QuicDispatcher::OnConnectionClosed(QuicConnectionId connection_id,
                                         QuicErrorCode error,
                                         const string& error_details) {
   SessionMap::iterator it = session_map_.find(connection_id);
   if (it == session_map_.end()) {
     QUIC_BUG << "ConnectionId " << connection_id
              << " does not exist in the session map.  Error: "
-             << QuicUtils::ErrorToString(error);
+             << QuicErrorCodeToString(error);
     QUIC_BUG << base::debug::StackTrace().ToString();
     return;
   }
 
   DVLOG_IF(1, error != QUIC_NO_ERROR)
       << "Closing connection (" << connection_id
-      << ") due to error: " << QuicUtils::ErrorToString(error)
+      << ") due to error: " << QuicErrorCodeToString(error)
       << ", with details: " << error_details;
 
   if (closed_session_list_.empty()) {
     delete_sessions_alarm_->Update(helper()->GetClock()->ApproximateNow(),
                                    QuicTime::Delta::Zero());
   }
   QuicConnection* connection = it->second->connection();
   closed_session_list_.push_back(std::move(it->second));
   const bool should_close_statelessly =
       (error == QUIC_CRYPTO_HANDSHAKE_STATELESS_REJECT);
@@ skipping 15 matching lines @@
 void QuicDispatcher::OnConnectionAddedToTimeWaitList(
     QuicConnectionId connection_id) {
   DVLOG(1) << "Connection " << connection_id << " added to time wait list.";
 }
 
 void QuicDispatcher::OnPacket() {}
 
 void QuicDispatcher::OnError(QuicFramer* framer) {
   QuicErrorCode error = framer->error();
   SetLastError(error);
-  DVLOG(1) << QuicUtils::ErrorToString(error);
+  DVLOG(1) << QuicErrorCodeToString(error);
 }
 
 bool QuicDispatcher::ShouldCreateSessionForUnknownVersion(QuicTag version_tag) {
   return false;
 }
 
 bool QuicDispatcher::OnProtocolVersionMismatch(
     QuicVersion /*received_version*/) {
   QUIC_BUG_IF(!time_wait_list_manager_->IsConnectionIdInTimeWait(
                   current_connection_id_) &&
               !ShouldCreateSessionForUnknownVersion(framer_.last_version_tag()))
       << "Unexpected version mismatch: "
-      << QuicUtils::TagToString(framer_.last_version_tag());
+      << QuicTagToString(framer_.last_version_tag());
 
   // Keep processing after protocol mismatch - this will be dealt with by the
   // time wait list or connection that we will create.
   return true;
 }
 
 void QuicDispatcher::OnPublicResetPacket(
     const QuicPublicResetPacket& /*packet*/) {
   DCHECK(false);
 }
@@ skipping 149 matching lines @@
     ShouldCreateOrBufferPacketForConnection(connection_id);
   }
 }
 
 void QuicDispatcher::ProcessChlo() {
   if (FLAGS_quic_create_session_after_insertion &&
       !buffered_packets_.HasBufferedPackets(current_connection_id_) &&
       !ShouldCreateOrBufferPacketForConnection(current_connection_id_)) {
     return;
   }
-
-  if (FLAGS_quic_limit_num_new_sessions_per_epoll_loop &&
+  if (FLAGS_quic_allow_chlo_buffering &&
+      FLAGS_quic_limit_num_new_sessions_per_epoll_loop &&
       new_sessions_allowed_per_event_loop_ <= 0) {
     // Can't create new session any more. Wait till next event loop.
     if (!buffered_packets_.HasChloForConnection(current_connection_id_)) {
       // Only buffer one CHLO per connection. Remove this condition check when
       // --gfe2_reloadable_flag_quic_buffer_packets_after_chlo
       // is deprecated because after that retransmitted CHLO should be buffered
       // earlier in OnUnauthenticatedPublicHeader().
       bool is_new_connection =
           !buffered_packets_.HasBufferedPackets(current_connection_id_);
       EnqueuePacketResult rs = buffered_packets_.EnqueuePacket(
@@ skipping 87 matching lines @@
   IPEndPoint current_client_address_;
   IPEndPoint current_server_address_;
   std::unique_ptr<QuicReceivedPacket> current_packet_;
   QuicPacketNumber packet_number_;
   QuicVersion first_version_;
 };
 
 void QuicDispatcher::MaybeRejectStatelessly(QuicConnectionId connection_id,
                                             const QuicPacketHeader& header) {
   // TODO(rch): This logic should probably live completely inside the rejector.
-  if (!FLAGS_quic_use_cheap_stateless_rejects ||
+  if (!FLAGS_quic_allow_chlo_buffering ||
+      !FLAGS_quic_use_cheap_stateless_rejects ||
       !FLAGS_enable_quic_stateless_reject_support ||
-      header.public_header.versions.front() <= QUIC_VERSION_32 ||
       !ShouldAttemptCheapStatelessRejection()) {
     // Not use cheap stateless reject.
-    if (!ChloExtractor::Extract(*current_packet_, GetSupportedVersions(),
+    if (FLAGS_quic_allow_chlo_buffering &&
+        !ChloExtractor::Extract(*current_packet_, GetSupportedVersions(),
                                 nullptr)) {
       // Buffer non-CHLO packets.
       ProcessUnauthenticatedHeaderFate(kFateBuffer, connection_id,
                                        header.packet_number);
       return;
     }
     ProcessUnauthenticatedHeaderFate(kFateProcess, connection_id,
                                      header.packet_number);
     return;
   }
@@ skipping 139 matching lines @@
 void QuicDispatcher::DeliverPacketsToSession(
     const std::list<BufferedPacket>& packets,
     QuicSession* session) {
   for (const BufferedPacket& packet : packets) {
     session->ProcessUdpPacket(packet.server_address, packet.client_address,
                               *(packet.packet));
   }
 }
 
 }  // namespace net