From 1ae94e9e341498fd2971f679abed2d6d0e44cf03 Mon Sep 17 00:00:00 2001 From: afrind Date: Thu, 27 Feb 2025 11:58:43 -0800 Subject: [PATCH 1/6] Reapply #625 changes to DATAGRAM, add extensions to DATAGRAM_STATUS Fixes: #671 #683 #684 #693 --- draft-ietf-moq-transport.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/draft-ietf-moq-transport.md b/draft-ietf-moq-transport.md index dc77f208..e38ede16 100644 --- a/draft-ietf-moq-transport.md +++ b/draft-ietf-moq-transport.md @@ -2453,8 +2453,6 @@ OBJECT_DATAGRAM { Publisher Priority (8), Extension Headers Length (i), [Extension headers (...)], - Object Payload Length (i), - [Object Status (i)], Object Payload (..), } ~~~ @@ -2474,6 +2472,8 @@ OBJECT_DATAGRAM_STATUS { Group ID (i), Object ID (i), Publisher Priority (8), + Extension Headers Length (i), + [Extension headers (...)], Object Status (i), } ~~~ From 0480d4a1c11f2181c263af0a28735910d5320e70 Mon Sep 17 00:00:00 2001 From: afrind Date: Thu, 27 Feb 2025 12:40:08 -0800 Subject: [PATCH 2/6] Update all examples with Extension Headers Length Fixes: #675 --- draft-ietf-moq-transport.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/draft-ietf-moq-transport.md b/draft-ietf-moq-transport.md index e38ede16..466aa26b 100644 --- a/draft-ietf-moq-transport.md +++ b/draft-ietf-moq-transport.md @@ -2652,11 +2652,13 @@ SUBGROUP_HEADER { } { Object ID = 0 + Extension Headers Length = 0 Object Payload Length = 4 Payload = "abcd" } { Object ID = 1 + Extension Headers Length = 0 Object Payload Length = 4 Payload = "efgh" } @@ -2689,6 +2691,7 @@ STREAM_HEADER_GROUP { } { Object ID = 1 + Extension Headers Length = 0 Object Payload Length = 4 Payload = "efgh" } From 6931bbe399a3286407e3025ea620824a39ead684 Mon Sep 17 00:00:00 2001 From: afrind Date: Thu, 27 Feb 2025 12:42:30 -0800 Subject: [PATCH 3/6] Remove endObject reference from SUBSCRIBE+AbsoluteRange Fixes: #670 --- draft-ietf-moq-transport.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/draft-ietf-moq-transport.md b/draft-ietf-moq-transport.md index e38ede16..5cbfabf3 100644 --- a/draft-ietf-moq-transport.md +++ b/draft-ietf-moq-transport.md @@ -1300,10 +1300,11 @@ StartGroup is prior to the current group, the subscription starts at the beginning of the current object like the 'Latest Object' filter. AbsoluteRange (0x4): Specifies a closed subscription starting at StartObject -in StartGroup and ending at EndObject in EndGroup. The start and end of the -range are inclusive. EndGroup MUST specify the same or a later group than -StartGroup. If the StartGroup is prior to the current group, the subscription -starts at the beginning of the current object like the 'Latest Object' filter. +in StartGroup and ending at the largest object in EndGroup. The start and +end of the range are inclusive. EndGroup MUST specify the same or a later +group than StartGroup. If the StartGroup is prior to the current group, the +subscription starts at the beginning of the current object like the 'Latest +Object' filter. A filter type other than the above MUST be treated as error. From d89a8cded79d34f26784c3bad2121645d765666a Mon Sep 17 00:00:00 2001 From: afrind Date: Thu, 27 Feb 2025 12:48:20 -0800 Subject: [PATCH 4/6] remove trailing ws --- draft-ietf-moq-transport.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/draft-ietf-moq-transport.md b/draft-ietf-moq-transport.md index 5cbfabf3..1a693803 100644 --- a/draft-ietf-moq-transport.md +++ b/draft-ietf-moq-transport.md @@ -1300,10 +1300,10 @@ StartGroup is prior to the current group, the subscription starts at the beginning of the current object like the 'Latest Object' filter. AbsoluteRange (0x4): Specifies a closed subscription starting at StartObject -in StartGroup and ending at the largest object in EndGroup. The start and -end of the range are inclusive. EndGroup MUST specify the same or a later +in StartGroup and ending at the largest object in EndGroup. The start and +end of the range are inclusive. EndGroup MUST specify the same or a later group than StartGroup. If the StartGroup is prior to the current group, the -subscription starts at the beginning of the current object like the 'Latest +subscription starts at the beginning of the current object like the 'Latest Object' filter. A filter type other than the above MUST be treated as error. From 8792595e9e4568c4d5310e260eecff99b05aaf3f Mon Sep 17 00:00:00 2001 From: afrind Date: Thu, 27 Feb 2025 12:51:25 -0800 Subject: [PATCH 5/6] ANNOUNCE_CANCEL error codes Fixes: #677 --- draft-ietf-moq-transport.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/draft-ietf-moq-transport.md b/draft-ietf-moq-transport.md index e38ede16..8645202f 100644 --- a/draft-ietf-moq-transport.md +++ b/draft-ietf-moq-transport.md @@ -1709,6 +1709,8 @@ ANNOUNCE_CANCEL Message { ({{track-name}}). * Error Code: Identifies an integer error code for canceling the announcement. +ANNOUNCE_CANCEL uses the same error codes as ANNOUNCE_ERROR +({{#message-announce-error}}). * Reason Phrase: Provides the reason for announcement cancelation. From f1b50c1a3a8b4d7b2c97a8dee71c38aface2dfc0 Mon Sep 17 00:00:00 2001 From: afrind Date: Thu, 27 Feb 2025 12:54:01 -0800 Subject: [PATCH 6/6] fix broken ref --- draft-ietf-moq-transport.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draft-ietf-moq-transport.md b/draft-ietf-moq-transport.md index 8645202f..d947c649 100644 --- a/draft-ietf-moq-transport.md +++ b/draft-ietf-moq-transport.md @@ -1710,7 +1710,7 @@ ANNOUNCE_CANCEL Message { * Error Code: Identifies an integer error code for canceling the announcement. ANNOUNCE_CANCEL uses the same error codes as ANNOUNCE_ERROR -({{#message-announce-error}}). +({{message-announce-error}}). * Reason Phrase: Provides the reason for announcement cancelation.