Remove redundant code to report ECN marks.
End-to-end and socket API unit tests pass.
Protected by FLAGS_quic_restart_flag_quic_quiche_ecn_sockets.
PiperOrigin-RevId: 506960408
diff --git a/quiche/quic/core/quic_udp_socket_posix.cc b/quiche/quic/core/quic_udp_socket_posix.cc
index 0bbb9b7..d1d5177 100644
--- a/quiche/quic/core/quic_udp_socket_posix.cc
+++ b/quiche/quic/core/quic_udp_socket_posix.cc
@@ -469,23 +469,6 @@
packet_info->SetPeerAddress(QuicSocketAddress(raw_peer_address));
}
- if (packet_info_interested.IsSet(QuicUdpPacketInfoBit::ECN)) {
- int ecn;
- socklen_t optlen = sizeof(ecn);
- if (raw_peer_address.ss_family == AF_INET &&
- getsockopt(fd, IPPROTO_IP, IP_TOS, &ecn, &optlen) == 0) {
- packet_info->SetEcnCodepoint(
- QuicEcnCodepoint(static_cast<uint8_t>(ecn) & kEcnMask));
- } else if (raw_peer_address.ss_family == AF_INET6 &&
- getsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, &ecn, &optlen) == 0) {
- packet_info->SetEcnCodepoint(
- QuicEcnCodepoint(static_cast<uint8_t>(ecn) & kEcnMask));
- } else {
- // Fail back to not reporting ECN marks.
- packet_info->SetEcnCodepoint(ECN_NOT_ECT);
- }
- }
-
if (hdr.msg_controllen > 0) {
for (struct cmsghdr* cmsg = CMSG_FIRSTHDR(&hdr); cmsg != nullptr;
cmsg = CMSG_NXTHDR(&hdr, cmsg)) {
