gfe-relnote: Deprecate --gfe2_reloadable_flag_quic_simplify_build_connectivity_probing_packet
PiperOrigin-RevId: 240456694
Change-Id: I03891efba45de734b3a5bff970a5152772fd9d81
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index 2594497..a3542d3 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -1258,7 +1258,7 @@
return writer->length();
}
-size_t QuicFramer::BuildConnectivityProbingPacketNew(
+size_t QuicFramer::BuildConnectivityProbingPacket(
const QuicPacketHeader& header,
char* buffer,
size_t packet_length,
@@ -1276,48 +1276,6 @@
return BuildDataPacket(header, frames, buffer, packet_length, level);
}
-size_t QuicFramer::BuildConnectivityProbingPacket(
- const QuicPacketHeader& header,
- char* buffer,
- size_t packet_length,
- EncryptionLevel level) {
- if (transport_version() == QUIC_VERSION_99 ||
- QuicVersionHasLongHeaderLengths(transport_version()) ||
- GetQuicReloadableFlag(quic_simplify_build_connectivity_probing_packet)) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_simplify_build_connectivity_probing_packet);
- // TODO(rch): Remove this method when the flag is deprecated.
- return BuildConnectivityProbingPacketNew(header, buffer, packet_length,
- level);
- }
-
- QuicDataWriter writer(packet_length, buffer);
-
- if (!AppendPacketHeader(header, &writer, nullptr)) {
- QUIC_BUG << "AppendPacketHeader failed";
- return 0;
- }
-
- // Write a PING frame, which has no data payload.
- QuicPingFrame ping_frame;
- if (!AppendTypeByte(QuicFrame(ping_frame), false, &writer)) {
- QUIC_BUG << "AppendTypeByte failed for ping frame in probing packet";
- return 0;
- }
- // Add padding to the rest of the packet.
- QuicPaddingFrame padding_frame;
- if (!AppendTypeByte(QuicFrame(padding_frame), true, &writer)) {
- QUIC_BUG << "AppendTypeByte failed for padding frame in probing packet";
- return 0;
- }
- if (!AppendPaddingFrame(padding_frame, &writer)) {
- QUIC_BUG << "AppendPaddingFrame of " << padding_frame.num_padding_bytes
- << " failed";
- return 0;
- }
-
- return writer.length();
-}
-
size_t QuicFramer::BuildPaddedPathChallengePacket(
const QuicPacketHeader& header,
char* buffer,
diff --git a/quic/core/quic_framer.h b/quic/core/quic_framer.h
index 6e5b6aa..d8c135a 100644
--- a/quic/core/quic_framer.h
+++ b/quic/core/quic_framer.h
@@ -390,13 +390,6 @@
size_t packet_length,
EncryptionLevel level);
- // Serializes a probing packet, which is a padded PING packet. Returns the
- // length of the packet. Returns 0 if it fails to serialize.
- size_t BuildConnectivityProbingPacketNew(const QuicPacketHeader& header,
- char* buffer,
- size_t packet_length,
- EncryptionLevel level);
-
// Serialize a probing packet that uses IETF QUIC's PATH CHALLENGE frame. Also
// fills the packet with padding.
size_t BuildPaddedPathChallengePacket(const QuicPacketHeader& header,
