lib/mvfst
1
0
Fork 0
mirror of https://github.com/facebookincubator/mvfst.git synced 2025-11-10 21:22:20 +03:00
Code Activity

Interpret varint in MAX_STREAMS_FRAME as count and not as stream-id

Browse Source 
Summary: post draft-17 it is interpreted as count not the max stream id

Reviewed By: mjoras

Differential Revision: D15523021

fbshipit-source-id: 779a1c5269eb8dbcdcd169303caa7a65e467339c
This commit is contained in:
Udip Pant
2019-05-28 14:45:54 -07:00
committed by Facebook Github Bot
parent 743ac19fa7
commit b64e4f99ef
5 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
quic/codec/test/QuicWriteCodecTest.cpp
View File

@@ -945,49 +945,55 @@ TEST_F(QuicWriteCodecTest, NoSpaceForMaxData) {
}
TEST_F(QuicWriteCodecTest, WriteMaxStreamId) {
MockQuicPacketBuilder pktBuilder;
setupCommonExpects(pktBuilder);
StreamId maxStream = 0x1234;
bool isBidirectional = true;
MaxStreamsFrame maxStreamIdFrame(maxStream, isBidirectional);
auto bytesWritten = writeFrame(maxStreamIdFrame, pktBuilder);
for (uint64_t i = 0; i < 100; i++) {
MockQuicPacketBuilder pktBuilder;
setupCommonExpects(pktBuilder);
uint64_t maxStream = i;
bool isBidirectional = true;
MaxStreamsFrame maxStreamsFrame(maxStream, isBidirectional);
auto bytesWritten = writeFrame(maxStreamsFrame, pktBuilder);
auto builtOut = std::move(pktBuilder).buildPacket();
auto regularPacket = builtOut.first;
// 1 byte for the type and 2 bytes for the stream id.
EXPECT_EQ(1 + 2, bytesWritten);
auto resultMaxStreamIdFrame =
boost::get<MaxStreamsFrame>(regularPacket.frames[0]);
EXPECT_EQ(0x1234, resultMaxStreamIdFrame.maxStreams);
auto builtOut = std::move(pktBuilder).buildPacket();
auto regularPacket = builtOut.first;
auto streamCountSize = i < 64 ? 1 : 2;
// 1 byte for the type and up to 2 bytes for the stream count.
EXPECT_EQ(1 + streamCountSize, bytesWritten);
auto resultMaxStreamIdFrame =
boost::get<MaxStreamsFrame>(regularPacket.frames[0]);
EXPECT_EQ(i, resultMaxStreamIdFrame.maxStreams);
auto wireBuf = std::move(builtOut.second);
folly::io::Cursor cursor(wireBuf.get());
auto wireStreamIdFrame = boost::get<MaxStreamsFrame>(parseQuicFrame(cursor));
EXPECT_EQ(0x1234, wireStreamIdFrame.maxStreams);
EXPECT_TRUE(cursor.isAtEnd());
auto wireBuf = std::move(builtOut.second);
folly::io::Cursor cursor(wireBuf.get());
auto wireStreamsFrame = boost::get<MaxStreamsFrame>(parseQuicFrame(cursor));
EXPECT_EQ(i, wireStreamsFrame.maxStreams);
EXPECT_TRUE(cursor.isAtEnd());
}
}
TEST_F(QuicWriteCodecTest, WriteUniMaxStreamId) {
MockQuicPacketBuilder pktBuilder;
setupCommonExpects(pktBuilder);
StreamId maxStream = 0x1233;
bool isBidirectional = false;
MaxStreamsFrame maxStreamIdFrame(maxStream, isBidirectional);
auto bytesWritten = writeFrame(maxStreamIdFrame, pktBuilder);
for (uint64_t i = 0; i < 100; i++) {
MockQuicPacketBuilder pktBuilder;
setupCommonExpects(pktBuilder);
uint64_t maxStream = i;
bool isBidirectional = false;
MaxStreamsFrame maxStreamsFrame(maxStream, isBidirectional);
auto bytesWritten = writeFrame(maxStreamsFrame, pktBuilder);
auto builtOut = std::move(pktBuilder).buildPacket();
auto regularPacket = builtOut.first;
// 1 byte for the type and 2 bytes for the stream id.
EXPECT_EQ(1 + 2, bytesWritten);
auto resultMaxStreamIdFrame =
boost::get<MaxStreamsFrame>(regularPacket.frames[0]);
EXPECT_EQ(0x1233, resultMaxStreamIdFrame.maxStreams);
auto builtOut = std::move(pktBuilder).buildPacket();
auto regularPacket = builtOut.first;
auto streamCountSize = i < 64 ? 1 : 2;
// 1 byte for the type and up to 2 bytes for the stream count.
EXPECT_EQ(1 + streamCountSize, bytesWritten);
auto resultMaxStreamIdFrame =
boost::get<MaxStreamsFrame>(regularPacket.frames[0]);
EXPECT_EQ(i, resultMaxStreamIdFrame.maxStreams);
auto wireBuf = std::move(builtOut.second);
folly::io::Cursor cursor(wireBuf.get());
auto wireStreamIdFrame = boost::get<MaxStreamsFrame>(parseQuicFrame(cursor));
EXPECT_EQ(0x1233, wireStreamIdFrame.maxStreams);
EXPECT_TRUE(cursor.isAtEnd());
auto wireBuf = std::move(builtOut.second);
folly::io::Cursor cursor(wireBuf.get());
auto wireStreamsFrame = boost::get<MaxStreamsFrame>(parseQuicFrame(cursor));
EXPECT_EQ(i, wireStreamsFrame.maxStreams);
EXPECT_TRUE(cursor.isAtEnd());
}
}
TEST_F(QuicWriteCodecTest, NoSpaceForMaxStreamId) {