commit 51c23735504021adf8ee0e0cc31934d468724b56
author fayang <fayang@google.com> Mon Jun 24 06:59:55 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jun 24 16:11:59 2019 -0700
tree d2f8e8c2af2d44774d0adc2d12d91ff8c2bf8411
parent ac11db0ccfbf50359538b2a1ac614570ec178fe1

gfe-relnote: Deprecate gfe2_reloadable_flag_quic_terminate_gquic_connection_as_ietf.

PiperOrigin-RevId: 254749659
Change-Id: Ia6162d26c156058f597247e7a633f7d881019834

quic/core/quic_dispatcher.cc

diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc
index f6fa002..da18b03 100644
--- a/quic/core/quic_dispatcher.cc
+++ b/quic/core/quic_dispatcher.cc
@@ -497,8 +497,7 @@
   if (connection->termination_packets() != nullptr &&
       !connection->termination_packets()->empty()) {
     action = QuicTimeWaitListManager::SEND_TERMINATION_PACKETS;
-  } else if (VersionHasIetfInvariantHeader(connection->transport_version()) ||
-             GetQuicReloadableFlag(quic_terminate_gquic_connection_as_ietf)) {
+  } else {
     if (!connection->IsHandshakeConfirmed()) {
       if (!VersionHasIetfInvariantHeader(connection->transport_version())) {
         QUIC_CODE_COUNT(gquic_add_to_time_wait_list_with_handshake_failed);
@@ -661,9 +660,7 @@
     QuicErrorCode error_code,
     const std::string& error_details,
     QuicTimeWaitListManager::TimeWaitAction action) {
-  if (format != IETF_QUIC_LONG_HEADER_PACKET &&
-      (!GetQuicReloadableFlag(quic_terminate_gquic_connection_as_ietf) ||
-       !version_flag)) {
+  if (format != IETF_QUIC_LONG_HEADER_PACKET && !version_flag) {
     QUIC_DVLOG(1) << "Statelessly terminating " << server_connection_id
                   << " based on a non-ietf-long packet, action:" << action
                   << ", error_code:" << error_code
@@ -686,10 +683,6 @@
                                              helper_.get(),
                                              time_wait_list_manager_.get());
     // This also adds the connection to time wait list.
-    if (format == GOOGLE_QUIC_PACKET) {
-      QUIC_RELOADABLE_FLAG_COUNT_N(quic_terminate_gquic_connection_as_ietf, 1,
-                                   2);
-    }
     terminator.CloseConnection(error_code, error_details,
                                format != GOOGLE_QUIC_PACKET);
     return;
@@ -707,9 +700,6 @@
       server_connection_id, EmptyQuicConnectionId(),
       /*ietf_quic=*/format != GOOGLE_QUIC_PACKET,
       ParsedQuicVersionVector{QuicVersionReservedForNegotiation()}));
-  if (format == GOOGLE_QUIC_PACKET) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_terminate_gquic_connection_as_ietf, 2, 2);
-  }
   time_wait_list_manager()->AddConnectionIdToTimeWait(
       server_connection_id, /*ietf_quic=*/format != GOOGLE_QUIC_PACKET,
       QuicTimeWaitListManager::SEND_TERMINATION_PACKETS, ENCRYPTION_INITIAL,