commit cdc73610e28539daf6a6593fb51f3b9171038084
author dschinazi <dschinazi@google.com> Mon Mar 02 10:34:01 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Mar 02 10:34:33 2020 -0800
tree 6246c5d169aad58ab3df2573e992b4a9e91f74bd
parent dffd298aca8b8b47d885e032f449f6299af88ad8

Deprecate quic_drop_small_initial_packets

gfe-relnote: deprecate gfe2_reloadable_flag_quic_drop_small_initial_packets
PiperOrigin-RevId: 298387827
Change-Id: Ib480085897fad59930d8683d33ad294ee9ce44b8

quic/core/quic_dispatcher.cc

diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc
index a92dfb7..eac92e0 100644
--- a/quic/core/quic_dispatcher.cc
+++ b/quic/core/quic_dispatcher.cc
@@ -143,22 +143,6 @@
     framer_.set_data_producer(nullptr);
   }
 
-  // Serializes a packet containing CONNECTION_CLOSE frame and send it (without
-  // adding connection to the time wait).
-  void StatelesslyCloseConnection(const QuicSocketAddress& self_address,
-                                  const QuicSocketAddress& peer_address,
-                                  QuicErrorCode error_code,
-                                  const std::string& error_details) {
-    // TODO(rch): Remove this method when quic_drop_small_initial_packets is
-    // deprecated.
-    DCHECK(!GetQuicReloadableFlag(quic_drop_small_initial_packets));
-    SerializeConnectionClosePacket(error_code, error_details);
-
-    for (const auto& packet : *collector_.packets()) {
-      time_wait_list_manager_->SendPacket(self_address, peer_address, *packet);
-    }
-  }
-
   // 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,
@@ -458,21 +442,9 @@
         packet_info.form == IETF_QUIC_LONG_HEADER_PACKET &&
         packet_info.long_packet_type == INITIAL &&
         packet_info.packet.length() < kMinClientInitialPacketLength) {
-      if (GetQuicReloadableFlag(quic_drop_small_initial_packets)) {
-        QUIC_DVLOG(1) << "Dropping initial packet which is too short, length: "
-                      << packet_info.packet.length();
-        QUIC_CODE_COUNT(quic_drop_small_initial_packets);
-        QUIC_RELOADABLE_FLAG_COUNT(quic_drop_small_initial_packets);
-        return true;
-      }
-      StatelessConnectionTerminator terminator(
-          packet_info.destination_connection_id, packet_info.version,
-          helper_.get(), time_wait_list_manager_.get());
-      QUIC_DVLOG(1) << "Initial packet too small: "
+      QUIC_DVLOG(1) << "Dropping initial packet which is too short, length: "
                     << packet_info.packet.length();
-      terminator.StatelesslyCloseConnection(
-          packet_info.self_address, packet_info.peer_address,
-          IETF_QUIC_PROTOCOL_VIOLATION, "Initial packet too small");
+      QUIC_CODE_COUNT(quic_drop_small_initial_packets);
       return true;
     }
   }

quic/core/quic_dispatcher_test.cc

diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc
index 973e2e3..362ff81 100644
--- a/quic/core/quic_dispatcher_test.cc
+++ b/quic/core/quic_dispatcher_test.cc
@@ -1267,11 +1267,7 @@
   QuicSocketAddress client_address(QuicIpAddress::Loopback4(), 1);
 
   EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _, _, _)).Times(0);
-  if (GetQuicReloadableFlag(quic_drop_small_initial_packets)) {
-    EXPECT_CALL(*time_wait_list_manager_, SendPacket(_, _, _)).Times(0);
-  } else {
-    EXPECT_CALL(*time_wait_list_manager_, SendPacket(_, _, _)).Times(1);
-  }
+  EXPECT_CALL(*time_wait_list_manager_, SendPacket(_, _, _)).Times(0);
   EXPECT_CALL(*time_wait_list_manager_,
               AddConnectionIdToTimeWait(_, _, _, _, _))
       .Times(0);