Default-enable qbone_server_use_messages This flag was mostly unused because the client's value for --qbone_client_use_messages would override it. PiperOrigin-RevId: 445226224
diff --git a/quiche/quic/qbone/qbone_client_test.cc b/quiche/quic/qbone/qbone_client_test.cc index dee4d96..5fd7229 100644 --- a/quiche/quic/qbone/qbone_client_test.cc +++ b/quiche/quic/qbone/qbone_client_test.cc
@@ -32,6 +32,8 @@ namespace test { namespace { +using ::testing::ElementsAre; + ParsedQuicVersionVector GetTestParams() { ParsedQuicVersionVector test_versions; @@ -234,13 +236,11 @@ server_thread.WaitUntil([&] { return server_ptr->data().size() >= 2; }, QuicTime::Delta::FromSeconds(5))); - std::string long_data( - QboneConstants::kMaxQbonePacketBytes - sizeof(ip6_hdr) - 1, 'A'); - // Pretend the server gets data. + std::string long_data(1000, 'A'); server_thread.Schedule([server_ptr, &long_data]() { - EXPECT_THAT(server_ptr->data()[0], testing::Eq(TestPacketOut("hello"))); - EXPECT_THAT(server_ptr->data()[1], testing::Eq(TestPacketOut("world"))); + EXPECT_THAT(server_ptr->data(), + ElementsAre(TestPacketOut("hello"), TestPacketOut("world"))); auto server_session = static_cast<QboneServerSession*>( QuicDispatcherPeer::GetFirstSessionIfAny( QuicServerPeer::GetDispatcher(server_ptr))); @@ -249,11 +249,11 @@ server_session->ProcessPacketFromNetwork(TestPacketIn(long_data)); server_session->ProcessPacketFromNetwork(TestPacketIn(long_data)); }); - ASSERT_TRUE(client.WaitForDataSize(3, QuicTime::Delta::FromSeconds(5))); - EXPECT_THAT(client.data()[0], - testing::Eq(TestPacketOut("Somethingsomething"))); - EXPECT_THAT(client.data()[1], testing::Eq(TestPacketOut(long_data))); - EXPECT_THAT(client.data()[2], testing::Eq(TestPacketOut(long_data))); + + EXPECT_TRUE(client.WaitForDataSize(3, QuicTime::Delta::FromSeconds(5))); + EXPECT_THAT(client.data(), + ElementsAre(TestPacketOut("Somethingsomething"), + TestPacketOut(long_data), TestPacketOut(long_data))); client.Disconnect(); server_thread.Quit();
diff --git a/quiche/quic/qbone/qbone_session_base.h b/quiche/quic/qbone/qbone_session_base.h index b1278bd..8295026 100644 --- a/quiche/quic/qbone/qbone_session_base.h +++ b/quiche/quic/qbone/qbone_session_base.h
@@ -89,10 +89,9 @@ QbonePacketWriter* writer_; - // If true, MESSAGE frames are used for short datagrams. If false, ephemeral - // streams are used instead. Note that receiving MESSAGE frames is always - // supported. - bool send_packets_as_messages_ = false; + // If true, send QUIC DATAGRAM (aka MESSAGE) frames instead of ephemeral + // streams. Note that receiving DATAGRAM frames is always supported. + bool send_packets_as_messages_ = true; private: // Used for the crypto handshake.