Skip to content

Commit 1b6213a

Browse files
Aman Sharmameta-codesync[bot]
authored andcommitted
Update MOQTFetchHeaderCreated/Parsed structures
Reviewed By: afrind Differential Revision: D88781852 fbshipit-source-id: 05908057379852351179e1e0d3bed1632b8ff304
1 parent fb5d547 commit 1b6213a

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

moxygen/mlog/MLogTypes.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -749,15 +749,15 @@ folly::dynamic MOQTSubgroupObjectParsed::toDynamic() const {
749749

750750
folly::dynamic MOQTFetchHeaderCreated::toDynamic() const {
751751
folly::dynamic obj = folly::dynamic::object;
752-
obj["streamId"] = std::to_string(streamId);
753-
obj["subscribeId"] = std::to_string(subscribeId);
752+
obj["stream_id"] = streamId;
753+
obj["request_id"] = requestId;
754754
return obj;
755755
}
756756

757757
folly::dynamic MOQTFetchHeaderParsed::toDynamic() const {
758758
folly::dynamic obj = folly::dynamic::object;
759-
obj["streamId"] = std::to_string(streamId);
760-
obj["subscribeId"] = std::to_string(subscribeId);
759+
obj["stream_id"] = streamId;
760+
obj["request_id"] = requestId;
761761
return obj;
762762
}
763763

moxygen/mlog/MLogTypes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,14 +604,14 @@ struct MOQTSubgroupObjectParsed {
604604

605605
struct MOQTFetchHeaderCreated {
606606
uint64_t streamId{0};
607-
uint64_t subscribeId{0};
607+
uint64_t requestId{0};
608608

609609
folly::dynamic toDynamic() const;
610610
};
611611

612612
struct MOQTFetchHeaderParsed {
613613
uint64_t streamId{0};
614-
uint64_t subscribeId{0};
614+
uint64_t requestId{0};
615615

616616
folly::dynamic toDynamic() const;
617617
};

moxygen/mlog/MLogger.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -956,19 +956,19 @@ void MLogger::logSubgroupObjectParsed(
956956

957957
void MLogger::logFetchHeaderCreated(
958958
const uint64_t streamId,
959-
const uint64_t subscribeId) {
959+
const uint64_t requestId) {
960960
MOQTFetchHeaderCreated baseMsg;
961961
baseMsg.streamId = streamId;
962-
baseMsg.subscribeId = subscribeId;
962+
baseMsg.requestId = requestId;
963963
addFetchHeaderCreatedLog(std::move(baseMsg));
964964
}
965965

966966
void MLogger::logFetchHeaderParsed(
967967
const uint64_t streamId,
968-
const uint64_t subscribeId) {
968+
const uint64_t requestId) {
969969
MOQTFetchHeaderParsed baseMsg;
970970
baseMsg.streamId = streamId;
971-
baseMsg.subscribeId = subscribeId;
971+
baseMsg.requestId = requestId;
972972
addFetchHeaderParsedLog(std::move(baseMsg));
973973
}
974974

moxygen/mlog/MLogger.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,8 @@ class MLogger {
191191
TrackAlias trackAlias,
192192
const ObjectHeader& objHeader,
193193
Payload payload);
194-
void logFetchHeaderCreated(
195-
const uint64_t streamId,
196-
const uint64_t subscribeId);
197-
void logFetchHeaderParsed(
198-
const uint64_t streamId,
199-
const uint64_t subscribeId);
194+
void logFetchHeaderCreated(const uint64_t streamId, const uint64_t requestId);
195+
void logFetchHeaderParsed(const uint64_t streamId, const uint64_t requestId);
200196
void logFetchObjectCreated(
201197
const uint64_t streamId,
202198
const ObjectHeader& header,

0 commit comments

Comments
 (0)