commit 514a27478f6cd0b359311cf81c42fb24c1abcb64
author martinduke <martinduke@google.com> Tue May 23 16:58:05 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 23 16:59:01 2023 -0700
tree da2a960654772cdfe47aed555f9385dc8379c269
parent 039c155d9adca5db528aa42fad704408514edc60

Use QuicPacketWriter::SupportsEcn interface to abandon ECN attempts.

Protected by quic_reloadable_flag_quic_send_ect1.

PiperOrigin-RevId: 534606960

quiche/quic/core/quic_connection.cc

diff --git a/quiche/quic/core/quic_connection.cc b/quiche/quic/core/quic_connection.cc
index f139005..8737453 100644
--- a/quiche/quic/core/quic_connection.cc
+++ b/quiche/quic/core/quic_connection.cc
@@ -7359,6 +7359,9 @@
     packet_writer_params_.ecn_codepoint = ecn_codepoint;
     return true;
   }
+  if (!writer_->SupportsEcn()) {
+    return false;
+  }
   switch (ecn_codepoint) {
     case ECN_NOT_ECT:
       QUICHE_DCHECK(false);

quiche/quic/core/quic_connection_test.cc

diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index 58bb93a..46f1615 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -17285,6 +17285,15 @@
   EXPECT_EQ(writer_->last_ecn_sent(), ECN_ECT1);
 }
 
+TEST_P(QuicConnectionTest, RejectEcnIfWriterDoesNotSupport) {
+  SetQuicReloadableFlag(quic_send_ect1, true);
+  MockPacketWriter mock_writer;
+  QuicConnectionPeer::SetWriter(&connection_, &mock_writer, false);
+  EXPECT_CALL(mock_writer, SupportsEcn()).WillOnce(Return(false));
+  EXPECT_FALSE(connection_.set_ecn_codepoint(ECN_ECT1));
+  EXPECT_EQ(connection_.ecn_codepoint(), ECN_NOT_ECT);
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace quic