Google Git
Sign in
quiche/quiche.git/531bdc99133743c40e048c1b6f2ee94ae94d1f55^!/.
commit
531bdc99133743c40e048c1b6f2ee94ae94d1f55
[log]
author
dschinazi <dschinazi@google.com>
Tue Jun 16 06:20:10 2020 -0700
committer
Copybara-Service <copybara-worker@google.com>
Tue Jun 16 06:20:51 2020 -0700
tree
63f895a9deeea4c49fe316aba53166b906b6f165
parent
45d4e8d8bab9f966585182c0c1be86305b04b380 [diff]
Replace enable flags for draft-25 and draft-27 with disable flags

draft-27 is currently blocked because we're going to support it for a while. draft-25 is unblocked, as we're going to remove this version entirely soon.

Deprecate gfe2_reloadable_flag_quic_enable_version_draft_25_v3 and gfe2_reloadable_flag_quic_enable_version_draft_27, introduce gfe2_reloadable_flag_quic_disable_version_draft_25 and gfe2_reloadable_flag_quic_disable_version_draft_27

PiperOrigin-RevId: 316667223
Change-Id: I5584b5ceeb392d0d12fd744ad8c8ce4863c70880

diff --git a/quic/core/quic_version_manager.cc b/quic/core/quic_version_manager.cc
index 9785f9c..951b7cb 100644
--- a/quic/core/quic_version_manager.cc
+++ b/quic/core/quic_version_manager.cc

@@ -19,10 +19,10 @@
           GetQuicReloadableFlag(quic_enable_version_draft_29)),
       enable_version_draft_28_(
           GetQuicReloadableFlag(quic_enable_version_draft_28)),
-      enable_version_draft_27_(
-          GetQuicReloadableFlag(quic_enable_version_draft_27)),
-      enable_version_draft_25_(
-          GetQuicReloadableFlag(quic_enable_version_draft_25_v3)),
+      disable_version_draft_27_(
+          GetQuicReloadableFlag(quic_disable_version_draft_27)),
+      disable_version_draft_25_(
+          GetQuicReloadableFlag(quic_disable_version_draft_25)),
       disable_version_q050_(GetQuicReloadableFlag(quic_disable_version_q050)),
       disable_version_t050_(GetQuicReloadableFlag(quic_disable_version_t050)),
       disable_version_q049_(GetQuicReloadableFlag(quic_disable_version_q049)),
@@ -66,10 +66,10 @@
           GetQuicReloadableFlag(quic_enable_version_draft_29) ||
       enable_version_draft_28_ !=
           GetQuicReloadableFlag(quic_enable_version_draft_28) ||
-      enable_version_draft_27_ !=
-          GetQuicReloadableFlag(quic_enable_version_draft_27) ||
-      enable_version_draft_25_ !=
-          GetQuicReloadableFlag(quic_enable_version_draft_25_v3) ||
+      disable_version_draft_27_ !=
+          GetQuicReloadableFlag(quic_disable_version_draft_27) ||
+      disable_version_draft_25_ !=
+          GetQuicReloadableFlag(quic_disable_version_draft_25) ||
       disable_version_q050_ !=
           GetQuicReloadableFlag(quic_disable_version_q050) ||
       disable_version_t050_ !=
@@ -86,10 +86,10 @@
         GetQuicReloadableFlag(quic_enable_version_draft_29);
     enable_version_draft_28_ =
         GetQuicReloadableFlag(quic_enable_version_draft_28);
-    enable_version_draft_27_ =
-        GetQuicReloadableFlag(quic_enable_version_draft_27);
-    enable_version_draft_25_ =
-        GetQuicReloadableFlag(quic_enable_version_draft_25_v3);
+    disable_version_draft_27_ =
+        GetQuicReloadableFlag(quic_disable_version_draft_27);
+    disable_version_draft_25_ =
+        GetQuicReloadableFlag(quic_disable_version_draft_25);
     disable_version_q050_ = GetQuicReloadableFlag(quic_disable_version_q050);
     disable_version_t050_ = GetQuicReloadableFlag(quic_disable_version_t050);
     disable_version_q049_ = GetQuicReloadableFlag(quic_disable_version_q049);

diff --git a/quic/core/quic_version_manager.h b/quic/core/quic_version_manager.h
index 1375995..6bdf2d3 100644
--- a/quic/core/quic_version_manager.h
+++ b/quic/core/quic_version_manager.h

@@ -56,10 +56,10 @@
   bool enable_version_draft_29_;
   // quic_enable_version_draft_28 flag
   bool enable_version_draft_28_;
-  // quic_enable_version_draft_27 flag
-  bool enable_version_draft_27_;
-  // quic_enable_version_draft_25_v3 flag
-  bool enable_version_draft_25_;
+  // quic_disable_version_draft_27 flag
+  bool disable_version_draft_27_;
+  // quic_disable_version_draft_25 flag
+  bool disable_version_draft_25_;
   // quic_disable_version_q050 flag
   bool disable_version_q050_;
   // quic_disable_version_t050 flag

diff --git a/quic/core/quic_version_manager_test.cc b/quic/core/quic_version_manager_test.cc
index 221e296..89d1d12 100644
--- a/quic/core/quic_version_manager_test.cc
+++ b/quic/core/quic_version_manager_test.cc

@@ -22,8 +22,8 @@
                 "Supported versions out of sync");
   SetQuicReloadableFlag(quic_enable_version_draft_29, false);
   SetQuicReloadableFlag(quic_enable_version_draft_28, false);
-  SetQuicReloadableFlag(quic_enable_version_draft_27, false);
-  SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false);
+  SetQuicReloadableFlag(quic_disable_version_draft_27, true);
+  SetQuicReloadableFlag(quic_disable_version_draft_25, true);
   SetQuicReloadableFlag(quic_disable_version_t050, false);
   SetQuicReloadableFlag(quic_disable_version_q050, false);
   SetQuicReloadableFlag(quic_disable_version_q049, false);
@@ -85,7 +85,7 @@
               ElementsAre("h3-29", "h3-28", "h3-T050", "h3-Q050", "h3-Q049",
                           "h3-Q048", "h3-Q046", "h3-Q043"));
 
-  SetQuicReloadableFlag(quic_enable_version_draft_27, true);
+  SetQuicReloadableFlag(quic_disable_version_draft_27, false);
   expected_parsed_versions.insert(
       expected_parsed_versions.begin() + 2,
       ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27));
@@ -100,7 +100,7 @@
               ElementsAre("h3-29", "h3-28", "h3-27", "h3-T050", "h3-Q050",
                           "h3-Q049", "h3-Q048", "h3-Q046", "h3-Q043"));
 
-  SetQuicReloadableFlag(quic_enable_version_draft_25_v3, true);
+  SetQuicReloadableFlag(quic_disable_version_draft_25, false);
   expected_parsed_versions.insert(
       expected_parsed_versions.begin() + 3,
       ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_25));

diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index 2ca800b..55316a3 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc

@@ -421,12 +421,12 @@
       }
     } else if (version.transport_version == QUIC_VERSION_IETF_DRAFT_27) {
       QUIC_BUG_IF(version.handshake_protocol != PROTOCOL_TLS1_3);
-      if (GetQuicReloadableFlag(quic_enable_version_draft_27)) {
+      if (!GetQuicReloadableFlag(quic_disable_version_draft_27)) {
         filtered_versions.push_back(version);
       }
     } else if (version.transport_version == QUIC_VERSION_IETF_DRAFT_25) {
       QUIC_BUG_IF(version.handshake_protocol != PROTOCOL_TLS1_3);
-      if (GetQuicReloadableFlag(quic_enable_version_draft_25_v3)) {
+      if (!GetQuicReloadableFlag(quic_disable_version_draft_25)) {
         filtered_versions.push_back(version);
       }
     } else if (version.transport_version == QUIC_VERSION_50) {
@@ -689,10 +689,10 @@
     SetQuicReloadableFlag(quic_enable_version_draft_28, true);
   } else if (parsed_version.transport_version == QUIC_VERSION_IETF_DRAFT_27) {
     QUIC_BUG_IF(parsed_version.handshake_protocol != PROTOCOL_TLS1_3);
-    SetQuicReloadableFlag(quic_enable_version_draft_27, true);
+    SetQuicReloadableFlag(quic_disable_version_draft_27, false);
   } else if (parsed_version.transport_version == QUIC_VERSION_IETF_DRAFT_25) {
     QUIC_BUG_IF(parsed_version.handshake_protocol != PROTOCOL_TLS1_3);
-    SetQuicReloadableFlag(quic_enable_version_draft_25_v3, true);
+    SetQuicReloadableFlag(quic_disable_version_draft_25, false);
   } else if (parsed_version.transport_version == QUIC_VERSION_50) {
     if (parsed_version.handshake_protocol == PROTOCOL_QUIC_CRYPTO) {
       SetQuicReloadableFlag(quic_disable_version_q050, false);

diff --git a/quic/core/quic_versions_test.cc b/quic/core/quic_versions_test.cc
index b6e16f7..9b2c555 100644
--- a/quic/core/quic_versions_test.cc
+++ b/quic/core/quic_versions_test.cc

@@ -457,8 +457,8 @@
                 "Supported versions out of sync");
   SetQuicReloadableFlag(quic_enable_version_draft_29, true);
   SetQuicReloadableFlag(quic_enable_version_draft_28, true);
-  SetQuicReloadableFlag(quic_enable_version_draft_27, true);
-  SetQuicReloadableFlag(quic_enable_version_draft_25_v3, true);
+  SetQuicReloadableFlag(quic_disable_version_draft_27, false);
+  SetQuicReloadableFlag(quic_disable_version_draft_25, false);
   SetQuicReloadableFlag(quic_disable_version_t050, false);
   SetQuicReloadableFlag(quic_disable_version_q050, false);
   SetQuicReloadableFlag(quic_disable_version_q049, false);
@@ -497,8 +497,8 @@
                 "Supported versions out of sync");
   SetQuicReloadableFlag(quic_enable_version_draft_29, false);
   SetQuicReloadableFlag(quic_enable_version_draft_28, true);
-  SetQuicReloadableFlag(quic_enable_version_draft_27, true);
-  SetQuicReloadableFlag(quic_enable_version_draft_25_v3, true);
+  SetQuicReloadableFlag(quic_disable_version_draft_27, false);
+  SetQuicReloadableFlag(quic_disable_version_draft_25, false);
   SetQuicReloadableFlag(quic_disable_version_t050, false);
   SetQuicReloadableFlag(quic_disable_version_q050, false);
   SetQuicReloadableFlag(quic_disable_version_q049, false);
@@ -534,8 +534,8 @@
                 "Supported versions out of sync");
   SetQuicReloadableFlag(quic_enable_version_draft_29, false);
   SetQuicReloadableFlag(quic_enable_version_draft_28, false);
-  SetQuicReloadableFlag(quic_enable_version_draft_27, false);
-  SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false);
+  SetQuicReloadableFlag(quic_disable_version_draft_27, true);
+  SetQuicReloadableFlag(quic_disable_version_draft_25, true);
   SetQuicReloadableFlag(quic_disable_version_t050, false);
   SetQuicReloadableFlag(quic_disable_version_q050, false);
   SetQuicReloadableFlag(quic_disable_version_q049, false);
@@ -672,16 +672,16 @@
 
   {
     QuicFlagSaver flag_saver;
-    SetQuicReloadableFlag(quic_enable_version_draft_27, false);
+    SetQuicReloadableFlag(quic_disable_version_draft_27, true);
     QuicEnableVersion(parsed_version_draft_27);
-    EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_draft_27));
+    EXPECT_FALSE(GetQuicReloadableFlag(quic_disable_version_draft_27));
   }
 
   {
     QuicFlagSaver flag_saver;
-    SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false);
+    SetQuicReloadableFlag(quic_disable_version_draft_25, true);
     QuicEnableVersion(parsed_version_draft_25);
-    EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_draft_25_v3));
+    EXPECT_FALSE(GetQuicReloadableFlag(quic_disable_version_draft_25));
   }
 
   {

diff --git a/quic/test_tools/quic_test_utils.cc b/quic/test_tools/quic_test_utils.cc
index cac6d3d..8076aec 100644
--- a/quic/test_tools/quic_test_utils.cc
+++ b/quic/test_tools/quic_test_utils.cc

@@ -844,8 +844,8 @@
 void DisableQuicVersionsWithTls() {
   SetQuicReloadableFlag(quic_enable_version_draft_29, false);
   SetQuicReloadableFlag(quic_enable_version_draft_28, false);
-  SetQuicReloadableFlag(quic_enable_version_draft_27, false);
-  SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false);
+  SetQuicReloadableFlag(quic_disable_version_draft_27, true);
+  SetQuicReloadableFlag(quic_disable_version_draft_25, true);
   SetQuicReloadableFlag(quic_disable_version_t050, true);
 }