commit 08878bdab9bb1039ebc1b934bd73a7873f763599
author fayang <fayang@google.com> Thu Jun 20 09:21:43 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 21 06:29:01 2019 -0700
tree e0a6460a9a3b70a6c99298f576f79454d24dd097
parent 77ae31cbfb5bf41299c8c10a06a205a8a0d37cae

gfe-relnote: Deprecate gfe2_reloadable_flag_quic_validate_packet_number_post_decryption.

PiperOrigin-RevId: 254210958
Change-Id: If2887b57857c76b4ec39123c1875b03e3fc1bff5

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index b9c74ec..6bfefd5 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -330,18 +330,12 @@
       release_time_into_future_(QuicTime::Delta::Zero()),
       no_version_negotiation_(supported_versions.size() == 1),
       retry_has_been_parsed_(false),
-      validate_packet_number_post_decryption_(
-          GetQuicReloadableFlag(quic_validate_packet_number_post_decryption)),
       use_uber_received_packet_manager_(
-          validate_packet_number_post_decryption_ &&
           GetQuicReloadableFlag(quic_use_uber_received_packet_manager)) {
   if (perspective_ == Perspective::IS_SERVER &&
       supported_versions.size() == 1) {
     QUIC_RESTART_FLAG_COUNT(quic_no_server_conn_ver_negotiation2);
   }
-  if (validate_packet_number_post_decryption_) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_validate_packet_number_post_decryption);
-  }
   if (use_uber_received_packet_manager_) {
     QUIC_RELOADABLE_FLAG_COUNT(quic_use_uber_received_packet_manager);
   }
@@ -847,31 +841,6 @@
     return false;
   }
 
-  // If this packet has already been seen, or the sender has told us that it
-  // will not be retransmitted, then stop processing the packet.
-  if (!validate_packet_number_post_decryption_) {
-    const bool is_awaiting =
-        use_uber_received_packet_manager_
-            ? uber_received_packet_manager_.IsAwaitingPacket(
-                  last_decrypted_packet_level_, header.packet_number)
-            : received_packet_manager_.IsAwaitingPacket(header.packet_number);
-    if (!is_awaiting) {
-      if (framer_.IsIetfStatelessResetPacket(header)) {
-        QuicIetfStatelessResetPacket packet(
-            header, header.possible_stateless_reset_token);
-        OnAuthenticatedIetfStatelessResetPacket(packet);
-        return false;
-      }
-      QUIC_DLOG(INFO) << ENDPOINT << "Packet " << header.packet_number
-                      << " no longer being waited for.  Discarding.";
-      if (debug_visitor_ != nullptr) {
-        debug_visitor_->OnDuplicatePacket(header.packet_number);
-      }
-      ++stats_.packets_dropped;
-      return false;
-    }
-  }
-
   if (version_negotiation_state_ != NEGOTIATED_VERSION &&
       perspective_ == Perspective::IS_SERVER) {
     if (!header.version_flag) {
@@ -2043,27 +2012,27 @@
 
 bool QuicConnection::ValidateReceivedPacketNumber(
     QuicPacketNumber packet_number) {
-  if (validate_packet_number_post_decryption_) {
-    const bool is_awaiting =
-        use_uber_received_packet_manager_
-            ? uber_received_packet_manager_.IsAwaitingPacket(
-                  last_decrypted_packet_level_, packet_number)
-            : received_packet_manager_.IsAwaitingPacket(packet_number);
-    if (!is_awaiting) {
-      if (use_uber_received_packet_manager_) {
-        QUIC_DLOG(INFO) << ENDPOINT << "Packet " << packet_number
-                        << " no longer being waited for at level "
-                        << static_cast<int>(last_decrypted_packet_level_)
-                        << ".  Discarding.";
-      } else {
-        QUIC_DLOG(INFO) << ENDPOINT << "Packet " << packet_number
-                        << " no longer being waited for.  Discarding.";
-      }
-      if (debug_visitor_ != nullptr) {
-        debug_visitor_->OnDuplicatePacket(packet_number);
-      }
-      return false;
+  // If this packet has already been seen, or the sender has told us that it
+  // will not be retransmitted, then stop processing the packet.
+  const bool is_awaiting =
+      use_uber_received_packet_manager_
+          ? uber_received_packet_manager_.IsAwaitingPacket(
+                last_decrypted_packet_level_, packet_number)
+          : received_packet_manager_.IsAwaitingPacket(packet_number);
+  if (!is_awaiting) {
+    if (use_uber_received_packet_manager_) {
+      QUIC_DLOG(INFO) << ENDPOINT << "Packet " << packet_number
+                      << " no longer being waited for at level "
+                      << static_cast<int>(last_decrypted_packet_level_)
+                      << ".  Discarding.";
+    } else {
+      QUIC_DLOG(INFO) << ENDPOINT << "Packet " << packet_number
+                      << " no longer being waited for.  Discarding.";
     }
+    if (debug_visitor_ != nullptr) {
+      debug_visitor_->OnDuplicatePacket(packet_number);
+    }
+    return false;
   }
 
   if (use_uber_received_packet_manager_) {