commit 60a2021d6180a6fbc0013b43bfdc54d141b11a4b
author Philipp Hancke <phancke@meta.com> Fri Mar 14 21:21:22 2025
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Mar 17 15:47:13 2025
tree 4f213dd259203b512151d8254636bf933c1338c6
parent e4b09d73b19238b2ae17d44066eb0249050dde3a

Don't shadow DcSctpTransport options from argument

Follow-up to
  https://webrtc-review.googlesource.com/c/src/+/380580
which removes "shadowing" the dcSctp options with the options argument.

BUG=webrtc:402429107

Change-Id: I51c633183f98abfb609fba9d794a718e41f7b1c3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/381321
Reviewed-by: Victor Boivie <boivie@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Cr-Commit-Position: refs/heads/main@{#44142}

media/sctp/dcsctp_transport.cc

diff --git a/media/sctp/dcsctp_transport.cc b/media/sctp/dcsctp_transport.cc
index e67a266..65aba51 100644
--- a/media/sctp/dcsctp_transport.cc
+++ b/media/sctp/dcsctp_transport.cc
@@ -201,19 +201,19 @@
                     << ", max_message_size=" << options.max_message_size << ")";
 
   if (!socket_) {
-    dcsctp::DcSctpOptions options;
-    options.local_port = options.local_port;
-    options.remote_port = options.remote_port;
-    options.max_message_size = options.max_message_size;
-    options.max_timer_backoff_duration = kMaxTimerBackoffDuration;
+    dcsctp::DcSctpOptions dcsctp_options;
+    dcsctp_options.local_port = options.local_port;
+    dcsctp_options.remote_port = options.remote_port;
+    dcsctp_options.max_message_size = options.max_message_size;
+    dcsctp_options.max_timer_backoff_duration = kMaxTimerBackoffDuration;
     // Don't close the connection automatically on too many retransmissions.
-    options.max_retransmissions = std::nullopt;
-    options.max_init_retransmits = std::nullopt;
-    options.per_stream_send_queue_limit =
+    dcsctp_options.max_retransmissions = std::nullopt;
+    dcsctp_options.max_init_retransmits = std::nullopt;
+    dcsctp_options.per_stream_send_queue_limit =
         DataChannelInterface::MaxSendQueueSize();
     // This is just set to avoid denial-of-service. Practically unlimited.
-    options.max_send_buffer_size = std::numeric_limits<size_t>::max();
-    options.enable_message_interleaving =
+    dcsctp_options.max_send_buffer_size = std::numeric_limits<size_t>::max();
+    dcsctp_options.enable_message_interleaving =
         env_.field_trials().IsEnabled("WebRTC-DataChannelMessageInterleaving");
 
     std::unique_ptr<dcsctp::PacketObserver> packet_observer;
@@ -222,8 +222,8 @@
           std::make_unique<dcsctp::TextPcapPacketObserver>(debug_name_);
     }
 
-    socket_ = socket_factory_->Create(debug_name_, *this,
-                                      std::move(packet_observer), options);
+    socket_ = socket_factory_->Create(
+        debug_name_, *this, std::move(packet_observer), dcsctp_options);
   } else {
     if (options.local_port != socket_->options().local_port ||
         options.remote_port != socket_->options().remote_port) {