lib/mvfst
1
0
Fork 0
mirror of https://github.com/facebookincubator/mvfst.git synced 2025-11-25 15:43:13 +03:00
Code Activity

Frame types can be > one byte.

Browse Source 
Summary: We need to internally represent them as uint64_t, in addition to parsing them as var ints.

Reviewed By: yangchi

Differential Revision: D21261466

fbshipit-source-id: 4ff7b9350cbf1dc0b58cb7ce00674430afd3ba53
This commit is contained in:
Matt Joras
2020-04-28 10:42:44 -07:00
committed by Facebook GitHub Bot
parent 9b7776d8a9
commit d2879a0e8b
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
quic/codec/Decode.cpp
View File

@@ -694,14 +694,9 @@ QuicFrame parseFrame(
const PacketHeader& header,
const CodecParameters& params) {
folly::io::Cursor cursor(queue.front());
if (!cursor.canAdvance(sizeof(FrameType))) {
throw QuicTransportException(
"Quic frame parsing: cursor cannot advance",
TransportErrorCode::FRAME_ENCODING_ERROR);
}
auto initialByte = decodeQuicInteger(cursor);
auto frameTypeInt = decodeQuicInteger(cursor);
// TODO add an new api to determine whether the frametype is encoded minimally
if (!initialByte) {
if (!frameTypeInt) {
throw QuicTransportException(
"Invalid frame-type field", TransportErrorCode::FRAME_ENCODING_ERROR);
}
@@ -715,7 +710,7 @@ QuicFrame parseFrame(
queue.trimStart(cursor - queue.front());
};
cursor.reset(queue.front());
FrameType frameType = static_cast<FrameType>(initialByte->first);
FrameType frameType = static_cast<FrameType>(frameTypeInt->first);
try {
switch (frameType) {
case FrameType::PADDING:
@@ -744,7 +739,7 @@ QuicFrame parseFrame(
case FrameType::STREAM_OFF_LEN_FIN:
isStream = true;
return QuicFrame(
decodeStreamFrame(queue, StreamTypeField(initialByte->first)));
decodeStreamFrame(queue, StreamTypeField(frameTypeInt->first)));
case FrameType::MAX_DATA:
return QuicFrame(decodeMaxDataFrame(cursor));
case FrameType::MAX_STREAM_DATA:
@@ -784,13 +779,13 @@ QuicFrame parseFrame(
error = true;
throw QuicTransportException(
folly::to<std::string>(
"Frame format invalid, type=", initialByte->first),
"Frame format invalid, type=", frameTypeInt->first),
TransportErrorCode::FRAME_ENCODING_ERROR,
frameType);
}
error = true;
throw QuicTransportException(
folly::to<std::string>("Unknown frame, type=", initialByte->first),
folly::to<std::string>("Unknown frame, type=", frameTypeInt->first),
TransportErrorCode::FRAME_ENCODING_ERROR,
frameType);
}