Remove draft 11 parsing branch from MoQControlCodec::parseFrameLength

Summary: We're not negotiating draft 11 any more

Reviewed By: sandarsh

Differential Revision: D96403898

fbshipit-source-id: c11d20b3bc025428a4696b533f694e9ef813a987

Author: Aman Sharma

moxygen/MoQCodec.cpp

@@ -45,41 +45,13 @@ folly::Expected<folly::Unit, ErrorCode> MoQControlCodec::parseFrameLength(
   uint64_t length = 0;
   size_t bytesParsed = 0;
 
-  bool parseFrameLengthAs16bit = false;
-  if (curFrameType_ == FrameType::CLIENT_SETUP ||
-      curFrameType_ == FrameType::SERVER_SETUP) {
-    parseFrameLengthAs16bit = true;
-  } else if (
-      curFrameType_ == FrameType::LEGACY_CLIENT_SETUP ||
-      curFrameType_ == FrameType::LEGACY_SERVER_SETUP) {
-    parseFrameLengthAs16bit = false;
-  } else if (!moqFrameParser_.getVersion().has_value()) {
-    XLOG(DBG4)
-        << "Received a non-setup frame before knowing the negotiated version";
-    return folly::makeUnexpected(ErrorCode::PROTOCOL_VIOLATION);
-  } else {
-    parseFrameLengthAs16bit =
-        (getDraftMajorVersion(*moqFrameParser_.getVersion()) >= 11);
-  }
-
-  if (parseFrameLengthAs16bit) {
-    if (remainingLength < 2) {
-      XLOG(DBG6) << __func__ << " underflow";
-      return folly::makeUnexpected(ErrorCode::PARSE_UNDERFLOW);
-    }
-    // Parse the length as a 16 bit integer
-    length = cursor.readBE<uint16_t>();
-    bytesParsed = 2;
-  } else {
-    // Parse the length as a varint
-    auto decodeResult = quic::follyutils::decodeQuicInteger(cursor);
-    if (!decodeResult) {
-      XLOG(DBG6) << __func__ << " underflow";
-      return folly::makeUnexpected(ErrorCode::PARSE_UNDERFLOW);
-    }
-    length = decodeResult->first;
-    bytesParsed = decodeResult->second;
+  if (remainingLength < 2) {
+    XLOG(DBG6) << __func__ << " underflow";
+    return folly::makeUnexpected(ErrorCode::PARSE_UNDERFLOW);
   }
+  // Parse the length as a 16 bit integer
+  length = cursor.readBE<uint16_t>();
+  bytesParsed = 2;
   curFrameLength_ = length;
   remainingLength -= bytesParsed;
   parseState_ = ParseState::FRAME_PAYLOAD;
@@ -460,12 +432,6 @@ folly::Expected<folly::Unit, ErrorCode> MoQControlCodec::parseFrame(
   XLOG(DBG4) << "parsing frame type=" << folly::to_underlying(curFrameType_);
   if (!seenSetup_) {
     switch (curFrameType_) {
-      case FrameType::LEGACY_CLIENT_SETUP:
-      case FrameType::LEGACY_SERVER_SETUP:
-        XLOG(WARN) << "Skipping unexpected legacy setup frame "
-                   << curFrameType_;
-        cursor.skip(curFrameLength_);
-        break;
       case FrameType::CLIENT_SETUP: {
         if (dir_ == Direction::CLIENT) {
           return folly::makeUnexpected(ErrorCode::PROTOCOL_VIOLATION);
@@ -504,9 +470,7 @@ folly::Expected<folly::Unit, ErrorCode> MoQControlCodec::parseFrame(
   }
   XCHECK(seenSetup_);
   switch (curFrameType_) {
-    case FrameType::LEGACY_CLIENT_SETUP:
     case FrameType::CLIENT_SETUP:
-    case FrameType::LEGACY_SERVER_SETUP:
     case FrameType::SERVER_SETUP:
       XLOG(ERR) << "Duplicate setup frame";
       return folly::makeUnexpected(ErrorCode::PROTOCOL_VIOLATION);

moxygen/MoQCodec.h

@@ -134,8 +134,6 @@ class MoQControlCodec : public MoQCodec {
       case FrameType::GOAWAY:
       case FrameType::CLIENT_SETUP:
       case FrameType::SERVER_SETUP:
-      case FrameType::LEGACY_CLIENT_SETUP:
-      case FrameType::LEGACY_SERVER_SETUP:
       case FrameType::MAX_REQUEST_ID:
       case FrameType::REQUESTS_BLOCKED:
       case FrameType::FETCH:

moxygen/MoQTypes.cpp

@@ -16,10 +16,6 @@ namespace {
 
 const char* getFrameTypeString(moxygen::FrameType type) {
   switch (type) {
-    case moxygen::FrameType::LEGACY_CLIENT_SETUP:
-      return "LEGACY_CLIENT_SETUP";
-    case moxygen::FrameType::LEGACY_SERVER_SETUP:
-      return "LEGACY_SERVER_SETUP";
     case moxygen::FrameType::SUBSCRIBE:
       return "SUBSCRIBE";
     case moxygen::FrameType::SUBSCRIBE_OK:
@@ -267,8 +263,6 @@ const folly::F14FastMap<TrackRequestParamKey, folly::F14FastSet<FrameType>>
 const folly::F14FastSet<FrameType> kAllowAllParamsFrameTypes = {
     FrameType::CLIENT_SETUP,
     FrameType::SERVER_SETUP,
-    FrameType::LEGACY_CLIENT_SETUP,
-    FrameType::LEGACY_SERVER_SETUP,
 };
 
 bool Parameters::isKnownParamKey(uint64_t key) {

moxygen/MoQTypes.h

@@ -180,8 +180,6 @@ enum class FrameType : uint64_t {
   PUBLISH_ERROR = 0x1F,
   CLIENT_SETUP = 0x20,
   SERVER_SETUP = 0x21,
-  LEGACY_CLIENT_SETUP = 0x40,
-  LEGACY_SERVER_SETUP = 0x41,
 };
 
 enum class DatagramType : uint64_t {