commit 1f485a1cea1747c48430ca6f85da8210c2132cbf
author dschinazi <dschinazi@google.com> Mon May 13 11:57:01 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 14 06:32:07 2019 -0700
tree eb69f9b1f355fa74b6754e25518134117ade0991
parent ccbab736959d3c5f66429006ed781e8912d42392

Deprecate gfe2_reloadable_flag_quic_use_new_append_connection_id

This CL also deletes the old no-longer-used method AppendIetfConnectionId and renames AppendIetfConnectionIdsNew to AppendIetfConnectionIds.

gfe-relnote: deprecate gfe2_reloadable_flag_quic_use_new_append_connection_id
PiperOrigin-RevId: 247981508
Change-Id: If1638da16108841ab158a6fb7a56da25b5364341

quic/core/quic_framer.cc

diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index 8d0dec2..eedb45a 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -407,10 +407,10 @@
   return full_packet_number > 0 || version == QUIC_VERSION_99;
 }
 
-bool AppendIetfConnectionIdsNew(bool version_flag,
-                                QuicConnectionId destination_connection_id,
-                                QuicConnectionId source_connection_id,
-                                QuicDataWriter* writer) {
+bool AppendIetfConnectionIds(bool version_flag,
+                             QuicConnectionId destination_connection_id,
+                             QuicConnectionId source_connection_id,
+                             QuicDataWriter* writer) {
   if (!version_flag) {
     return writer->WriteConnectionId(destination_connection_id);
   }
@@ -1452,18 +1452,9 @@
     return nullptr;
   }
 
-  if (!GetQuicReloadableFlag(quic_use_new_append_connection_id)) {
-    if (!AppendIetfConnectionId(true, EmptyQuicConnectionId(),
-                                PACKET_0BYTE_CONNECTION_ID, connection_id,
-                                PACKET_8BYTE_CONNECTION_ID, &writer)) {
-      return nullptr;
-    }
-  } else {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_use_new_append_connection_id, 1, 2);
-    if (!AppendIetfConnectionIdsNew(true, EmptyQuicConnectionId(),
-                                    connection_id, &writer)) {
-      return nullptr;
-    }
+  if (!AppendIetfConnectionIds(true, EmptyQuicConnectionId(), connection_id,
+                               &writer)) {
+    return nullptr;
   }
 
   for (const ParsedQuicVersion& version : versions) {
@@ -2181,30 +2172,18 @@
   }
 
   // Append connection ID.
-  if (!QuicUtils::VariableLengthConnectionIdAllowedForVersion(
-          transport_version()) &&
-      !GetQuicReloadableFlag(quic_use_new_append_connection_id)) {
-    if (!AppendIetfConnectionId(
-            header.version_flag, header.destination_connection_id,
-            GetIncludedDestinationConnectionIdLength(header),
-            header.source_connection_id,
-            GetIncludedSourceConnectionIdLength(header), writer)) {
-      return false;
-    }
-  } else {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_use_new_append_connection_id, 2, 2);
-    if (!AppendIetfConnectionIdsNew(
-            header.version_flag,
-            header.destination_connection_id_included != CONNECTION_ID_ABSENT
-                ? header.destination_connection_id
-                : EmptyQuicConnectionId(),
-            header.source_connection_id_included != CONNECTION_ID_ABSENT
-                ? header.source_connection_id
-                : EmptyQuicConnectionId(),
-            writer)) {
-      return false;
-    }
+  if (!AppendIetfConnectionIds(
+          header.version_flag,
+          header.destination_connection_id_included != CONNECTION_ID_ABSENT
+              ? header.destination_connection_id
+              : EmptyQuicConnectionId(),
+          header.source_connection_id_included != CONNECTION_ID_ABSENT
+              ? header.source_connection_id
+              : EmptyQuicConnectionId(),
+          writer)) {
+    return false;
   }
+
   last_serialized_connection_id_ = header.destination_connection_id;
 
   if (QuicVersionHasLongHeaderLengths(transport_version()) &&
@@ -4869,34 +4848,6 @@
   return true;
 }
 
-// static
-bool QuicFramer::AppendIetfConnectionId(
-    bool version_flag,
-    QuicConnectionId destination_connection_id,
-    QuicConnectionIdLength destination_connection_id_length,
-    QuicConnectionId source_connection_id,
-    QuicConnectionIdLength source_connection_id_length,
-    QuicDataWriter* writer) {
-  if (version_flag) {
-    // Append connection ID length byte.
-    uint8_t dcil = GetConnectionIdLengthValue(destination_connection_id_length);
-    uint8_t scil = GetConnectionIdLengthValue(source_connection_id_length);
-    uint8_t connection_id_length = dcil << 4 | scil;
-    if (!writer->WriteBytes(&connection_id_length, 1)) {
-      return false;
-    }
-  }
-  if (destination_connection_id_length == PACKET_8BYTE_CONNECTION_ID &&
-      !writer->WriteConnectionId(destination_connection_id)) {
-    return false;
-  }
-  if (source_connection_id_length == PACKET_8BYTE_CONNECTION_ID &&
-      !writer->WriteConnectionId(source_connection_id)) {
-    return false;
-  }
-  return true;
-}
-
 bool QuicFramer::AppendNewTokenFrame(const QuicNewTokenFrame& frame,
                                      QuicDataWriter* writer) {
   if (!writer->WriteVarInt62(static_cast<uint64_t>(frame.token.length()))) {