Skip to content

fix: correct FETCH object parsing of subgroup flags and object status #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lminiero merged 2 commits into from
Aug 31, 2026
Merged

fix: correct FETCH object parsing of subgroup flags and object status #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db87852
fix: correct FETCH object parsing of subgroup flags and object status
zafergurel Aug 11, 2026
4d77541
fix: address review on FETCH subgroup back-references
zafergurel Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/internal/moq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,6 @@ size_t imquic_moq_add_fetch_header(imquic_moq_context *moq, uint8_t *bytes, size
* @param subgroup_id The subgroup ID
* @param object_id The object ID
* @param priority The publisher priority to put in the message
* @param object_status The object status (only added if the payload length is 0)
* @param payload_prefix The buffer containing the payload prefix of the object, if needed
* @param pplen The size of the payload prefix buffer
* @param payload The buffer containing the payload of the object
Expand All @@ -1181,7 +1180,7 @@ size_t imquic_moq_add_fetch_header(imquic_moq_context *moq, uint8_t *bytes, size
* @returns The size of the generated object, if successful, or 0 otherwise */
size_t imquic_moq_add_fetch_header_object(imquic_moq_context *moq, uint8_t *bytes, size_t blen,
uint64_t flags, uint64_t group_id, uint64_t subgroup_id, uint64_t object_id, uint8_t priority,
uint64_t object_status, uint8_t *payload_prefix, size_t pplen, uint8_t *payload, size_t plen, uint8_t *properties, size_t prlen);
uint8_t *payload_prefix, size_t pplen, uint8_t *payload, size_t plen, uint8_t *properties, size_t prlen);
/*! \brief Helper to add padding data to a buffer, formatted as expected
* for \c PADDING_STREAM or \c PADDING_DATAGRAM
* @param moq The imquic_moq_context generating the object
Expand Down
43 changes: 15 additions & 28 deletions src/moq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ void imquic_moq_parse_fetch_serialization_flags(imquic_moq_version version, uint
gboolean *datagram, gboolean *end_ne_range, gboolean *end_uk_range, gboolean *violation) {
/* Make sure the provided flags are valid, or return a protocol violation */
if(!imquic_moq_is_fetch_serialization_flags_valid(version, flags)) {
if(*violation)
if(violation)
*violation = TRUE;
return;
}
Expand All @@ -944,12 +944,12 @@ void imquic_moq_parse_fetch_serialization_flags(imquic_moq_version version, uint
/* If we're here, we're parsing a bitmask of a single byte */
uint8_t flags8 = (uint8_t)flags;
uint8_t lsb = flags8 & 0x03;
if(*subgroup) {
if(subgroup) {
if(lsb == 0x00)
*subgroup = IMQUIC_MOQ_FETCH_SUBGROUP_ZERO;
if(lsb == 0x01)
else if(lsb == 0x01)
*subgroup = IMQUIC_MOQ_FETCH_SUBGROUP_PREVIOUS;
if(lsb == 0x02)
else if(lsb == 0x02)
*subgroup = IMQUIC_MOQ_FETCH_SUBGROUP_PLUS_ONE;
else
*subgroup = IMQUIC_MOQ_FETCH_SUBGROUP_ID;
Expand Down Expand Up @@ -4765,13 +4765,13 @@ int imquic_moq_parse_fetch_header_object(imquic_moq_context *moq, imquic_moq_str
if(length == 0 || length >= blen-offset)
return -1; /* Not enough data, try again later */
offset += length;
} else {
} else if(subgroup_type == IMQUIC_MOQ_FETCH_SUBGROUP_PREVIOUS ||
subgroup_type == IMQUIC_MOQ_FETCH_SUBGROUP_PLUS_ONE) {
/* The subgroup ID references a previous object */
IMQUIC_MOQ_CHECK_ERR(!moq_stream->got_objects, error, IMQUIC_MOQ_PROTOCOL_VIOLATION, -1, "Serialization flag references non-existing previous object");
if(subgroup_type == IMQUIC_MOQ_FETCH_SUBGROUP_PREVIOUS)
subgroup_id = moq_stream->subgroup_id;
else if(subgroup_type == IMQUIC_MOQ_FETCH_SUBGROUP_PLUS_ONE)
subgroup_id = moq_stream->subgroup_id + 1;
subgroup_id = moq_stream->last_subgroup_id;
if(subgroup_type == IMQUIC_MOQ_FETCH_SUBGROUP_PLUS_ONE)
subgroup_id++;
}
uint64_t object_id = 0;
if(has_oid) {
Expand Down Expand Up @@ -4814,16 +4814,9 @@ int imquic_moq_parse_fetch_header_object(imquic_moq_context *moq, imquic_moq_str
if(length == 0 || length >= blen-offset)
return -1; /* Not enough data, try again later */
offset += length;
uint64_t object_status = 0;
if(p_len == 0) {
object_status = imquic_read_moqint(moq->version, &bytes[offset], blen-offset, &length);
if(length == 0 || length > blen-offset)
return -1; /* Not enough data, try again later */
/* TODO An invalid object status should be a protocol violation error */
//~ IMQUIC_MOQ_CHECK_ERR(object_status > IMQUIC_MOQ_END_OF_TRACK, error, IMQUIC_MOQ_PROTOCOL_VIOLATION, 0, "Invalid object status");
//~ IMQUIC_MOQ_CHECK_ERR(object_status == IMQUIC_MOQ_OBJECT_DOESNT_EXIST && prop_len > 0, error, IMQUIC_MOQ_PROTOCOL_VIOLATION, 0, "Properties received in object with status 'Does Not Exist'");
offset += length;
}
/* A FETCH object has no Object Status field: a zero length payload is a zero
* length object, and a range that is missing or unknown is conveyed with an
* End of Range indicator instead. Only Subgroup objects carry the status. */
if(p_len > blen-offset)
return -1; /* Not enough data, try again later */
IMQUIC_LOG(IMQUIC_MOQ_LOG_HUGE, "[%s][MoQ] -- Group ID: %"SCNu64"\n",
Expand All @@ -4834,10 +4827,6 @@ int imquic_moq_parse_fetch_header_object(imquic_moq_context *moq, imquic_moq_str
imquic_get_connection_name(moq->conn), object_id);
IMQUIC_LOG(IMQUIC_MOQ_LOG_HUGE, "[%s][MoQ] -- Payload Length: %"SCNu64"\n",
imquic_get_connection_name(moq->conn), p_len);
if(p_len == 0) {
IMQUIC_LOG(IMQUIC_MOQ_LOG_HUGE, "[%s][MoQ] -- Object Status: %"SCNu64"\n",
imquic_get_connection_name(moq->conn), object_status);
}
if(!moq_stream->got_objects)
moq_stream->got_objects = TRUE;
moq_stream->last_group_id = group_id;
Expand All @@ -4856,7 +4845,7 @@ int imquic_moq_parse_fetch_header_object(imquic_moq_context *moq, imquic_moq_str
.group_id = group_id,
.subgroup_id = subgroup_id,
.object_id = object_id,
.object_status = object_status,
.object_status = IMQUIC_MOQ_NORMAL_OBJECT,
.priority = priority,
.payload = bytes + offset,
.payload_len = p_len,
Expand Down Expand Up @@ -5965,7 +5954,7 @@ size_t imquic_moq_add_fetch_header(imquic_moq_context *moq, uint8_t *bytes, size

size_t imquic_moq_add_fetch_header_object(imquic_moq_context *moq, uint8_t *bytes, size_t blen,
uint64_t flags, uint64_t group_id, uint64_t subgroup_id, uint64_t object_id, uint8_t priority,
uint64_t object_status, uint8_t *payload_prefix, size_t pplen, uint8_t *payload, size_t plen, uint8_t *properties, size_t prlen) {
uint8_t *payload_prefix, size_t pplen, uint8_t *payload, size_t plen, uint8_t *properties, size_t prlen) {
if(bytes == NULL || blen < 1) {
IMQUIC_LOG(IMQUIC_LOG_ERR, "[%s][MoQ] Can't add MoQ %s object: invalid arguments\n",
imquic_get_connection_name(moq->conn), imquic_moq_data_message_type_str(IMQUIC_MOQ_FETCH_HEADER, moq->version));
Expand Down Expand Up @@ -5994,8 +5983,6 @@ size_t imquic_moq_add_fetch_header_object(imquic_moq_context *moq, uint8_t *byte
if(payload == NULL)
plen = 0;
offset += imquic_write_moqint(moq->version, pplen + plen, &bytes[offset], blen-offset);
if(plen == 0 && pplen == 0)
offset += imquic_write_moqint(moq->version, object_status, &bytes[offset], blen-offset);
if(pplen > 0) {
memcpy(&bytes[offset], payload_prefix, pplen);
offset += pplen;
Expand Down Expand Up @@ -8749,7 +8736,7 @@ int imquic_moq_send_object(imquic_connection *conn, imquic_moq_object *object) {
moq_stream->last_group_id = object->group_id;
moq_stream->last_object_id = object->object_id;
shto_len = imquic_moq_add_fetch_header_object(moq, buffer, bufsize, flags,
group_id, object->subgroup_id, object_id, object->priority, object->object_status,
group_id, object->subgroup_id, object_id, object->priority,
object->payload_prefix, object->payload_prefix_len,
object->payload, object->payload_len,
properties, properties_len);
Expand Down