mirror of
https://github.com/facebookincubator/mvfst.git
synced 2025-07-30 14:43:05 +03:00
Remove d6d code
Summary: we're not using it Reviewed By: mjoras Differential Revision: D43482344 fbshipit-source-id: 05ac6792848e32e7c1bcf53a2df172852b5def62
This commit is contained in:
committed by
Facebook GitHub Bot
parent
62d4ef978a
commit
377260f704
@ -29,45 +29,6 @@ enum PacketBuilderType { Regular, Inplace };
|
||||
|
||||
namespace {
|
||||
|
||||
SchedulingResult sendD6DProbe(
|
||||
QuicConnectionStateBase& conn,
|
||||
uint64_t cipherOverhead,
|
||||
uint32_t probeSize,
|
||||
PacketBuilderType builderType) {
|
||||
auto connId = quic::test::getTestConnectionId();
|
||||
D6DProbeScheduler d6dProbeScheduler(
|
||||
conn, "d6d probe", cipherOverhead, probeSize);
|
||||
EXPECT_TRUE(d6dProbeScheduler.hasData());
|
||||
|
||||
ShortHeader shortHeader(
|
||||
ProtectionType::KeyPhaseZero,
|
||||
connId,
|
||||
getNextPacketNum(conn, PacketNumberSpace::AppData));
|
||||
if (builderType == PacketBuilderType::Regular) {
|
||||
RegularQuicPacketBuilder builder(
|
||||
conn.udpSendPacketLen,
|
||||
std::move(shortHeader),
|
||||
conn.ackStates.appDataAckState.largestAckedByPeer.value_or(0));
|
||||
auto result = d6dProbeScheduler.scheduleFramesForPacket(
|
||||
std::move(builder), kDefaultUDPSendPacketLen);
|
||||
EXPECT_FALSE(d6dProbeScheduler.hasData());
|
||||
return result;
|
||||
} else {
|
||||
// Just enough to build the probe
|
||||
auto simpleBufAccessor = std::make_unique<SimpleBufAccessor>(probeSize);
|
||||
InplaceQuicPacketBuilder builder(
|
||||
*simpleBufAccessor,
|
||||
conn.udpSendPacketLen,
|
||||
std::move(shortHeader),
|
||||
conn.ackStates.appDataAckState.largestAckedByPeer.value_or(0));
|
||||
auto result = d6dProbeScheduler.scheduleFramesForPacket(
|
||||
std::move(builder), kDefaultUDPSendPacketLen);
|
||||
EXPECT_FALSE(d6dProbeScheduler.hasData());
|
||||
return result;
|
||||
}
|
||||
folly::assume_unreachable();
|
||||
}
|
||||
|
||||
PacketNum addInitialOutstandingPacket(QuicConnectionStateBase& conn) {
|
||||
PacketNum nextPacketNum = getNextPacketNum(conn, PacketNumberSpace::Initial);
|
||||
std::vector<uint8_t> zeroConnIdData(quic::kDefaultConnectionIdSize, 0);
|
||||
@ -566,54 +527,6 @@ TEST_F(QuicPacketSchedulerTest, CloningSchedulerTest) {
|
||||
EXPECT_EQ(packetNum, result.packetEvent->packetNumber);
|
||||
}
|
||||
|
||||
TEST_P(QuicPacketSchedulerTest, D6DProbeSchedulerTest) {
|
||||
QuicClientConnectionState conn(
|
||||
FizzClientQuicHandshakeContext::Builder().build());
|
||||
uint64_t cipherOverhead = 2;
|
||||
uint32_t probeSize = 1450;
|
||||
auto connId = getTestConnectionId();
|
||||
D6DProbeScheduler d6dProbeScheduler(
|
||||
conn, "d6d probe", cipherOverhead, probeSize);
|
||||
EXPECT_TRUE(d6dProbeScheduler.hasData());
|
||||
|
||||
ShortHeader shortHeader(
|
||||
ProtectionType::KeyPhaseZero,
|
||||
connId,
|
||||
getNextPacketNum(conn, PacketNumberSpace::AppData));
|
||||
auto param = GetParam();
|
||||
auto result = sendD6DProbe(conn, cipherOverhead, probeSize, param);
|
||||
ASSERT_TRUE(result.packet.has_value());
|
||||
auto packetSize = result.packet->header->computeChainDataLength() +
|
||||
result.packet->body->computeChainDataLength() + cipherOverhead;
|
||||
EXPECT_EQ(packetSize, probeSize);
|
||||
}
|
||||
|
||||
TEST_P(QuicPacketSchedulerTest, NoCloningWithOnlyD6DProbes) {
|
||||
QuicClientConnectionState conn(
|
||||
FizzClientQuicHandshakeContext::Builder().build());
|
||||
uint64_t cipherOverhead = 2;
|
||||
uint32_t probeSize = 1450;
|
||||
auto param = GetParam();
|
||||
auto result = sendD6DProbe(conn, cipherOverhead, probeSize, param);
|
||||
ASSERT_TRUE(result.packet.has_value());
|
||||
auto packetSize = result.packet->header->computeChainDataLength() +
|
||||
result.packet->body->computeChainDataLength() + cipherOverhead;
|
||||
updateConnection(
|
||||
conn,
|
||||
folly::none,
|
||||
result.packet->packet,
|
||||
Clock::now(),
|
||||
packetSize,
|
||||
result.packet->body->computeChainDataLength(),
|
||||
false /* isDSRPacket */);
|
||||
ASSERT_EQ(1, conn.outstandings.packets.size());
|
||||
EXPECT_TRUE(conn.outstandings.packets.back().metadata.isD6DProbe);
|
||||
FrameScheduler noopScheduler("noopScheduler", conn);
|
||||
CloningScheduler cloningScheduler(
|
||||
noopScheduler, conn, "MarShall Mathers", cipherOverhead);
|
||||
EXPECT_FALSE(cloningScheduler.hasData());
|
||||
}
|
||||
|
||||
TEST_F(QuicPacketSchedulerTest, WriteOnlyOutstandingPacketsTest) {
|
||||
QuicClientConnectionState conn(
|
||||
FizzClientQuicHandshakeContext::Builder().build());
|
||||
@ -2437,10 +2350,5 @@ TEST_F(QuicPacketSchedulerTest, ImmediateAckFrameSchedulerNotRequested) {
|
||||
EXPECT_LT(packetLength, conn.udpSendPacketLen);
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
QuicPacketSchedulerTests,
|
||||
QuicPacketSchedulerTest,
|
||||
Values(PacketBuilderType::Regular, PacketBuilderType::Inplace));
|
||||
|
||||
} // namespace test
|
||||
} // namespace quic
|
||||
|
Reference in New Issue
Block a user