Prepend webrtc ns to StrJoin calls in dcsctp ns
Bug: webrtc:365299886
Change-Id: I4eb87a2b116c3e18b1a84865fab0a22a6084912c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361980
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Dor Hen <dorhen@meta.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42980}
diff --git a/net/dcsctp/packet/chunk/sack_chunk.cc b/net/dcsctp/packet/chunk/sack_chunk.cc
index 75fd9b5..408faf4 100644
--- a/net/dcsctp/packet/chunk/sack_chunk.cc
+++ b/net/dcsctp/packet/chunk/sack_chunk.cc
@@ -145,8 +145,8 @@
}
if (!duplicate_tsns_.empty()) {
sb << ", dup_tsns="
- << StrJoin(duplicate_tsns(), ",",
- [](rtc::StringBuilder& sb, TSN tsn) { sb << *tsn; });
+ << webrtc::StrJoin(duplicate_tsns(), ",",
+ [](rtc::StringBuilder& sb, TSN tsn) { sb << *tsn; });
}
return sb.Release();
diff --git a/net/dcsctp/rx/reassembly_queue.cc b/net/dcsctp/rx/reassembly_queue.cc
index 4947d74..9f22e10 100644
--- a/net/dcsctp/rx/reassembly_queue.cc
+++ b/net/dcsctp/rx/reassembly_queue.cc
@@ -115,10 +115,9 @@
void ReassemblyQueue::ResetStreamsAndLeaveDeferredReset(
rtc::ArrayView<const StreamID> stream_ids) {
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Resetting streams: ["
- << StrJoin(stream_ids, ",",
- [](rtc::StringBuilder& sb, StreamID sid) {
- sb << *sid;
- })
+ << webrtc::StrJoin(stream_ids, ",",
+ [](rtc::StringBuilder& sb,
+ StreamID sid) { sb << *sid; })
<< "]";
// https://tools.ietf.org/html/rfc6525#section-5.2.2
@@ -169,10 +168,11 @@
rtc::ArrayView<const UnwrappedTSN> tsns,
DcSctpMessage message) {
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Assembled message from TSN=["
- << StrJoin(tsns, ",",
- [](rtc::StringBuilder& sb, UnwrappedTSN tsn) {
- sb << *tsn.Wrap();
- })
+ << webrtc::StrJoin(
+ tsns, ",",
+ [](rtc::StringBuilder& sb, UnwrappedTSN tsn) {
+ sb << *tsn.Wrap();
+ })
<< "], message; stream_id=" << *message.stream_id()
<< ", ppid=" << *message.ppid()
<< ", payload=" << message.payload().size() << " bytes";
diff --git a/net/dcsctp/socket/stream_reset_handler.cc b/net/dcsctp/socket/stream_reset_handler.cc
index 322ecd5..d436527 100644
--- a/net/dcsctp/socket/stream_reset_handler.cc
+++ b/net/dcsctp/socket/stream_reset_handler.cc
@@ -261,10 +261,10 @@
RTC_DLOG(LS_VERBOSE)
<< log_prefix_ << "Reset stream success, req_seq_nbr="
<< *current_request_->req_seq_nbr() << ", streams="
- << StrJoin(current_request_->streams(), ",",
- [](rtc::StringBuilder& sb, StreamID stream_id) {
- sb << *stream_id;
- });
+ << webrtc::StrJoin(current_request_->streams(), ",",
+ [](rtc::StringBuilder& sb, StreamID stream_id) {
+ sb << *stream_id;
+ });
ctx_->callbacks().OnStreamsResetPerformed(current_request_->streams());
current_request_ = std::nullopt;
retransmission_queue_->CommitResetStreams();
@@ -273,10 +273,10 @@
RTC_DLOG(LS_VERBOSE)
<< log_prefix_ << "Reset stream still pending, req_seq_nbr="
<< *current_request_->req_seq_nbr() << ", streams="
- << StrJoin(current_request_->streams(), ",",
- [](rtc::StringBuilder& sb, StreamID stream_id) {
- sb << *stream_id;
- });
+ << webrtc::StrJoin(current_request_->streams(), ",",
+ [](rtc::StringBuilder& sb, StreamID stream_id) {
+ sb << *stream_id;
+ });
// Force this request to be sent again, but with new req_seq_nbr.
current_request_->PrepareRetransmission();
reconfig_timer_->set_duration(ctx_->current_rto());
@@ -290,10 +290,10 @@
<< log_prefix_ << "Reset stream error=" << ToString(resp->result())
<< ", req_seq_nbr=" << *current_request_->req_seq_nbr()
<< ", streams="
- << StrJoin(current_request_->streams(), ",",
- [](rtc::StringBuilder& sb, StreamID stream_id) {
- sb << *stream_id;
- });
+ << webrtc::StrJoin(current_request_->streams(), ",",
+ [](rtc::StringBuilder& sb, StreamID stream_id) {
+ sb << *stream_id;
+ });
ctx_->callbacks().OnStreamsResetFailed(current_request_->streams(),
ToString(resp->result()));
current_request_ = std::nullopt;
diff --git a/net/dcsctp/tx/retransmission_queue.cc b/net/dcsctp/tx/retransmission_queue.cc
index 604139c..836ae700 100644
--- a/net/dcsctp/tx/retransmission_queue.cc
+++ b/net/dcsctp/tx/retransmission_queue.cc
@@ -430,11 +430,11 @@
rtx_bytes_count_ += bytes_retransmitted;
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Fast-retransmitting TSN "
- << StrJoin(to_be_sent, ",",
- [&](rtc::StringBuilder& sb,
- const std::pair<TSN, Data>& c) {
- sb << *c.first;
- })
+ << webrtc::StrJoin(to_be_sent, ",",
+ [&](rtc::StringBuilder& sb,
+ const std::pair<TSN, Data>& c) {
+ sb << *c.first;
+ })
<< " - " << bytes_retransmitted
<< " bytes. unacked_bytes=" << unacked_bytes() << " ("
<< old_unacked_bytes << ")";
@@ -511,11 +511,11 @@
t3_rtx_.Start();
}
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Sending TSN "
- << StrJoin(to_be_sent, ",",
- [&](rtc::StringBuilder& sb,
- const std::pair<TSN, Data>& c) {
- sb << *c.first;
- })
+ << webrtc::StrJoin(to_be_sent, ",",
+ [&](rtc::StringBuilder& sb,
+ const std::pair<TSN, Data>& c) {
+ sb << *c.first;
+ })
<< " - "
<< absl::c_accumulate(
to_be_sent, 0,
diff --git a/net/dcsctp/tx/rr_send_queue.cc b/net/dcsctp/tx/rr_send_queue.cc
index 2016ede..378d6e9 100644
--- a/net/dcsctp/tx/rr_send_queue.cc
+++ b/net/dcsctp/tx/rr_send_queue.cc
@@ -84,9 +84,10 @@
if (expected_active_streams != actual_active_streams) {
auto fn = [&](rtc::StringBuilder& sb, const auto& p) { sb << *p; };
RTC_DLOG(LS_ERROR) << "Active streams mismatch, is=["
- << StrJoin(actual_active_streams, ",", fn)
+ << webrtc::StrJoin(actual_active_streams, ",", fn)
<< "], expected=["
- << StrJoin(expected_active_streams, ",", fn) << "]";
+ << webrtc::StrJoin(expected_active_streams, ",", fn)
+ << "]";
return false;
}
diff --git a/net/dcsctp/tx/stream_scheduler.cc b/net/dcsctp/tx/stream_scheduler.cc
index c8984b8..a0412e4 100644
--- a/net/dcsctp/tx/stream_scheduler.cc
+++ b/net/dcsctp/tx/stream_scheduler.cc
@@ -42,11 +42,12 @@
RTC_DLOG(LS_VERBOSE) << log_prefix_
<< "Producing data, rescheduling=" << rescheduling
<< ", active="
- << StrJoin(active_streams_, ", ",
- [&](rtc::StringBuilder& sb, const auto& p) {
- sb << *p->stream_id() << "@"
- << *p->next_finish_time();
- });
+ << webrtc::StrJoin(
+ active_streams_, ", ",
+ [&](rtc::StringBuilder& sb, const auto& p) {
+ sb << *p->stream_id() << "@"
+ << *p->next_finish_time();
+ });
RTC_DCHECK(rescheduling || current_stream_ != nullptr);
