commit e25c1229c5f1be9a9230657a8569b2b4be8dc723
author Tommi <tommi@webrtc.org> Tue Apr 11 09:46:24 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 11 14:28:29 2023
tree 8c24755b2c2999ad028b056e8c750d51852d73dd
parent fb65d23d7365ce96467a2b19960c8f42a83c2cc6

[SctpDataChannel] Populate the error() field on Send()

As is, send() might return false while error() would indicate OK.

Bug: none
Change-Id: Ia303701148e86e1bcaf70cc54e689a3ff7f5a184
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/300822
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39809}

pc/sctp_data_channel.cc

diff --git a/pc/sctp_data_channel.cc b/pc/sctp_data_channel.cc
index a734f1b..7fad029 100644
--- a/pc/sctp_data_channel.cc
+++ b/pc/sctp_data_channel.cc
@@ -556,6 +556,7 @@
   RTC_DCHECK_RUN_ON(network_thread_);
 
   if (state_ != kOpen) {
+    error_ = RTCError(RTCErrorType::INVALID_STATE);
     return false;
   }
 
@@ -852,6 +853,7 @@
                                       bool queue_if_blocked) {
   SendDataParams send_params;
   if (!controller_) {
+    error_ = RTCError(RTCErrorType::INVALID_STATE);
     return false;
   }
 
@@ -869,9 +871,8 @@
   send_params.type =
       buffer.binary ? DataMessageType::kBinary : DataMessageType::kText;
 
-  RTCError error = controller_->SendData(id_n_, send_params, buffer.data);
-
-  if (error.ok()) {
+  error_ = controller_->SendData(id_n_, send_params, buffer.data);
+  if (error_.ok()) {
     ++messages_sent_;
     bytes_sent_ += buffer.size();
 
@@ -881,7 +882,7 @@
     return true;
   }
 
-  if (error.type() == RTCErrorType::RESOURCE_EXHAUSTED) {
+  if (error_.type() == RTCErrorType::RESOURCE_EXHAUSTED) {
     if (!queue_if_blocked || QueueSendDataMessage(buffer)) {
       return false;
     }
@@ -890,7 +891,7 @@
   // message failed.
   RTC_LOG(LS_ERROR) << "Closing the DataChannel due to a failure to send data, "
                        "send_result = "
-                    << ToString(error.type()) << ":" << error.message();
+                    << ToString(error_.type()) << ":" << error_.message();
   CloseAbruptlyWithError(
       RTCError(RTCErrorType::NETWORK_ERROR, "Failure to send data"));
 
@@ -903,6 +904,7 @@
   if (start_buffered_amount + buffer.size() >
       DataChannelInterface::MaxSendQueueSize()) {
     RTC_LOG(LS_ERROR) << "Can't buffer any more data for the data channel.";
+    error_ = RTCError(RTCErrorType::RESOURCE_EXHAUSTED);
     return false;
   }
   queued_send_data_.PushBack(std::make_unique<DataBuffer>(buffer));