commit c303bfdc9cbbc39eccce46e1c53ef2daa38c60af
author fayang <fayang@google.com> Tue Feb 11 09:19:54 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Feb 11 09:20:31 2020 -0800
tree 28eb99db52a501dae5af0211ef9f92958513a5e0
parent b296fb8b1ecec8474b7af94b47d5f29346d1e3e3

gfe-relnote: In QUIC, send connection close for all available encryption levels with TLS handshake. Protected by blocked gfe2_reloadable_flag_quic_enable_version_t*.

Also false deprecate blocked gfe2_reloadable_flag_quic_close_all_encryptions_levels2.

PiperOrigin-RevId: 294453534
Change-Id: I5537b4201e19c01fed3f48a923f28dfeab3ad991

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 1677990..3040a06 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -2923,7 +2923,7 @@
 
 void QuicConnection::SendConnectionClosePacket(QuicErrorCode error,
                                                const std::string& details) {
-  if (!GetQuicReloadableFlag(quic_close_all_encryptions_levels2)) {
+  if (!SupportsMultiplePacketNumberSpaces()) {
     QUIC_DLOG(INFO) << ENDPOINT << "Sending connection close packet.";
     SetDefaultEncryptionLevel(GetConnectionCloseEncryptionLevel());
     if (version().CanSendCoalescedPackets()) {
@@ -2953,7 +2953,6 @@
   }
   const EncryptionLevel current_encryption_level = encryption_level_;
   ScopedPacketFlusher flusher(this);
-  QUIC_RELOADABLE_FLAG_COUNT(quic_close_all_encryptions_levels2);
 
   // Now that the connection is being closed, discard any unsent packets
   // so the only packets to be sent will be connection close packets.

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 40d5278..704241c 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -8114,7 +8114,9 @@
 }
 
 TEST_P(QuicConnectionTest, CloseConnectionAllLevels) {
-  SetQuicReloadableFlag(quic_close_all_encryptions_levels2, true);
+  if (!connection_.SupportsMultiplePacketNumberSpaces()) {
+    return;
+  }
 
   EXPECT_CALL(visitor_, OnConnectionClosed(_, _));
   const QuicErrorCode kQuicErrorCode = QUIC_INTERNAL_ERROR;
@@ -8152,7 +8154,9 @@
 }
 
 TEST_P(QuicConnectionTest, CloseConnectionOneLevel) {
-  SetQuicReloadableFlag(quic_close_all_encryptions_levels2, false);
+  if (connection_.SupportsMultiplePacketNumberSpaces()) {
+    return;
+  }
 
   EXPECT_CALL(visitor_, OnConnectionClosed(_, _));
   const QuicErrorCode kQuicErrorCode = QUIC_INTERNAL_ERROR;