Create MOQTMaxRequestId and MOQTRequestsBlocked structures

Summary: Previously, we had the `MOQTMaxSubscribeId` and `MOQTSubscribesBlocked` structures. In this commit, we're switching to having the `MOQTMaxRequestId` and `MOQTRequestsBlocked` structures instead, in order to be in line with the specification.

Reviewed By: afrind

Differential Revision: D88768199

fbshipit-source-id: 8f164216107f656d5b7340fa94cb1e514893fc03

Author: Aman Sharma

moxygen/MoQSession.cpp

@@ -3657,7 +3657,7 @@ void MoQSession::onMaxRequestID(MaxRequestID maxRequestID) {
   XLOG(DBG1) << __func__ << " sess=" << this;
 
   if (logger_) {
-    logger_->logMaxSubscribeId(
+    logger_->logMaxRequestId(
         maxRequestID.requestID.value, ControlMessageType::PARSED);
   }
 
@@ -3683,7 +3683,7 @@ void MoQSession::onRequestsBlocked(RequestsBlocked requestsBlocked) {
   // and send a new MaxRequestID.
 
   if (logger_) {
-    logger_->logSubscribesBlocked(
+    logger_->logRequestsBlocked(
         requestsBlocked.maxRequestID.value, ControlMessageType::PARSED);
   }
 
@@ -4540,7 +4540,7 @@ void MoQSession::sendMaxRequestID(bool signalWriteLoop) {
   }
 
   if (logger_) {
-    logger_->logMaxSubscribeId(maxRequestID_);
+    logger_->logMaxRequestId(maxRequestID_);
   }
 
   if (signalWriteLoop) {

moxygen/mlog/MLogTypes.cpp

@@ -383,17 +383,17 @@ folly::dynamic MOQTSubscribeDone::toDynamic() const {
   return obj;
 }
 
-folly::dynamic MOQTMaxSubscribeId::toDynamic() const {
+folly::dynamic MOQTMaxRequestId::toDynamic() const {
   folly::dynamic obj = folly::dynamic::object;
   obj["type"] = type;
-  obj["maxSubscribeId"] = std::to_string(subscribeId);
+  obj["request_id"] = requestId;
   return obj;
 }
 
-folly::dynamic MOQTSubscribesBlocked::toDynamic() const {
+folly::dynamic MOQTRequestsBlocked::toDynamic() const {
   folly::dynamic obj = folly::dynamic::object;
   obj["type"] = type;
-  obj["maximumSubscribeId"] = std::to_string(maximumSubscribeId);
+  obj["maximum_request_id"] = maximumRequestId;
   return obj;
 }
 

moxygen/mlog/MLogTypes.h

@@ -360,22 +360,22 @@ class MOQTSubscribeDone : public MOQTBaseControlMessage {
   folly::Optional<std::string> reasonBytes;
 };
 
-class MOQTMaxSubscribeId : public MOQTBaseControlMessage {
+class MOQTMaxRequestId : public MOQTBaseControlMessage {
  public:
-  MOQTMaxSubscribeId() {
-    type = "max_subscribe_id";
+  MOQTMaxRequestId() {
+    type = "max_request_id";
   }
   folly::dynamic toDynamic() const override;
-  uint64_t subscribeId{0};
+  uint64_t requestId{0};
 };
 
-class MOQTSubscribesBlocked : public MOQTBaseControlMessage {
+class MOQTRequestsBlocked : public MOQTBaseControlMessage {
  public:
-  MOQTSubscribesBlocked() {
-    type = "subscribes_blocked";
+  MOQTRequestsBlocked() {
+    type = "requests_blocked";
   }
   folly::dynamic toDynamic() const override;
-  uint64_t maximumSubscribeId{0};
+  uint64_t maximumRequestId{0};
 };
 
 class MOQTAnnounce : public MOQTBaseControlMessage {

moxygen/mlog/MLogger.cpp

@@ -532,16 +532,6 @@ void MLogger::logSubscribeDone(
       controlType, kFirstBidiStreamId, folly::none, std::move(baseMsg));
 }
 
-void MLogger::logMaxSubscribeId(
-    const uint64_t maxRequestID,
-    ControlMessageType controlType) {
-  auto baseMsg = std::make_unique<MOQTMaxSubscribeId>();
-  baseMsg->subscribeId = maxRequestID;
-
-  logControlMessage(
-      controlType, kFirstBidiStreamId, folly::none, std::move(baseMsg));
-}
-
 void MLogger::logUnannounce(
     const Unannounce& req,
     const MOQTByteStringType& type,
@@ -601,11 +591,21 @@ void MLogger::logTrackStatusError(
       controlType, kFirstBidiStreamId, folly::none, std::move(baseMsg));
 }
 
-void MLogger::logSubscribesBlocked(
-    const uint64_t maxRequestID,
+void MLogger::logMaxRequestId(
+    const uint64_t requestId,
+    ControlMessageType controlType) {
+  auto baseMsg = std::make_unique<MOQTMaxRequestId>();
+  baseMsg->requestId = requestId;
+
+  logControlMessage(
+      controlType, kFirstBidiStreamId, folly::none, std::move(baseMsg));
+}
+
+void MLogger::logRequestsBlocked(
+    const uint64_t maximumRequestId,
     ControlMessageType controlType) {
-  auto baseMsg = std::make_unique<MOQTSubscribesBlocked>();
-  baseMsg->maximumSubscribeId = maxRequestID;
+  auto baseMsg = std::make_unique<MOQTRequestsBlocked>();
+  baseMsg->maximumRequestId = maximumRequestId;
 
   logControlMessage(
       controlType, kFirstBidiStreamId, folly::none, std::move(baseMsg));

moxygen/mlog/MLogger.h

@@ -114,11 +114,11 @@ class MLogger {
   void logSubscribeDone(
       const SubscribeDone& req,
       ControlMessageType controlType = ControlMessageType::CREATED);
-  void logMaxSubscribeId(
-      const uint64_t maxRequestID,
+  void logMaxRequestId(
+      const uint64_t requestId,
       ControlMessageType controlType = ControlMessageType::CREATED);
-  void logSubscribesBlocked(
-      const uint64_t maxRequestID,
+  void logRequestsBlocked(
+      const uint64_t maximumRequestId,
       ControlMessageType controlType = ControlMessageType::CREATED);
   void logAnnounce(
       const Announce& req,