commit fe77c03183e7e78574a03871195412660028c5d4
author fayang <fayang@google.com> Mon Aug 24 18:21:32 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 24 18:22:30 2020 -0700
tree 91d5cd855d7ec24f65b99003b3cd988d49197164
parent 5d0d681bdff34159a4064ce0189bb36e0194bd1a

Deprecate gfe2_reloadable_flag_quic_determine_serialized_packet_fate_early.

PiperOrigin-RevId: 328245625
Change-Id: Ic25ebffbe1dc5f1788e5f252ec246656d7409ca4

quic/core/quic_packet_creator.cc

diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc
index 507a87a..c7f1c22 100644
--- a/quic/core/quic_packet_creator.cc
+++ b/quic/core/quic_packet_creator.cc
@@ -571,14 +571,11 @@
   // Write out the packet header
   QuicPacketHeader header;
   FillPacketHeader(&header);
-  if (determine_serialized_packet_fate_early_) {
-    packet_.fate = delegate_->GetSerializedPacketFate(
-        /*is_mtu_discovery=*/false, packet_.encryption_level);
-    QUIC_DVLOG(1) << ENDPOINT << "fate of packet " << packet_.packet_number
-                  << ": " << SerializedPacketFateToString(packet_.fate)
-                  << " of "
-                  << EncryptionLevelToString(packet_.encryption_level);
-  }
+  packet_.fate = delegate_->GetSerializedPacketFate(
+      /*is_mtu_discovery=*/false, packet_.encryption_level);
+  QUIC_DVLOG(1) << ENDPOINT << "fate of packet " << packet_.packet_number
+                << ": " << SerializedPacketFateToString(packet_.fate) << " of "
+                << EncryptionLevelToString(packet_.encryption_level);
 
   QUIC_CACHELINE_ALIGNED char stack_buffer[kMaxOutgoingPacketSize];
   QuicOwnedPacketBuffer packet_buffer(delegate_->GetPacketBuffer());
@@ -760,8 +757,7 @@
   QuicPacketHeader header;
   // FillPacketHeader increments packet_number_.
   FillPacketHeader(&header);
-  if (determine_serialized_packet_fate_early_ && delegate_ != nullptr) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_determine_serialized_packet_fate_early);
+  if (delegate_ != nullptr) {
     packet_.fate = delegate_->GetSerializedPacketFate(
         /*is_mtu_discovery=*/QuicUtils::ContainsFrameType(queued_frames_,
                                                           MTU_DISCOVERY_FRAME),
@@ -1765,36 +1761,10 @@
     needs_full_padding_ = true;
   }
 
-  if (determine_serialized_packet_fate_early_) {
-    if (packet_.fate == COALESCE ||
-        packet_.fate == LEGACY_VERSION_ENCAPSULATE) {
-      // Do not add full padding if the packet is going to be coalesced or
-      // encapsulated.
-      needs_full_padding_ = false;
-    }
-  } else {
-    // Packet coalescer pads INITIAL packets, so the creator should not.
-    if (framer_->version().CanSendCoalescedPackets() &&
-        (packet_.encryption_level == ENCRYPTION_INITIAL ||
-         packet_.encryption_level == ENCRYPTION_HANDSHAKE)) {
-      // TODO(fayang): MTU discovery packets should not ever be sent as
-      // ENCRYPTION_INITIAL or ENCRYPTION_HANDSHAKE.
-      bool is_mtu_discovery = false;
-      for (const auto& frame : packet_.nonretransmittable_frames) {
-        if (frame.type == MTU_DISCOVERY_FRAME) {
-          is_mtu_discovery = true;
-          break;
-        }
-      }
-      if (!is_mtu_discovery) {
-        // Do not add full padding if connection tries to coalesce packet.
-        needs_full_padding_ = false;
-      }
-    }
-
-    if (disable_padding_override_) {
-      needs_full_padding_ = false;
-    }
+  if (packet_.fate == COALESCE || packet_.fate == LEGACY_VERSION_ENCAPSULATE) {
+    // Do not add full padding if the packet is going to be coalesced or
+    // encapsulated.
+    needs_full_padding_ = false;
   }
 
   // Header protection requires a minimum plaintext packet size.