Deprecate --gfe2_restart_flag_quic_support_flow_label2.
PiperOrigin-RevId: 735777019
diff --git a/quiche/common/quiche_feature_flags_list.h b/quiche/common/quiche_feature_flags_list.h
index 4a60205..90f1875 100755
--- a/quiche/common/quiche_feature_flags_list.h
+++ b/quiche/common/quiche_feature_flags_list.h
@@ -58,7 +58,6 @@
QUICHE_FLAG(bool, quiche_reloadable_flag_quic_use_alarm_multiplexer, true, true, "Manages all of the connection alarms via QuicAlarmMultiplexer.")
QUICHE_FLAG(bool, quiche_reloadable_flag_quic_use_received_client_addresses_cache, true, true, "If true, use a LRU cache to record client addresses of packets received on server's original address.")
QUICHE_FLAG(bool, quiche_reloadable_flag_quic_version_negotiation_rfc, true, true, "If true, use the RFC version of the version negotiation transport parameter.")
-QUICHE_FLAG(bool, quiche_restart_flag_quic_support_flow_label2, true, true, "If true, QUIC will support reading and writing IPv6 flow labels.")
QUICHE_FLAG(bool, quiche_restart_flag_quic_support_release_time_for_gso, false, false, "If true, QuicGsoBatchWriter will support release time if it is available and the process has the permission to do so.")
QUICHE_FLAG(bool, quiche_restart_flag_quic_testonly_default_false, false, false, "A testonly restart flag that will always default to false.")
QUICHE_FLAG(bool, quiche_restart_flag_quic_testonly_default_true, true, true, "A testonly restart flag that will always default to true.")
diff --git a/quiche/quic/core/http/end_to_end_test.cc b/quiche/quic/core/http/end_to_end_test.cc
index e4ca706..c29d4f9 100644
--- a/quiche/quic/core/http/end_to_end_test.cc
+++ b/quiche/quic/core/http/end_to_end_test.cc
@@ -7900,7 +7900,6 @@
}
TEST_P(EndToEndTest, FlowLabelSend) {
- SetQuicRestartFlag(quic_support_flow_label2, true);
ASSERT_TRUE(Initialize());
const uint32_t server_flow_label = 2;
diff --git a/quiche/quic/core/quic_default_packet_writer.cc b/quiche/quic/core/quic_default_packet_writer.cc
index 1c2e564..1e0de98 100644
--- a/quiche/quic/core/quic_default_packet_writer.cc
+++ b/quiche/quic/core/quic_default_packet_writer.cc
@@ -24,10 +24,7 @@
packet_info.SetPeerAddress(peer_address);
packet_info.SetSelfIp(self_address);
packet_info.SetEcnCodepoint(params.ecn_codepoint);
- if (GetQuicRestartFlag(quic_support_flow_label2)) {
- QUIC_RESTART_FLAG_COUNT_N(quic_support_flow_label2, 3, 6);
- packet_info.SetFlowLabel(params.flow_label);
- }
+ packet_info.SetFlowLabel(params.flow_label);
WriteResult result =
QuicUdpSocketApi().WritePacket(fd_, buffer, buf_len, packet_info);
if (IsWriteBlockedStatus(result.status)) {
diff --git a/quiche/quic/core/quic_packet_reader.cc b/quiche/quic/core/quic_packet_reader.cc
index e7a4eb8..8b36e40 100644
--- a/quiche/quic/core/quic_packet_reader.cc
+++ b/quiche/quic/core/quic_packet_reader.cc
@@ -53,11 +53,8 @@
{QuicUdpPacketInfoBit::DROPPED_PACKETS,
QuicUdpPacketInfoBit::PEER_ADDRESS, QuicUdpPacketInfoBit::V4_SELF_IP,
QuicUdpPacketInfoBit::V6_SELF_IP, QuicUdpPacketInfoBit::RECV_TIMESTAMP,
- QuicUdpPacketInfoBit::TTL, QuicUdpPacketInfoBit::GOOGLE_PACKET_HEADER});
- if (GetQuicRestartFlag(quic_support_flow_label2)) {
- QUIC_RESTART_FLAG_COUNT_N(quic_support_flow_label2, 4, 6);
- info_bits.Set(QuicUdpPacketInfoBit::V6_FLOW_LABEL);
- }
+ QuicUdpPacketInfoBit::TTL, QuicUdpPacketInfoBit::GOOGLE_PACKET_HEADER,
+ QuicUdpPacketInfoBit::V6_FLOW_LABEL});
if (GetQuicReloadableFlag(quic_record_tos_byte)) {
QUIC_CODE_COUNT(quic_record_tos_byte);
// TODO: martinduke - Consolidate ECN and TOS bits.
diff --git a/quiche/quic/core/quic_udp_socket_posix.inc b/quiche/quic/core/quic_udp_socket_posix.inc
index da0d4ba..ae771f1 100644
--- a/quiche/quic/core/quic_udp_socket_posix.inc
+++ b/quiche/quic/core/quic_udp_socket_posix.inc
@@ -239,14 +239,11 @@
return false;
}
#if defined(__linux__) && !defined(__ANDROID__)
- if (GetQuicRestartFlag(quic_support_flow_label2)) {
- QUIC_RESTART_FLAG_COUNT_N(quic_support_flow_label2, 5, 6);
- if (setsockopt(fd, SOL_IPV6, IPV6_FLOWINFO, &set, sizeof(set)) != 0) {
- QUIC_LOG_FIRST_N(ERROR, 100)
- << "Failed to request to receive flow label on "
- << "IPv6 socket";
- return false;
- }
+ if (setsockopt(fd, SOL_IPV6, IPV6_FLOWINFO, &set, sizeof(set)) != 0) {
+ QUIC_LOG_FIRST_N(ERROR, 100)
+ << "Failed to request to receive flow label on "
+ << "IPv6 socket";
+ return false;
}
#endif
if (!EnableReceiveSelfIpAddressForV6(fd)) {
diff --git a/quiche/quic/core/quic_udp_socket_test.cc b/quiche/quic/core/quic_udp_socket_test.cc
index 6417c0e..149edf5 100644
--- a/quiche/quic/core/quic_udp_socket_test.cc
+++ b/quiche/quic/core/quic_udp_socket_test.cc
@@ -28,7 +28,6 @@
};
TEST_F(QuicUdpSocketTest, Basic) {
- SetQuicRestartFlag(quic_support_flow_label2, true);
const QuicSocketAddress any_address(quiche::QuicheIpAddress::Any6(), 0);
QuicUdpSocketApi socket_api;
@@ -81,7 +80,6 @@
}
TEST_F(QuicUdpSocketTest, FlowLabel) {
- SetQuicRestartFlag(quic_support_flow_label2, true);
const QuicSocketAddress any_address(quiche::QuicheIpAddress::Any6(), 0);
QuicUdpSocketApi socket_api;
