commit a09a86036c8d61b8b3535b1dd65a7c24f8fed144
author martinduke <martinduke@google.com> Mon Jun 23 07:17:25 2025 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jun 23 07:18:27 2025 -0700
tree 688219590c4bf51f385f3366f9775c075e464d83
parent 823662119bac4eb4a2771a1d45a8c00b5c6737ce

Update MoQT UNSUBSCRIBE to draft-11.

PiperOrigin-RevId: 774766699

quiche/quic/moqt/moqt_framer.cc

diff --git a/quiche/quic/moqt/moqt_framer.cc b/quiche/quic/moqt/moqt_framer.cc
index 93c9a31..b0eeaea 100644
--- a/quiche/quic/moqt/moqt_framer.cc
+++ b/quiche/quic/moqt/moqt_framer.cc
@@ -521,7 +521,7 @@
 quiche::QuicheBuffer MoqtFramer::SerializeUnsubscribe(
     const MoqtUnsubscribe& message) {
   return SerializeControlMessage(MoqtMessageType::kUnsubscribe,
-                                 WireVarInt62(message.subscribe_id));
+                                 WireVarInt62(message.request_id));
 }
 
 quiche::QuicheBuffer MoqtFramer::SerializeSubscribeDone(

quiche/quic/moqt/moqt_messages.h

diff --git a/quiche/quic/moqt/moqt_messages.h b/quiche/quic/moqt/moqt_messages.h
index 3a32cb9..84633c7 100644
--- a/quiche/quic/moqt/moqt_messages.h
+++ b/quiche/quic/moqt/moqt_messages.h
@@ -594,7 +594,7 @@
 };
 
 struct QUICHE_EXPORT MoqtUnsubscribe {
-  uint64_t subscribe_id;
+  uint64_t request_id;
 };
 
 enum class QUICHE_EXPORT SubscribeDoneCode : uint64_t {

quiche/quic/moqt/moqt_parser.cc

diff --git a/quiche/quic/moqt/moqt_parser.cc b/quiche/quic/moqt/moqt_parser.cc
index 01cd6c1..abcef72 100644
--- a/quiche/quic/moqt/moqt_parser.cc
+++ b/quiche/quic/moqt/moqt_parser.cc
@@ -524,7 +524,7 @@
 
 size_t MoqtControlParser::ProcessUnsubscribe(quic::QuicDataReader& reader) {
   MoqtUnsubscribe unsubscribe;
-  if (!reader.ReadVarInt62(&unsubscribe.subscribe_id)) {
+  if (!reader.ReadVarInt62(&unsubscribe.request_id)) {
     return 0;
   }
   visitor_.OnUnsubscribeMessage(unsubscribe);

quiche/quic/moqt/moqt_session.cc

diff --git a/quiche/quic/moqt/moqt_session.cc b/quiche/quic/moqt/moqt_session.cc
index 8ad711c..23ae173 100644
--- a/quiche/quic/moqt/moqt_session.cc
+++ b/quiche/quic/moqt/moqt_session.cc
@@ -455,7 +455,7 @@
   QUICHE_DCHECK(name.IsValid());
   QUIC_DLOG(INFO) << ENDPOINT << "Sent UNSUBSCRIBE message for " << name;
   MoqtUnsubscribe message;
-  message.subscribe_id = track->request_id();
+  message.request_id = track->request_id();
   SendControlMessage(framer_.SerializeUnsubscribe(message));
   DestroySubscription(track);
 }
@@ -1125,7 +1125,7 @@
 
 void MoqtSession::ControlStream::OnUnsubscribeMessage(
     const MoqtUnsubscribe& message) {
-  auto it = session_->published_subscriptions_.find(message.subscribe_id);
+  auto it = session_->published_subscriptions_.find(message.request_id);
   if (it == session_->published_subscriptions_.end()) {
     return;
   }

quiche/quic/moqt/test_tools/moqt_test_message.h

diff --git a/quiche/quic/moqt/test_tools/moqt_test_message.h b/quiche/quic/moqt/test_tools/moqt_test_message.h
index 6614417..2f2dba9 100644
--- a/quiche/quic/moqt/test_tools/moqt_test_message.h
+++ b/quiche/quic/moqt/test_tools/moqt_test_message.h
@@ -673,8 +673,8 @@
 
   bool EqualFieldValues(MessageStructuredData& values) const override {
     auto cast = std::get<MoqtUnsubscribe>(values);
-    if (cast.subscribe_id != unsubscribe_.subscribe_id) {
-      QUIC_LOG(INFO) << "UNSUBSCRIBE subscribe ID mismatch";
+    if (cast.request_id != unsubscribe_.request_id) {
+      QUIC_LOG(INFO) << "UNSUBSCRIBE request ID mismatch";
       return false;
     }
     return true;
@@ -688,11 +688,11 @@
 
  private:
   uint8_t raw_packet_[4] = {
-      0x0a, 0x00, 0x01, 0x03,  // subscribe_id = 3
+      0x0a, 0x00, 0x01, 0x03,  // request_id = 3
   };
 
   MoqtUnsubscribe unsubscribe_ = {
-      /*subscribe_id=*/3,
+      /*request_id=*/3,
   };
 };