Rename kGenericError to kInternalError. non-wire-image change to MoQT for draft-03 Not in production. PiperOrigin-RevId: 615416989
diff --git a/quiche/quic/moqt/moqt_messages.h b/quiche/quic/moqt/moqt_messages.h index 1e247c1..67c9f1c 100644 --- a/quiche/quic/moqt/moqt_messages.h +++ b/quiche/quic/moqt/moqt_messages.h
@@ -68,7 +68,7 @@ enum class QUICHE_EXPORT MoqtError : uint64_t { kNoError = 0x0, - kGenericError = 0x1, + kInternalError = 0x1, kUnauthorized = 0x2, kProtocolViolation = 0x3, kDuplicateTrackAlias = 0x4, @@ -254,7 +254,7 @@ }; enum class QUICHE_EXPORT SubscribeErrorCode : uint64_t { - kGenericError = 0x0, + kInternalError = 0x0, kInvalidRange = 0x1, kRetryTrackAlias = 0x2, };
diff --git a/quiche/quic/moqt/moqt_parser.cc b/quiche/quic/moqt/moqt_parser.cc index 4821d69..616a9ed 100644 --- a/quiche/quic/moqt/moqt_parser.cc +++ b/quiche/quic/moqt/moqt_parser.cc
@@ -90,7 +90,7 @@ size_t message_len = ProcessMessage(reader->PeekRemainingPayload(), fin); if (message_len == 0) { if (reader->BytesRemaining() > kMaxMessageHeaderSize) { - ParseError(MoqtError::kGenericError, + ParseError(MoqtError::kInternalError, "Cannot parse non-OBJECT messages > 2KB"); return; }
diff --git a/quiche/quic/moqt/moqt_parser_test.cc b/quiche/quic/moqt/moqt_parser_test.cc index bc4712e..3572ae8 100644 --- a/quiche/quic/moqt/moqt_parser_test.cc +++ b/quiche/quic/moqt/moqt_parser_test.cc
@@ -693,7 +693,7 @@ EXPECT_EQ(visitor_.messages_received_, 0); EXPECT_TRUE(visitor_.parsing_error_.has_value()); EXPECT_EQ(*visitor_.parsing_error_, "Cannot parse non-OBJECT messages > 2KB"); - EXPECT_EQ(visitor_.parsing_error_code_, MoqtError::kGenericError); + EXPECT_EQ(visitor_.parsing_error_code_, MoqtError::kInternalError); } TEST_F(MoqtMessageSpecificTest, UnknownMessageType) {
diff --git a/quiche/quic/moqt/moqt_session.cc b/quiche/quic/moqt/moqt_session.cc index 3518c9a..3442e04 100644 --- a/quiche/quic/moqt/moqt_session.cc +++ b/quiche/quic/moqt/moqt_session.cc
@@ -66,7 +66,7 @@ webtransport::Stream* control_stream = session_->OpenOutgoingBidirectionalStream(); if (control_stream == nullptr) { - Error(MoqtError::kGenericError, "Unable to open a control stream"); + Error(MoqtError::kInternalError, "Unable to open a control stream"); return; } control_stream->SetVisitor(std::make_unique<Stream>( @@ -602,7 +602,7 @@ QUIC_DLOG(INFO) << ENDPOINT << "Rejected because " << message.track_namespace << ":" << message.track_name << " does not exist"; - SendSubscribeError(message, SubscribeErrorCode::kGenericError, + SendSubscribeError(message, SubscribeErrorCode::kInternalError, "Track does not exist", message.track_alias); return; } @@ -642,7 +642,7 @@ std::optional<absl::string_view> past_objects_available = track.visitor()->OnSubscribeForPast(window); if (past_objects_available.has_value()) { - SendSubscribeError(message, SubscribeErrorCode::kGenericError, + SendSubscribeError(message, SubscribeErrorCode::kInternalError, "Object does not exist", message.track_alias); return; } @@ -842,7 +842,7 @@ std::array<absl::string_view, 1> write_vector = {message.AsStringView()}; absl::Status success = stream_->Writev(absl::MakeSpan(write_vector), options); if (!success.ok()) { - session_->Error(MoqtError::kGenericError, + session_->Error(MoqtError::kInternalError, "Failed to write a control message"); } }
diff --git a/quiche/quic/moqt/tools/chat_client_bin.cc b/quiche/quic/moqt/tools/chat_client_bin.cc index 38fd702..d557137 100644 --- a/quiche/quic/moqt/tools/chat_client_bin.cc +++ b/quiche/quic/moqt/tools/chat_client_bin.cc
@@ -203,7 +203,7 @@ std::optional<moqt::MoqtAnnounceErrorReason> reason) { if (reason.has_value()) { std::cout << "ANNOUNCE rejected, " << reason->reason_phrase << "\n"; - session_->Error(moqt::MoqtError::kGenericError, + session_->Error(moqt::MoqtError::kInternalError, "Local ANNOUNCE rejected"); return; }