Use webrtc name specifier instead of rtc/cricket in net/dcsctp
WebRTC has unified all namespaces to webrtc, and the rtc:: and cricket::
name specifiers need to be replaced with webrtc::. This was generated using
a combination of clang AST rewriting tools and sed.
This CL was uploaded by git cl split.
Bug: webrtc:42232595
Change-Id: Iee04fa1c85d363986edfa1e3fcd21b1311904183
No-Iwyu: LSC
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/386648
Commit-Queue: Victor Boivie <boivie@webrtc.org>
Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
Reviewed-by: Victor Boivie <boivie@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44415}
diff --git a/net/dcsctp/fuzzers/dcsctp_fuzzers.cc b/net/dcsctp/fuzzers/dcsctp_fuzzers.cc
index b70c6c3..91f258f 100644
--- a/net/dcsctp/fuzzers/dcsctp_fuzzers.cc
+++ b/net/dcsctp/fuzzers/dcsctp_fuzzers.cc
@@ -60,7 +60,7 @@
// State about the current fuzzing iteration
class FuzzState {
public:
- explicit FuzzState(rtc::ArrayView<const uint8_t> data) : data_(data) {}
+ explicit FuzzState(webrtc::ArrayView<const uint8_t> data) : data_(data) {}
uint8_t GetByte() {
uint8_t value = 0;
@@ -79,7 +79,7 @@
private:
uint32_t tsn_ = kRandomValue;
uint32_t mid_ = 0;
- rtc::ArrayView<const uint8_t> data_;
+ webrtc::ArrayView<const uint8_t> data_;
size_t offset_ = 0;
};
@@ -397,7 +397,7 @@
void FuzzSocket(DcSctpSocketInterface& socket,
FuzzerCallbacks& cb,
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
if (data.size() < kMinInputLength || data.size() > kMaxInputLength) {
return;
}
diff --git a/net/dcsctp/fuzzers/dcsctp_fuzzers.h b/net/dcsctp/fuzzers/dcsctp_fuzzers.h
index d3cb019..756eaf4 100644
--- a/net/dcsctp/fuzzers/dcsctp_fuzzers.h
+++ b/net/dcsctp/fuzzers/dcsctp_fuzzers.h
@@ -56,7 +56,7 @@
class FuzzerCallbacks : public DcSctpSocketCallbacks {
public:
static constexpr int kRandomValue = 42;
- void SendPacket(rtc::ArrayView<const uint8_t> data) override {
+ void SendPacket(webrtc::ArrayView<const uint8_t> data) override {
sent_packets_.emplace_back(std::vector<uint8_t>(data.begin(), data.end()));
}
std::unique_ptr<Timeout> CreateTimeout(
@@ -77,12 +77,12 @@
void OnClosed() override {}
void OnConnectionRestarted() override {}
void OnStreamsResetFailed(
- rtc::ArrayView<const StreamID> /* outgoing_streams */,
+ webrtc::ArrayView<const StreamID> /* outgoing_streams */,
absl::string_view /* reason */) override {}
void OnStreamsResetPerformed(
- rtc::ArrayView<const StreamID> outgoing_streams) override {}
+ webrtc::ArrayView<const StreamID> outgoing_streams) override {}
void OnIncomingStreamsReset(
- rtc::ArrayView<const StreamID> incoming_streams) override {}
+ webrtc::ArrayView<const StreamID> incoming_streams) override {}
std::vector<uint8_t> ConsumeSentPacket() {
if (sent_packets_.empty()) {
@@ -115,7 +115,7 @@
// API methods.
void FuzzSocket(DcSctpSocketInterface& socket,
FuzzerCallbacks& cb,
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
} // namespace dcsctp_fuzzers
} // namespace dcsctp
diff --git a/net/dcsctp/packet/bounded_byte_reader.h b/net/dcsctp/packet/bounded_byte_reader.h
index 603ed6a..3ce6d6d 100644
--- a/net/dcsctp/packet/bounded_byte_reader.h
+++ b/net/dcsctp/packet/bounded_byte_reader.h
@@ -51,7 +51,8 @@
template <int FixedSize>
class BoundedByteReader {
public:
- explicit BoundedByteReader(rtc::ArrayView<const uint8_t> data) : data_(data) {
+ explicit BoundedByteReader(webrtc::ArrayView<const uint8_t> data)
+ : data_(data) {
RTC_CHECK(data.size() >= FixedSize);
}
@@ -79,19 +80,19 @@
BoundedByteReader<SubSize> sub_reader(size_t variable_offset) const {
RTC_CHECK(FixedSize + variable_offset + SubSize <= data_.size());
- rtc::ArrayView<const uint8_t> sub_span =
+ webrtc::ArrayView<const uint8_t> sub_span =
data_.subview(FixedSize + variable_offset, SubSize);
return BoundedByteReader<SubSize>(sub_span);
}
size_t variable_data_size() const { return data_.size() - FixedSize; }
- rtc::ArrayView<const uint8_t> variable_data() const {
+ webrtc::ArrayView<const uint8_t> variable_data() const {
return data_.subview(FixedSize, data_.size() - FixedSize);
}
private:
- const rtc::ArrayView<const uint8_t> data_;
+ const webrtc::ArrayView<const uint8_t> data_;
};
} // namespace dcsctp
diff --git a/net/dcsctp/packet/bounded_byte_writer.h b/net/dcsctp/packet/bounded_byte_writer.h
index d754549..08dda4f 100644
--- a/net/dcsctp/packet/bounded_byte_writer.h
+++ b/net/dcsctp/packet/bounded_byte_writer.h
@@ -55,7 +55,7 @@
template <int FixedSize>
class BoundedByteWriter {
public:
- explicit BoundedByteWriter(rtc::ArrayView<uint8_t> data) : data_(data) {
+ explicit BoundedByteWriter(webrtc::ArrayView<uint8_t> data) : data_(data) {
RTC_CHECK(data.size() >= FixedSize);
}
@@ -87,7 +87,7 @@
data_.subview(FixedSize + variable_offset, SubSize));
}
- void CopyToVariableData(rtc::ArrayView<const uint8_t> source) {
+ void CopyToVariableData(webrtc::ArrayView<const uint8_t> source) {
size_t copy_size = std::min(source.size(), data_.size() - FixedSize);
if (source.data() == nullptr || copy_size == 0) {
return;
@@ -96,7 +96,7 @@
}
private:
- rtc::ArrayView<uint8_t> data_;
+ webrtc::ArrayView<uint8_t> data_;
};
} // namespace dcsctp
diff --git a/net/dcsctp/packet/chunk/abort_chunk.cc b/net/dcsctp/packet/chunk/abort_chunk.cc
index 3d0e469..d7190a7 100644
--- a/net/dcsctp/packet/chunk/abort_chunk.cc
+++ b/net/dcsctp/packet/chunk/abort_chunk.cc
@@ -37,7 +37,7 @@
constexpr int AbortChunk::kType;
std::optional<AbortChunk> AbortChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -53,7 +53,7 @@
}
void AbortChunk::SerializeTo(std::vector<uint8_t>& out) const {
- rtc::ArrayView<const uint8_t> error_causes = error_causes_.data();
+ webrtc::ArrayView<const uint8_t> error_causes = error_causes_.data();
BoundedByteWriter<kHeaderSize> writer = AllocateTLV(out, error_causes.size());
writer.Store8<1>(filled_in_verification_tag_ ? 0 : (1 << kFlagsBitT));
writer.CopyToVariableData(error_causes);
diff --git a/net/dcsctp/packet/chunk/abort_chunk.h b/net/dcsctp/packet/chunk/abort_chunk.h
index 2072a9b..771bbe9 100644
--- a/net/dcsctp/packet/chunk/abort_chunk.h
+++ b/net/dcsctp/packet/chunk/abort_chunk.h
@@ -42,7 +42,7 @@
AbortChunk(AbortChunk&& other) = default;
AbortChunk& operator=(AbortChunk&& other) = default;
- static std::optional<AbortChunk> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<AbortChunk> Parse(webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/chunk.cc b/net/dcsctp/packet/chunk/chunk.cc
index d761ece..73d6755 100644
--- a/net/dcsctp/packet/chunk/chunk.cc
+++ b/net/dcsctp/packet/chunk/chunk.cc
@@ -39,7 +39,7 @@
template <class Chunk>
bool ParseAndPrint(uint8_t chunk_type,
- rtc::ArrayView<const uint8_t> data,
+ webrtc::ArrayView<const uint8_t> data,
webrtc::StringBuilder& sb) {
if (chunk_type == Chunk::kType) {
std::optional<Chunk> c = Chunk::Parse(data);
@@ -53,7 +53,7 @@
return false;
}
-std::string DebugConvertChunkToString(rtc::ArrayView<const uint8_t> data) {
+std::string DebugConvertChunkToString(webrtc::ArrayView<const uint8_t> data) {
webrtc::StringBuilder sb;
if (data.empty()) {
diff --git a/net/dcsctp/packet/chunk/chunk.h b/net/dcsctp/packet/chunk/chunk.h
index 6fea10a..810cd92 100644
--- a/net/dcsctp/packet/chunk/chunk.h
+++ b/net/dcsctp/packet/chunk/chunk.h
@@ -52,7 +52,7 @@
// Introspects the chunk in `data` and returns a human readable textual
// representation of it, to be used in debugging.
-std::string DebugConvertChunkToString(rtc::ArrayView<const uint8_t> data);
+std::string DebugConvertChunkToString(webrtc::ArrayView<const uint8_t> data);
struct ChunkConfig {
static constexpr int kTypeSizeInBytes = 1;
diff --git a/net/dcsctp/packet/chunk/cookie_ack_chunk.cc b/net/dcsctp/packet/chunk/cookie_ack_chunk.cc
index a6d28df..c484620 100644
--- a/net/dcsctp/packet/chunk/cookie_ack_chunk.cc
+++ b/net/dcsctp/packet/chunk/cookie_ack_chunk.cc
@@ -28,7 +28,7 @@
constexpr int CookieAckChunk::kType;
std::optional<CookieAckChunk> CookieAckChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
if (!ParseTLV(data).has_value()) {
return std::nullopt;
}
diff --git a/net/dcsctp/packet/chunk/cookie_ack_chunk.h b/net/dcsctp/packet/chunk/cookie_ack_chunk.h
index 631e7a2..0af7bfa 100644
--- a/net/dcsctp/packet/chunk/cookie_ack_chunk.h
+++ b/net/dcsctp/packet/chunk/cookie_ack_chunk.h
@@ -36,7 +36,7 @@
CookieAckChunk() {}
static std::optional<CookieAckChunk> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/cookie_echo_chunk.cc b/net/dcsctp/packet/chunk/cookie_echo_chunk.cc
index 30e2b89..daa8562 100644
--- a/net/dcsctp/packet/chunk/cookie_echo_chunk.cc
+++ b/net/dcsctp/packet/chunk/cookie_echo_chunk.cc
@@ -35,7 +35,7 @@
constexpr int CookieEchoChunk::kType;
std::optional<CookieEchoChunk> CookieEchoChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/chunk/cookie_echo_chunk.h b/net/dcsctp/packet/chunk/cookie_echo_chunk.h
index 12f819b..58d730b 100644
--- a/net/dcsctp/packet/chunk/cookie_echo_chunk.h
+++ b/net/dcsctp/packet/chunk/cookie_echo_chunk.h
@@ -33,16 +33,16 @@
public:
static constexpr int kType = CookieEchoChunkConfig::kType;
- explicit CookieEchoChunk(rtc::ArrayView<const uint8_t> cookie)
+ explicit CookieEchoChunk(webrtc::ArrayView<const uint8_t> cookie)
: cookie_(cookie.begin(), cookie.end()) {}
static std::optional<CookieEchoChunk> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
- rtc::ArrayView<const uint8_t> cookie() const { return cookie_; }
+ webrtc::ArrayView<const uint8_t> cookie() const { return cookie_; }
private:
std::vector<uint8_t> cookie_;
diff --git a/net/dcsctp/packet/chunk/data_chunk.cc b/net/dcsctp/packet/chunk/data_chunk.cc
index 302db50..229ba0c 100644
--- a/net/dcsctp/packet/chunk/data_chunk.cc
+++ b/net/dcsctp/packet/chunk/data_chunk.cc
@@ -43,7 +43,8 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
constexpr int DataChunk::kType;
-std::optional<DataChunk> DataChunk::Parse(rtc::ArrayView<const uint8_t> data) {
+std::optional<DataChunk> DataChunk::Parse(
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/chunk/data_chunk.h b/net/dcsctp/packet/chunk/data_chunk.h
index 515fd9e..cdd037a 100644
--- a/net/dcsctp/packet/chunk/data_chunk.h
+++ b/net/dcsctp/packet/chunk/data_chunk.h
@@ -59,7 +59,7 @@
DataChunk(TSN tsn, Data&& data, bool immediate_ack)
: AnyDataChunk(tsn, std::move(data), immediate_ack) {}
- static std::optional<DataChunk> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<DataChunk> Parse(webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/data_common.h b/net/dcsctp/packet/chunk/data_common.h
index 66d67ba..7f85c82 100644
--- a/net/dcsctp/packet/chunk/data_common.h
+++ b/net/dcsctp/packet/chunk/data_common.h
@@ -51,7 +51,7 @@
MID mid() const { return data_.mid; }
FSN fsn() const { return data_.fsn; }
PPID ppid() const { return data_.ppid; }
- rtc::ArrayView<const uint8_t> payload() const { return data_.payload; }
+ webrtc::ArrayView<const uint8_t> payload() const { return data_.payload; }
// Extracts the Data from the chunk, as a destructive action.
Data extract() && { return std::move(data_); }
diff --git a/net/dcsctp/packet/chunk/error_chunk.cc b/net/dcsctp/packet/chunk/error_chunk.cc
index 8311ad2..67a439e 100644
--- a/net/dcsctp/packet/chunk/error_chunk.cc
+++ b/net/dcsctp/packet/chunk/error_chunk.cc
@@ -37,7 +37,7 @@
constexpr int ErrorChunk::kType;
std::optional<ErrorChunk> ErrorChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -51,7 +51,7 @@
}
void ErrorChunk::SerializeTo(std::vector<uint8_t>& out) const {
- rtc::ArrayView<const uint8_t> error_causes = error_causes_.data();
+ webrtc::ArrayView<const uint8_t> error_causes = error_causes_.data();
BoundedByteWriter<kHeaderSize> writer = AllocateTLV(out, error_causes.size());
writer.CopyToVariableData(error_causes);
}
diff --git a/net/dcsctp/packet/chunk/error_chunk.h b/net/dcsctp/packet/chunk/error_chunk.h
index f982547..b8bac53 100644
--- a/net/dcsctp/packet/chunk/error_chunk.h
+++ b/net/dcsctp/packet/chunk/error_chunk.h
@@ -41,7 +41,7 @@
ErrorChunk(ErrorChunk&& other) = default;
ErrorChunk& operator=(ErrorChunk&& other) = default;
- static std::optional<ErrorChunk> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<ErrorChunk> Parse(webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/forward_tsn_chunk.cc b/net/dcsctp/packet/chunk/forward_tsn_chunk.cc
index 0809525..f9cf67e 100644
--- a/net/dcsctp/packet/chunk/forward_tsn_chunk.cc
+++ b/net/dcsctp/packet/chunk/forward_tsn_chunk.cc
@@ -45,7 +45,7 @@
constexpr int ForwardTsnChunk::kType;
std::optional<ForwardTsnChunk> ForwardTsnChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -70,7 +70,7 @@
}
void ForwardTsnChunk::SerializeTo(std::vector<uint8_t>& out) const {
- rtc::ArrayView<const SkippedStream> skipped = skipped_streams();
+ webrtc::ArrayView<const SkippedStream> skipped = skipped_streams();
size_t variable_size = skipped.size() * kSkippedStreamBufferSize;
BoundedByteWriter<kHeaderSize> writer = AllocateTLV(out, variable_size);
diff --git a/net/dcsctp/packet/chunk/forward_tsn_chunk.h b/net/dcsctp/packet/chunk/forward_tsn_chunk.h
index caa3379..ae4250f 100644
--- a/net/dcsctp/packet/chunk/forward_tsn_chunk.h
+++ b/net/dcsctp/packet/chunk/forward_tsn_chunk.h
@@ -41,7 +41,7 @@
: AnyForwardTsnChunk(new_cumulative_tsn, std::move(skipped_streams)) {}
static std::optional<ForwardTsnChunk> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/forward_tsn_common.h b/net/dcsctp/packet/chunk/forward_tsn_common.h
index b9dddd2..ede879c 100644
--- a/net/dcsctp/packet/chunk/forward_tsn_common.h
+++ b/net/dcsctp/packet/chunk/forward_tsn_common.h
@@ -50,7 +50,7 @@
TSN new_cumulative_tsn() const { return new_cumulative_tsn_; }
- rtc::ArrayView<const SkippedStream> skipped_streams() const {
+ webrtc::ArrayView<const SkippedStream> skipped_streams() const {
return skipped_streams_;
}
diff --git a/net/dcsctp/packet/chunk/heartbeat_ack_chunk.cc b/net/dcsctp/packet/chunk/heartbeat_ack_chunk.cc
index ba98436..68855bc 100644
--- a/net/dcsctp/packet/chunk/heartbeat_ack_chunk.cc
+++ b/net/dcsctp/packet/chunk/heartbeat_ack_chunk.cc
@@ -37,7 +37,7 @@
constexpr int HeartbeatAckChunk::kType;
std::optional<HeartbeatAckChunk> HeartbeatAckChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -52,7 +52,7 @@
}
void HeartbeatAckChunk::SerializeTo(std::vector<uint8_t>& out) const {
- rtc::ArrayView<const uint8_t> parameters = parameters_.data();
+ webrtc::ArrayView<const uint8_t> parameters = parameters_.data();
BoundedByteWriter<kHeaderSize> writer = AllocateTLV(out, parameters.size());
writer.CopyToVariableData(parameters);
}
diff --git a/net/dcsctp/packet/chunk/heartbeat_ack_chunk.h b/net/dcsctp/packet/chunk/heartbeat_ack_chunk.h
index 8a63205..ed7b77f 100644
--- a/net/dcsctp/packet/chunk/heartbeat_ack_chunk.h
+++ b/net/dcsctp/packet/chunk/heartbeat_ack_chunk.h
@@ -44,7 +44,7 @@
HeartbeatAckChunk& operator=(HeartbeatAckChunk&& other) = default;
static std::optional<HeartbeatAckChunk> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/heartbeat_request_chunk.cc b/net/dcsctp/packet/chunk/heartbeat_request_chunk.cc
index a94a7e3..dd8f3e8 100644
--- a/net/dcsctp/packet/chunk/heartbeat_request_chunk.cc
+++ b/net/dcsctp/packet/chunk/heartbeat_request_chunk.cc
@@ -37,7 +37,7 @@
constexpr int HeartbeatRequestChunk::kType;
std::optional<HeartbeatRequestChunk> HeartbeatRequestChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -52,7 +52,7 @@
}
void HeartbeatRequestChunk::SerializeTo(std::vector<uint8_t>& out) const {
- rtc::ArrayView<const uint8_t> parameters = parameters_.data();
+ webrtc::ArrayView<const uint8_t> parameters = parameters_.data();
BoundedByteWriter<kHeaderSize> writer = AllocateTLV(out, parameters.size());
writer.CopyToVariableData(parameters);
}
diff --git a/net/dcsctp/packet/chunk/heartbeat_request_chunk.h b/net/dcsctp/packet/chunk/heartbeat_request_chunk.h
index 218bd6a..3b940a4 100644
--- a/net/dcsctp/packet/chunk/heartbeat_request_chunk.h
+++ b/net/dcsctp/packet/chunk/heartbeat_request_chunk.h
@@ -43,7 +43,7 @@
HeartbeatRequestChunk& operator=(HeartbeatRequestChunk&& other) = default;
static std::optional<HeartbeatRequestChunk> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/idata_chunk.cc b/net/dcsctp/packet/chunk/idata_chunk.cc
index 512391d..e084dc3 100644
--- a/net/dcsctp/packet/chunk/idata_chunk.cc
+++ b/net/dcsctp/packet/chunk/idata_chunk.cc
@@ -46,7 +46,7 @@
constexpr int IDataChunk::kType;
std::optional<IDataChunk> IDataChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/chunk/idata_chunk.h b/net/dcsctp/packet/chunk/idata_chunk.h
index c8b6709..c2298d0 100644
--- a/net/dcsctp/packet/chunk/idata_chunk.h
+++ b/net/dcsctp/packet/chunk/idata_chunk.h
@@ -59,7 +59,7 @@
explicit IDataChunk(TSN tsn, Data&& data, bool immediate_ack)
: AnyDataChunk(tsn, std::move(data), immediate_ack) {}
- static std::optional<IDataChunk> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<IDataChunk> Parse(webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc b/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc
index c67ecff..19f5780 100644
--- a/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc
+++ b/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc
@@ -49,7 +49,7 @@
constexpr int IForwardTsnChunk::kType;
std::optional<IForwardTsnChunk> IForwardTsnChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -77,7 +77,7 @@
}
void IForwardTsnChunk::SerializeTo(std::vector<uint8_t>& out) const {
- rtc::ArrayView<const SkippedStream> skipped = skipped_streams();
+ webrtc::ArrayView<const SkippedStream> skipped = skipped_streams();
size_t variable_size = skipped.size() * kSkippedStreamBufferSize;
BoundedByteWriter<kHeaderSize> writer = AllocateTLV(out, variable_size);
diff --git a/net/dcsctp/packet/chunk/iforward_tsn_chunk.h b/net/dcsctp/packet/chunk/iforward_tsn_chunk.h
index fe05221..43ef648 100644
--- a/net/dcsctp/packet/chunk/iforward_tsn_chunk.h
+++ b/net/dcsctp/packet/chunk/iforward_tsn_chunk.h
@@ -41,7 +41,7 @@
: AnyForwardTsnChunk(new_cumulative_tsn, std::move(skipped_streams)) {}
static std::optional<IForwardTsnChunk> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/init_ack_chunk.cc b/net/dcsctp/packet/chunk/init_ack_chunk.cc
index cd7c59f..5b6a03c 100644
--- a/net/dcsctp/packet/chunk/init_ack_chunk.cc
+++ b/net/dcsctp/packet/chunk/init_ack_chunk.cc
@@ -47,7 +47,7 @@
constexpr int InitAckChunk::kType;
std::optional<InitAckChunk> InitAckChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -68,7 +68,7 @@
}
void InitAckChunk::SerializeTo(std::vector<uint8_t>& out) const {
- rtc::ArrayView<const uint8_t> parameters = parameters_.data();
+ webrtc::ArrayView<const uint8_t> parameters = parameters_.data();
BoundedByteWriter<kHeaderSize> writer = AllocateTLV(out, parameters.size());
writer.Store32<4>(*initiate_tag_);
diff --git a/net/dcsctp/packet/chunk/init_ack_chunk.h b/net/dcsctp/packet/chunk/init_ack_chunk.h
index 5058cf1..0b11007 100644
--- a/net/dcsctp/packet/chunk/init_ack_chunk.h
+++ b/net/dcsctp/packet/chunk/init_ack_chunk.h
@@ -51,7 +51,8 @@
InitAckChunk(InitAckChunk&& other) = default;
InitAckChunk& operator=(InitAckChunk&& other) = default;
- static std::optional<InitAckChunk> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<InitAckChunk> Parse(
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/init_chunk.cc b/net/dcsctp/packet/chunk/init_chunk.cc
index c1662e0..c9ca4ae 100644
--- a/net/dcsctp/packet/chunk/init_chunk.cc
+++ b/net/dcsctp/packet/chunk/init_chunk.cc
@@ -46,7 +46,8 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
constexpr int InitChunk::kType;
-std::optional<InitChunk> InitChunk::Parse(rtc::ArrayView<const uint8_t> data) {
+std::optional<InitChunk> InitChunk::Parse(
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -68,7 +69,7 @@
}
void InitChunk::SerializeTo(std::vector<uint8_t>& out) const {
- rtc::ArrayView<const uint8_t> parameters = parameters_.data();
+ webrtc::ArrayView<const uint8_t> parameters = parameters_.data();
BoundedByteWriter<kHeaderSize> writer = AllocateTLV(out, parameters.size());
writer.Store32<4>(*initiate_tag_);
diff --git a/net/dcsctp/packet/chunk/init_chunk.h b/net/dcsctp/packet/chunk/init_chunk.h
index 4f3a9b9..fba4504 100644
--- a/net/dcsctp/packet/chunk/init_chunk.h
+++ b/net/dcsctp/packet/chunk/init_chunk.h
@@ -51,7 +51,7 @@
InitChunk(InitChunk&& other) = default;
InitChunk& operator=(InitChunk&& other) = default;
- static std::optional<InitChunk> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<InitChunk> Parse(webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/reconfig_chunk.cc b/net/dcsctp/packet/chunk/reconfig_chunk.cc
index 91fa7d7..6cbbd17 100644
--- a/net/dcsctp/packet/chunk/reconfig_chunk.cc
+++ b/net/dcsctp/packet/chunk/reconfig_chunk.cc
@@ -41,7 +41,7 @@
constexpr int ReConfigChunk::kType;
std::optional<ReConfigChunk> ReConfigChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -57,7 +57,7 @@
}
void ReConfigChunk::SerializeTo(std::vector<uint8_t>& out) const {
- rtc::ArrayView<const uint8_t> parameters = parameters_.data();
+ webrtc::ArrayView<const uint8_t> parameters = parameters_.data();
BoundedByteWriter<kHeaderSize> writer = AllocateTLV(out, parameters.size());
writer.CopyToVariableData(parameters);
}
diff --git a/net/dcsctp/packet/chunk/reconfig_chunk.h b/net/dcsctp/packet/chunk/reconfig_chunk.h
index 90df22e..d9c85da 100644
--- a/net/dcsctp/packet/chunk/reconfig_chunk.h
+++ b/net/dcsctp/packet/chunk/reconfig_chunk.h
@@ -38,7 +38,8 @@
explicit ReConfigChunk(Parameters parameters)
: parameters_(std::move(parameters)) {}
- static std::optional<ReConfigChunk> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<ReConfigChunk> Parse(
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/sack_chunk.cc b/net/dcsctp/packet/chunk/sack_chunk.cc
index 7af42ac..108c5ca 100644
--- a/net/dcsctp/packet/chunk/sack_chunk.cc
+++ b/net/dcsctp/packet/chunk/sack_chunk.cc
@@ -58,7 +58,8 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
constexpr int SackChunk::kType;
-std::optional<SackChunk> SackChunk::Parse(rtc::ArrayView<const uint8_t> data) {
+std::optional<SackChunk> SackChunk::Parse(
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/chunk/sack_chunk.h b/net/dcsctp/packet/chunk/sack_chunk.h
index ae4807d..59347f4 100644
--- a/net/dcsctp/packet/chunk/sack_chunk.h
+++ b/net/dcsctp/packet/chunk/sack_chunk.h
@@ -54,14 +54,14 @@
a_rwnd_(a_rwnd),
gap_ack_blocks_(std::move(gap_ack_blocks)),
duplicate_tsns_(std::move(duplicate_tsns)) {}
- static std::optional<SackChunk> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<SackChunk> Parse(webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
TSN cumulative_tsn_ack() const { return cumulative_tsn_ack_; }
uint32_t a_rwnd() const { return a_rwnd_; }
- rtc::ArrayView<const GapAckBlock> gap_ack_blocks() const {
+ webrtc::ArrayView<const GapAckBlock> gap_ack_blocks() const {
return gap_ack_blocks_;
}
const std::set<TSN>& duplicate_tsns() const { return duplicate_tsns_; }
diff --git a/net/dcsctp/packet/chunk/shutdown_ack_chunk.cc b/net/dcsctp/packet/chunk/shutdown_ack_chunk.cc
index 3df4e5a..31ba417 100644
--- a/net/dcsctp/packet/chunk/shutdown_ack_chunk.cc
+++ b/net/dcsctp/packet/chunk/shutdown_ack_chunk.cc
@@ -28,7 +28,7 @@
constexpr int ShutdownAckChunk::kType;
std::optional<ShutdownAckChunk> ShutdownAckChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
if (!ParseTLV(data).has_value()) {
return std::nullopt;
}
diff --git a/net/dcsctp/packet/chunk/shutdown_ack_chunk.h b/net/dcsctp/packet/chunk/shutdown_ack_chunk.h
index 4ed9755..e7ae03f 100644
--- a/net/dcsctp/packet/chunk/shutdown_ack_chunk.h
+++ b/net/dcsctp/packet/chunk/shutdown_ack_chunk.h
@@ -36,7 +36,7 @@
ShutdownAckChunk() {}
static std::optional<ShutdownAckChunk> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/shutdown_chunk.cc b/net/dcsctp/packet/chunk/shutdown_chunk.cc
index c7f64dd..8038458 100644
--- a/net/dcsctp/packet/chunk/shutdown_chunk.cc
+++ b/net/dcsctp/packet/chunk/shutdown_chunk.cc
@@ -34,7 +34,7 @@
constexpr int ShutdownChunk::kType;
std::optional<ShutdownChunk> ShutdownChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/chunk/shutdown_chunk.h b/net/dcsctp/packet/chunk/shutdown_chunk.h
index f1090ae..bdb412e 100644
--- a/net/dcsctp/packet/chunk/shutdown_chunk.h
+++ b/net/dcsctp/packet/chunk/shutdown_chunk.h
@@ -36,7 +36,8 @@
explicit ShutdownChunk(TSN cumulative_tsn_ack)
: cumulative_tsn_ack_(cumulative_tsn_ack) {}
- static std::optional<ShutdownChunk> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<ShutdownChunk> Parse(
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/chunk/shutdown_complete_chunk.cc b/net/dcsctp/packet/chunk/shutdown_complete_chunk.cc
index abb04b6..0733f21 100644
--- a/net/dcsctp/packet/chunk/shutdown_complete_chunk.cc
+++ b/net/dcsctp/packet/chunk/shutdown_complete_chunk.cc
@@ -32,7 +32,7 @@
constexpr int ShutdownCompleteChunk::kType;
std::optional<ShutdownCompleteChunk> ShutdownCompleteChunk::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/chunk/shutdown_complete_chunk.h b/net/dcsctp/packet/chunk/shutdown_complete_chunk.h
index 6ab7eb9..73a6d92 100644
--- a/net/dcsctp/packet/chunk/shutdown_complete_chunk.h
+++ b/net/dcsctp/packet/chunk/shutdown_complete_chunk.h
@@ -38,7 +38,7 @@
: tag_reflected_(tag_reflected) {}
static std::optional<ShutdownCompleteChunk> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/crc32c.cc b/net/dcsctp/packet/crc32c.cc
index e3f0dc1..adcb4af 100644
--- a/net/dcsctp/packet/crc32c.cc
+++ b/net/dcsctp/packet/crc32c.cc
@@ -15,7 +15,7 @@
namespace dcsctp {
-uint32_t GenerateCrc32C(rtc::ArrayView<const uint8_t> data) {
+uint32_t GenerateCrc32C(webrtc::ArrayView<const uint8_t> data) {
uint32_t crc32c = crc32c_value(data.data(), data.size());
// Byte swapping for little endian byte order:
diff --git a/net/dcsctp/packet/crc32c.h b/net/dcsctp/packet/crc32c.h
index a969e1b..71ef16c 100644
--- a/net/dcsctp/packet/crc32c.h
+++ b/net/dcsctp/packet/crc32c.h
@@ -17,7 +17,7 @@
namespace dcsctp {
// Generates the CRC32C checksum of `data`.
-uint32_t GenerateCrc32C(rtc::ArrayView<const uint8_t> data);
+uint32_t GenerateCrc32C(webrtc::ArrayView<const uint8_t> data);
} // namespace dcsctp
diff --git a/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.cc b/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.cc
index f675be2..61dc953 100644
--- a/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.cc
+++ b/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.cc
@@ -27,7 +27,7 @@
std::optional<CookieReceivedWhileShuttingDownCause>
CookieReceivedWhileShuttingDownCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
if (!ParseTLV(data).has_value()) {
return std::nullopt;
}
diff --git a/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.h b/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.h
index c2a44c9..cf5c2f3 100644
--- a/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.h
+++ b/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.h
@@ -39,7 +39,7 @@
CookieReceivedWhileShuttingDownCause() {}
static std::optional<CookieReceivedWhileShuttingDownCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.cc b/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.cc
index 9bcba4f..8ddd4fb 100644
--- a/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.cc
+++ b/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.cc
@@ -26,7 +26,7 @@
constexpr int InvalidMandatoryParameterCause::kType;
std::optional<InvalidMandatoryParameterCause>
-InvalidMandatoryParameterCause::Parse(rtc::ArrayView<const uint8_t> data) {
+InvalidMandatoryParameterCause::Parse(webrtc::ArrayView<const uint8_t> data) {
if (!ParseTLV(data).has_value()) {
return std::nullopt;
}
diff --git a/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.h b/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.h
index 9f4f0c9..cdb2a06 100644
--- a/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.h
+++ b/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.h
@@ -38,7 +38,7 @@
InvalidMandatoryParameterCause() {}
static std::optional<InvalidMandatoryParameterCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc
index 63a8445..225ed71 100644
--- a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc
+++ b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc
@@ -34,7 +34,7 @@
constexpr int InvalidStreamIdentifierCause::kType;
std::optional<InvalidStreamIdentifierCause> InvalidStreamIdentifierCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.h b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.h
index 2f4b33e..795f138 100644
--- a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.h
+++ b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.h
@@ -40,7 +40,7 @@
: stream_id_(stream_id) {}
static std::optional<InvalidStreamIdentifierCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc
index 163ace9..378d83d 100644
--- a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc
+++ b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc
@@ -41,7 +41,7 @@
constexpr int MissingMandatoryParameterCause::kType;
std::optional<MissingMandatoryParameterCause>
-MissingMandatoryParameterCause::Parse(rtc::ArrayView<const uint8_t> data) {
+MissingMandatoryParameterCause::Parse(webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.h b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.h
index 03903a9..a777c5f 100644
--- a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.h
+++ b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.h
@@ -36,17 +36,17 @@
static constexpr int kType = MissingMandatoryParameterCauseConfig::kType;
explicit MissingMandatoryParameterCause(
- rtc::ArrayView<const uint16_t> missing_parameter_types)
+ webrtc::ArrayView<const uint16_t> missing_parameter_types)
: missing_parameter_types_(missing_parameter_types.begin(),
missing_parameter_types.end()) {}
static std::optional<MissingMandatoryParameterCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
- rtc::ArrayView<const uint16_t> missing_parameter_types() const {
+ webrtc::ArrayView<const uint16_t> missing_parameter_types() const {
return missing_parameter_types_;
}
diff --git a/net/dcsctp/packet/error_cause/no_user_data_cause.cc b/net/dcsctp/packet/error_cause/no_user_data_cause.cc
index 17c33fa..45cef7e 100644
--- a/net/dcsctp/packet/error_cause/no_user_data_cause.cc
+++ b/net/dcsctp/packet/error_cause/no_user_data_cause.cc
@@ -35,7 +35,7 @@
constexpr int NoUserDataCause::kType;
std::optional<NoUserDataCause> NoUserDataCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/error_cause/no_user_data_cause.h b/net/dcsctp/packet/error_cause/no_user_data_cause.h
index e4092b0..a462a69 100644
--- a/net/dcsctp/packet/error_cause/no_user_data_cause.h
+++ b/net/dcsctp/packet/error_cause/no_user_data_cause.h
@@ -37,7 +37,7 @@
explicit NoUserDataCause(TSN tsn) : tsn_(tsn) {}
static std::optional<NoUserDataCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/error_cause/out_of_resource_error_cause.cc b/net/dcsctp/packet/error_cause/out_of_resource_error_cause.cc
index 552f48e..ffa3c16 100644
--- a/net/dcsctp/packet/error_cause/out_of_resource_error_cause.cc
+++ b/net/dcsctp/packet/error_cause/out_of_resource_error_cause.cc
@@ -26,7 +26,7 @@
constexpr int OutOfResourceErrorCause::kType;
std::optional<OutOfResourceErrorCause> OutOfResourceErrorCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
if (!ParseTLV(data).has_value()) {
return std::nullopt;
}
diff --git a/net/dcsctp/packet/error_cause/out_of_resource_error_cause.h b/net/dcsctp/packet/error_cause/out_of_resource_error_cause.h
index 4234d73..b8b511e 100644
--- a/net/dcsctp/packet/error_cause/out_of_resource_error_cause.h
+++ b/net/dcsctp/packet/error_cause/out_of_resource_error_cause.h
@@ -37,7 +37,7 @@
OutOfResourceErrorCause() {}
static std::optional<OutOfResourceErrorCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/error_cause/protocol_violation_cause.cc b/net/dcsctp/packet/error_cause/protocol_violation_cause.cc
index 04d07bb..d7bc582 100644
--- a/net/dcsctp/packet/error_cause/protocol_violation_cause.cc
+++ b/net/dcsctp/packet/error_cause/protocol_violation_cause.cc
@@ -37,7 +37,7 @@
constexpr int ProtocolViolationCause::kType;
std::optional<ProtocolViolationCause> ProtocolViolationCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -50,7 +50,7 @@
void ProtocolViolationCause::SerializeTo(std::vector<uint8_t>& out) const {
BoundedByteWriter<kHeaderSize> writer =
AllocateTLV(out, additional_information_.size());
- writer.CopyToVariableData(rtc::MakeArrayView(
+ writer.CopyToVariableData(webrtc::MakeArrayView(
reinterpret_cast<const uint8_t*>(additional_information_.data()),
additional_information_.size()));
}
diff --git a/net/dcsctp/packet/error_cause/protocol_violation_cause.h b/net/dcsctp/packet/error_cause/protocol_violation_cause.h
index e4e3db8..bf7f1fb 100644
--- a/net/dcsctp/packet/error_cause/protocol_violation_cause.h
+++ b/net/dcsctp/packet/error_cause/protocol_violation_cause.h
@@ -38,7 +38,7 @@
: additional_information_(additional_information) {}
static std::optional<ProtocolViolationCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.cc b/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.cc
index 5cb2d64..fd3dfa8 100644
--- a/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.cc
+++ b/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.cc
@@ -36,7 +36,7 @@
std::optional<RestartOfAnAssociationWithNewAddressesCause>
RestartOfAnAssociationWithNewAddressesCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.h b/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.h
index 20d7163..d7729e2 100644
--- a/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.h
+++ b/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.h
@@ -38,16 +38,16 @@
RestartOfAnAssociationWithNewAddressesCauseConfig::kType;
explicit RestartOfAnAssociationWithNewAddressesCause(
- rtc::ArrayView<const uint8_t> new_address_tlvs)
+ webrtc::ArrayView<const uint8_t> new_address_tlvs)
: new_address_tlvs_(new_address_tlvs.begin(), new_address_tlvs.end()) {}
static std::optional<RestartOfAnAssociationWithNewAddressesCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
- rtc::ArrayView<const uint8_t> new_address_tlvs() const {
+ webrtc::ArrayView<const uint8_t> new_address_tlvs() const {
return new_address_tlvs_;
}
diff --git a/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc b/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc
index df77d5e..122c28f4 100644
--- a/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc
+++ b/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc
@@ -34,7 +34,7 @@
constexpr int StaleCookieErrorCause::kType;
std::optional<StaleCookieErrorCause> StaleCookieErrorCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/error_cause/stale_cookie_error_cause.h b/net/dcsctp/packet/error_cause/stale_cookie_error_cause.h
index c40fcbc..d44f3db 100644
--- a/net/dcsctp/packet/error_cause/stale_cookie_error_cause.h
+++ b/net/dcsctp/packet/error_cause/stale_cookie_error_cause.h
@@ -38,7 +38,7 @@
: staleness_us_(staleness_us) {}
static std::optional<StaleCookieErrorCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc b/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc
index 4b6aa97..4745142 100644
--- a/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc
+++ b/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc
@@ -34,7 +34,7 @@
constexpr int UnrecognizedChunkTypeCause::kType;
std::optional<UnrecognizedChunkTypeCause> UnrecognizedChunkTypeCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.h b/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.h
index d16e21b..2467c56 100644
--- a/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.h
+++ b/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.h
@@ -41,12 +41,12 @@
: unrecognized_chunk_(std::move(unrecognized_chunk)) {}
static std::optional<UnrecognizedChunkTypeCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
- rtc::ArrayView<const uint8_t> unrecognized_chunk() const {
+ webrtc::ArrayView<const uint8_t> unrecognized_chunk() const {
return unrecognized_chunk_;
}
diff --git a/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.cc b/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.cc
index 448dcb7..708111e 100644
--- a/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.cc
+++ b/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.cc
@@ -33,7 +33,7 @@
constexpr int UnrecognizedParametersCause::kType;
std::optional<UnrecognizedParametersCause> UnrecognizedParametersCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.h b/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.h
index 166cc97..8c0df7f 100644
--- a/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.h
+++ b/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.h
@@ -37,17 +37,17 @@
static constexpr int kType = UnrecognizedParametersCauseConfig::kType;
explicit UnrecognizedParametersCause(
- rtc::ArrayView<const uint8_t> unrecognized_parameters)
+ webrtc::ArrayView<const uint8_t> unrecognized_parameters)
: unrecognized_parameters_(unrecognized_parameters.begin(),
unrecognized_parameters.end()) {}
static std::optional<UnrecognizedParametersCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
- rtc::ArrayView<const uint8_t> unrecognized_parameters() const {
+ webrtc::ArrayView<const uint8_t> unrecognized_parameters() const {
return unrecognized_parameters_;
}
diff --git a/net/dcsctp/packet/error_cause/unresolvable_address_cause.cc b/net/dcsctp/packet/error_cause/unresolvable_address_cause.cc
index 5e0f273..b7b9ffb 100644
--- a/net/dcsctp/packet/error_cause/unresolvable_address_cause.cc
+++ b/net/dcsctp/packet/error_cause/unresolvable_address_cause.cc
@@ -33,7 +33,7 @@
constexpr int UnresolvableAddressCause::kType;
std::optional<UnresolvableAddressCause> UnresolvableAddressCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/error_cause/unresolvable_address_cause.h b/net/dcsctp/packet/error_cause/unresolvable_address_cause.h
index cea735c..e42d3f2 100644
--- a/net/dcsctp/packet/error_cause/unresolvable_address_cause.h
+++ b/net/dcsctp/packet/error_cause/unresolvable_address_cause.h
@@ -37,17 +37,17 @@
static constexpr int kType = UnresolvableAddressCauseConfig::kType;
explicit UnresolvableAddressCause(
- rtc::ArrayView<const uint8_t> unresolvable_address)
+ webrtc::ArrayView<const uint8_t> unresolvable_address)
: unresolvable_address_(unresolvable_address.begin(),
unresolvable_address.end()) {}
static std::optional<UnresolvableAddressCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
- rtc::ArrayView<const uint8_t> unresolvable_address() const {
+ webrtc::ArrayView<const uint8_t> unresolvable_address() const {
return unresolvable_address_;
}
diff --git a/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc b/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc
index 95f53fa..de86983 100644
--- a/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc
+++ b/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc
@@ -37,7 +37,7 @@
constexpr int UserInitiatedAbortCause::kType;
std::optional<UserInitiatedAbortCause> UserInitiatedAbortCause::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
@@ -53,7 +53,7 @@
void UserInitiatedAbortCause::SerializeTo(std::vector<uint8_t>& out) const {
BoundedByteWriter<kHeaderSize> writer =
AllocateTLV(out, upper_layer_abort_reason_.size());
- writer.CopyToVariableData(rtc::MakeArrayView(
+ writer.CopyToVariableData(webrtc::MakeArrayView(
reinterpret_cast<const uint8_t*>(upper_layer_abort_reason_.data()),
upper_layer_abort_reason_.size()));
}
diff --git a/net/dcsctp/packet/error_cause/user_initiated_abort_cause.h b/net/dcsctp/packet/error_cause/user_initiated_abort_cause.h
index e0a6109..4dc4522 100644
--- a/net/dcsctp/packet/error_cause/user_initiated_abort_cause.h
+++ b/net/dcsctp/packet/error_cause/user_initiated_abort_cause.h
@@ -38,7 +38,7 @@
: upper_layer_abort_reason_(upper_layer_abort_reason) {}
static std::optional<UserInitiatedAbortCause> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc
index a59184a..55b189b 100644
--- a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc
@@ -39,7 +39,8 @@
constexpr int AddIncomingStreamsRequestParameter::kType;
std::optional<AddIncomingStreamsRequestParameter>
-AddIncomingStreamsRequestParameter::Parse(rtc::ArrayView<const uint8_t> data) {
+AddIncomingStreamsRequestParameter::Parse(
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.h b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.h
index 8997586..2eebd51 100644
--- a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.h
+++ b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.h
@@ -43,7 +43,7 @@
nbr_of_new_streams_(nbr_of_new_streams) {}
static std::optional<AddIncomingStreamsRequestParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc
index 814de76..3f9e9c3 100644
--- a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc
@@ -38,7 +38,8 @@
constexpr int AddOutgoingStreamsRequestParameter::kType;
std::optional<AddOutgoingStreamsRequestParameter>
-AddOutgoingStreamsRequestParameter::Parse(rtc::ArrayView<const uint8_t> data) {
+AddOutgoingStreamsRequestParameter::Parse(
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.h b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.h
index adfcb48..e7f9fe6 100644
--- a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.h
+++ b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.h
@@ -43,7 +43,7 @@
nbr_of_new_streams_(nbr_of_new_streams) {}
static std::optional<AddOutgoingStreamsRequestParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.cc b/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.cc
index 96c1629..fed399f 100644
--- a/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.cc
+++ b/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.cc
@@ -27,7 +27,7 @@
constexpr int ForwardTsnSupportedParameter::kType;
std::optional<ForwardTsnSupportedParameter> ForwardTsnSupportedParameter::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
if (!ParseTLV(data).has_value()) {
return std::nullopt;
}
diff --git a/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h b/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h
index 45b9dcf..649b2de 100644
--- a/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h
+++ b/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h
@@ -38,7 +38,7 @@
ForwardTsnSupportedParameter() {}
static std::optional<ForwardTsnSupportedParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc b/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc
index a70c814..93d283d 100644
--- a/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc
+++ b/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc
@@ -38,7 +38,7 @@
constexpr int HeartbeatInfoParameter::kType;
std::optional<HeartbeatInfoParameter> HeartbeatInfoParameter::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/heartbeat_info_parameter.h b/net/dcsctp/packet/parameter/heartbeat_info_parameter.h
index 8622d9a..b07da8e 100644
--- a/net/dcsctp/packet/parameter/heartbeat_info_parameter.h
+++ b/net/dcsctp/packet/parameter/heartbeat_info_parameter.h
@@ -34,16 +34,16 @@
public:
static constexpr int kType = HeartbeatInfoParameterConfig::kType;
- explicit HeartbeatInfoParameter(rtc::ArrayView<const uint8_t> info)
+ explicit HeartbeatInfoParameter(webrtc::ArrayView<const uint8_t> info)
: info_(info.begin(), info.end()) {}
static std::optional<HeartbeatInfoParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
- rtc::ArrayView<const uint8_t> info() const { return info_; }
+ webrtc::ArrayView<const uint8_t> info() const { return info_; }
private:
std::vector<uint8_t> info_;
diff --git a/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc
index 3a1e07c..138c2fd 100644
--- a/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc
@@ -43,7 +43,7 @@
constexpr int IncomingSSNResetRequestParameter::kType;
std::optional<IncomingSSNResetRequestParameter>
-IncomingSSNResetRequestParameter::Parse(rtc::ArrayView<const uint8_t> data) {
+IncomingSSNResetRequestParameter::Parse(webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h b/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h
index eb14eb6..1ad9dfc 100644
--- a/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h
+++ b/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h
@@ -44,7 +44,7 @@
stream_ids_(std::move(stream_ids)) {}
static std::optional<IncomingSSNResetRequestParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
@@ -52,7 +52,7 @@
ReconfigRequestSN request_sequence_number() const {
return request_sequence_number_;
}
- rtc::ArrayView<const StreamID> stream_ids() const { return stream_ids_; }
+ webrtc::ArrayView<const StreamID> stream_ids() const { return stream_ids_; }
private:
static constexpr size_t kStreamIdSize = sizeof(uint16_t);
diff --git a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc
index 7b6f248..56ec00e 100644
--- a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc
@@ -49,7 +49,7 @@
constexpr int OutgoingSSNResetRequestParameter::kType;
std::optional<OutgoingSSNResetRequestParameter>
-OutgoingSSNResetRequestParameter::Parse(rtc::ArrayView<const uint8_t> data) {
+OutgoingSSNResetRequestParameter::Parse(webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h
index 3a9855c..109f742 100644
--- a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h
+++ b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h
@@ -50,7 +50,7 @@
stream_ids_(std::move(stream_ids)) {}
static std::optional<OutgoingSSNResetRequestParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
@@ -62,7 +62,7 @@
return response_sequence_number_;
}
TSN sender_last_assigned_tsn() const { return sender_last_assigned_tsn_; }
- rtc::ArrayView<const StreamID> stream_ids() const { return stream_ids_; }
+ webrtc::ArrayView<const StreamID> stream_ids() const { return stream_ids_; }
private:
static constexpr size_t kStreamIdSize = sizeof(uint16_t);
diff --git a/net/dcsctp/packet/parameter/parameter.cc b/net/dcsctp/packet/parameter/parameter.cc
index e300f0a..e6765c1 100644
--- a/net/dcsctp/packet/parameter/parameter.cc
+++ b/net/dcsctp/packet/parameter/parameter.cc
@@ -54,7 +54,7 @@
}
std::vector<ParameterDescriptor> Parameters::descriptors() const {
- rtc::ArrayView<const uint8_t> span(data_);
+ webrtc::ArrayView<const uint8_t> span(data_);
std::vector<ParameterDescriptor> result;
while (!span.empty()) {
BoundedByteReader<kParameterHeaderSize> header(span);
@@ -71,9 +71,9 @@
}
std::optional<Parameters> Parameters::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
// Validate the parameter descriptors
- rtc::ArrayView<const uint8_t> span(data);
+ webrtc::ArrayView<const uint8_t> span(data);
while (!span.empty()) {
if (span.size() < kParameterHeaderSize) {
RTC_DLOG(LS_WARNING) << "Insufficient parameter length";
diff --git a/net/dcsctp/packet/parameter/parameter.h b/net/dcsctp/packet/parameter/parameter.h
index d32157d..5042f16 100644
--- a/net/dcsctp/packet/parameter/parameter.h
+++ b/net/dcsctp/packet/parameter/parameter.h
@@ -43,10 +43,10 @@
};
struct ParameterDescriptor {
- ParameterDescriptor(uint16_t type, rtc::ArrayView<const uint8_t> data)
+ ParameterDescriptor(uint16_t type, webrtc::ArrayView<const uint8_t> data)
: type(type), data(data) {}
uint16_t type;
- rtc::ArrayView<const uint8_t> data;
+ webrtc::ArrayView<const uint8_t> data;
};
class Parameters {
@@ -61,13 +61,13 @@
std::vector<uint8_t> data_;
};
- static std::optional<Parameters> Parse(rtc::ArrayView<const uint8_t> data);
+ static std::optional<Parameters> Parse(webrtc::ArrayView<const uint8_t> data);
Parameters() {}
Parameters(Parameters&& other) = default;
Parameters& operator=(Parameters&& other) = default;
- rtc::ArrayView<const uint8_t> data() const { return data_; }
+ webrtc::ArrayView<const uint8_t> data() const { return data_; }
std::vector<ParameterDescriptor> descriptors() const;
template <typename P>
diff --git a/net/dcsctp/packet/parameter/parameter_test.cc b/net/dcsctp/packet/parameter/parameter_test.cc
index 467e324..2ff49f3 100644
--- a/net/dcsctp/packet/parameter/parameter_test.cc
+++ b/net/dcsctp/packet/parameter/parameter_test.cc
@@ -33,7 +33,7 @@
TSN(789), {StreamID(42)}))
.Build();
- rtc::ArrayView<const uint8_t> serialized = parameters.data();
+ webrtc::ArrayView<const uint8_t> serialized = parameters.data();
ASSERT_HAS_VALUE_AND_ASSIGN(Parameters parsed, Parameters::Parse(serialized));
auto descriptors = parsed.descriptors();
diff --git a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc
index 0346692..b8debe8 100644
--- a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc
+++ b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc
@@ -65,7 +65,7 @@
}
std::optional<ReconfigurationResponseParameter>
-ReconfigurationResponseParameter::Parse(rtc::ArrayView<const uint8_t> data) {
+ReconfigurationResponseParameter::Parse(webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h
index a8cf4dd..37bc745 100644
--- a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h
+++ b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h
@@ -65,7 +65,7 @@
receiver_next_tsn_(receiver_next_tsn) {}
static std::optional<ReconfigurationResponseParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc
index 62e8e3e..93d5f13 100644
--- a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc
@@ -36,7 +36,7 @@
constexpr int SSNTSNResetRequestParameter::kType;
std::optional<SSNTSNResetRequestParameter> SSNTSNResetRequestParameter::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h
index eb156a7..4d83044 100644
--- a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h
+++ b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h
@@ -41,7 +41,7 @@
: request_sequence_number_(request_sequence_number) {}
static std::optional<SSNTSNResetRequestParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/parameter/state_cookie_parameter.cc b/net/dcsctp/packet/parameter/state_cookie_parameter.cc
index ac0fc4c..0c4d068 100644
--- a/net/dcsctp/packet/parameter/state_cookie_parameter.cc
+++ b/net/dcsctp/packet/parameter/state_cookie_parameter.cc
@@ -29,7 +29,7 @@
constexpr int StateCookieParameter::kType;
std::optional<StateCookieParameter> StateCookieParameter::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/state_cookie_parameter.h b/net/dcsctp/packet/parameter/state_cookie_parameter.h
index 473ee4f..d11ce8e 100644
--- a/net/dcsctp/packet/parameter/state_cookie_parameter.h
+++ b/net/dcsctp/packet/parameter/state_cookie_parameter.h
@@ -35,16 +35,16 @@
public:
static constexpr int kType = StateCookieParameterConfig::kType;
- explicit StateCookieParameter(rtc::ArrayView<const uint8_t> data)
+ explicit StateCookieParameter(webrtc::ArrayView<const uint8_t> data)
: data_(data.begin(), data.end()) {}
static std::optional<StateCookieParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
- rtc::ArrayView<const uint8_t> data() const { return data_; }
+ webrtc::ArrayView<const uint8_t> data() const { return data_; }
private:
std::vector<uint8_t> data_;
diff --git a/net/dcsctp/packet/parameter/supported_extensions_parameter.cc b/net/dcsctp/packet/parameter/supported_extensions_parameter.cc
index 174dd69..4163016 100644
--- a/net/dcsctp/packet/parameter/supported_extensions_parameter.cc
+++ b/net/dcsctp/packet/parameter/supported_extensions_parameter.cc
@@ -40,7 +40,7 @@
constexpr int SupportedExtensionsParameter::kType;
std::optional<SupportedExtensionsParameter> SupportedExtensionsParameter::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/supported_extensions_parameter.h b/net/dcsctp/packet/parameter/supported_extensions_parameter.h
index 6a024ad..c7fdbcb 100644
--- a/net/dcsctp/packet/parameter/supported_extensions_parameter.h
+++ b/net/dcsctp/packet/parameter/supported_extensions_parameter.h
@@ -42,7 +42,7 @@
: chunk_types_(std::move(chunk_types)) {}
static std::optional<SupportedExtensionsParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
@@ -52,7 +52,7 @@
chunk_types_.end();
}
- rtc::ArrayView<const uint8_t> chunk_types() const { return chunk_types_; }
+ webrtc::ArrayView<const uint8_t> chunk_types() const { return chunk_types_; }
private:
std::vector<uint8_t> chunk_types_;
diff --git a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc
index 6fbfe7f..4fd46c9 100644
--- a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc
+++ b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc
@@ -31,7 +31,7 @@
std::optional<ZeroChecksumAcceptableChunkParameter>
ZeroChecksumAcceptableChunkParameter::Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
std::optional<BoundedByteReader<kHeaderSize>> reader = ParseTLV(data);
if (!reader.has_value()) {
return std::nullopt;
diff --git a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h
index 4b24692..8b0132d 100644
--- a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h
+++ b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h
@@ -42,7 +42,7 @@
: error_detection_method_(error_detection_method) {}
static std::optional<ZeroChecksumAcceptableChunkParameter> Parse(
- rtc::ArrayView<const uint8_t> data);
+ webrtc::ArrayView<const uint8_t> data);
void SerializeTo(std::vector<uint8_t>& out) const override;
std::string ToString() const override;
diff --git a/net/dcsctp/packet/sctp_packet.cc b/net/dcsctp/packet/sctp_packet.cc
index bf7377c..391d521 100644
--- a/net/dcsctp/packet/sctp_packet.cc
+++ b/net/dcsctp/packet/sctp_packet.cc
@@ -105,8 +105,9 @@
return out;
}
-std::optional<SctpPacket> SctpPacket::Parse(rtc::ArrayView<const uint8_t> data,
- const DcSctpOptions& options) {
+std::optional<SctpPacket> SctpPacket::Parse(
+ webrtc::ArrayView<const uint8_t> data,
+ const DcSctpOptions& options) {
if (data.size() < kHeaderSize + kChunkTlvHeaderSize ||
data.size() > kMaxUdpPacketSize) {
RTC_DLOG(LS_WARNING) << "Invalid packet size";
@@ -161,8 +162,8 @@
std::vector<ChunkDescriptor> descriptors;
descriptors.reserve(kExpectedDescriptorCount);
- rtc::ArrayView<const uint8_t> descriptor_data =
- rtc::ArrayView<const uint8_t>(data_copy).subview(kHeaderSize);
+ webrtc::ArrayView<const uint8_t> descriptor_data =
+ webrtc::ArrayView<const uint8_t>(data_copy).subview(kHeaderSize);
while (!descriptor_data.empty()) {
if (descriptor_data.size() < kChunkTlvHeaderSize) {
RTC_DLOG(LS_WARNING) << "Too small chunk";
diff --git a/net/dcsctp/packet/sctp_packet.h b/net/dcsctp/packet/sctp_packet.h
index 9c06106..3a5ba97 100644
--- a/net/dcsctp/packet/sctp_packet.h
+++ b/net/dcsctp/packet/sctp_packet.h
@@ -42,11 +42,11 @@
struct ChunkDescriptor {
ChunkDescriptor(uint8_t type,
uint8_t flags,
- rtc::ArrayView<const uint8_t> data)
+ webrtc::ArrayView<const uint8_t> data)
: type(type), flags(flags), data(data) {}
uint8_t type;
uint8_t flags;
- rtc::ArrayView<const uint8_t> data;
+ webrtc::ArrayView<const uint8_t> data;
};
SctpPacket(SctpPacket&& other) = default;
@@ -89,14 +89,14 @@
};
// Parses `data` as an SCTP packet and returns it if it validates.
- static std::optional<SctpPacket> Parse(rtc::ArrayView<const uint8_t> data,
+ static std::optional<SctpPacket> Parse(webrtc::ArrayView<const uint8_t> data,
const DcSctpOptions& options);
// Returns the SCTP common header.
const CommonHeader& common_header() const { return common_header_; }
// Returns the chunks (types and offsets) within the packet.
- rtc::ArrayView<const ChunkDescriptor> descriptors() const {
+ webrtc::ArrayView<const ChunkDescriptor> descriptors() const {
return descriptors_;
}
diff --git a/net/dcsctp/packet/tlv_trait.h b/net/dcsctp/packet/tlv_trait.h
index 37b3628..fd46347 100644
--- a/net/dcsctp/packet/tlv_trait.h
+++ b/net/dcsctp/packet/tlv_trait.h
@@ -81,7 +81,7 @@
// Validates the data with regards to size, alignment and type.
// If valid, returns a bounded buffer.
static std::optional<BoundedByteReader<Config::kHeaderSize>> ParseTLV(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
if (data.size() < Config::kHeaderSize) {
tlv_trait_impl::ReportInvalidSize(data.size(), Config::kHeaderSize);
return std::nullopt;
@@ -137,7 +137,7 @@
out.resize(offset + size);
BoundedByteWriter<kTlvHeaderSize> tlv_header(
- rtc::ArrayView<uint8_t>(out.data() + offset, kTlvHeaderSize));
+ webrtc::ArrayView<uint8_t>(out.data() + offset, kTlvHeaderSize));
if (Config::kTypeSizeInBytes == 1) {
tlv_header.template Store8<0>(static_cast<uint8_t>(Config::kType));
} else {
@@ -146,7 +146,7 @@
tlv_header.template Store16<2>(size);
return BoundedByteWriter<Config::kHeaderSize>(
- rtc::ArrayView<uint8_t>(out.data() + offset, size));
+ webrtc::ArrayView<uint8_t>(out.data() + offset, size));
}
private:
diff --git a/net/dcsctp/packet/tlv_trait_test.cc b/net/dcsctp/packet/tlv_trait_test.cc
index e0fabd9..737534b 100644
--- a/net/dcsctp/packet/tlv_trait_test.cc
+++ b/net/dcsctp/packet/tlv_trait_test.cc
@@ -41,11 +41,11 @@
writer.Store16<10>(0x0708);
uint8_t variable_data[kVariableSize] = {0xDE, 0xAD, 0xBE, 0xEF};
- writer.CopyToVariableData(rtc::ArrayView<const uint8_t>(variable_data));
+ writer.CopyToVariableData(webrtc::ArrayView<const uint8_t>(variable_data));
}
static std::optional<BoundedByteReader<OneByteTypeConfig::kHeaderSize>> Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
return ParseTLV(data);
}
};
@@ -90,11 +90,11 @@
writer.Store32<4>(0x01020304U);
uint8_t variable_data[] = {0x05, 0x06, 0x07, 0x08, 0xDE, 0xAD, 0xBE, 0xEF};
- writer.CopyToVariableData(rtc::ArrayView<const uint8_t>(variable_data));
+ writer.CopyToVariableData(webrtc::ArrayView<const uint8_t>(variable_data));
}
static std::optional<BoundedByteReader<TwoByteTypeConfig::kHeaderSize>> Parse(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
return ParseTLV(data);
}
};
diff --git a/net/dcsctp/public/dcsctp_message.h b/net/dcsctp/public/dcsctp_message.h
index 38e6763..bcf4486 100644
--- a/net/dcsctp/public/dcsctp_message.h
+++ b/net/dcsctp/public/dcsctp_message.h
@@ -39,7 +39,7 @@
PPID ppid() const { return ppid_; }
// The payload of the message.
- rtc::ArrayView<const uint8_t> payload() const { return payload_; }
+ webrtc::ArrayView<const uint8_t> payload() const { return payload_; }
// When destructing the message, extracts the payload.
std::vector<uint8_t> ReleasePayload() && { return std::move(payload_); }
diff --git a/net/dcsctp/public/dcsctp_socket.h b/net/dcsctp/public/dcsctp_socket.h
index 6186837..bce886f 100644
--- a/net/dcsctp/public/dcsctp_socket.h
+++ b/net/dcsctp/public/dcsctp_socket.h
@@ -287,14 +287,14 @@
//
// Note that it's NOT ALLOWED to call into this library from within this
// callback.
- virtual void SendPacket(rtc::ArrayView<const uint8_t> /* data */) {}
+ virtual void SendPacket(webrtc::ArrayView<const uint8_t> /* data */) {}
// Called when the library wants the packet serialized as `data` to be sent.
//
// Note that it's NOT ALLOWED to call into this library from within this
// callback.
virtual SendPacketStatus SendPacketWithStatus(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
SendPacket(data);
return SendPacketStatus::kSuccess;
}
@@ -403,21 +403,21 @@
//
// It is allowed to call into this library from within this callback.
virtual void OnStreamsResetFailed(
- rtc::ArrayView<const StreamID> outgoing_streams,
+ webrtc::ArrayView<const StreamID> outgoing_streams,
absl::string_view reason) = 0;
// Indicates that a stream reset request has been performed.
//
// It is allowed to call into this library from within this callback.
virtual void OnStreamsResetPerformed(
- rtc::ArrayView<const StreamID> outgoing_streams) = 0;
+ webrtc::ArrayView<const StreamID> outgoing_streams) = 0;
// When a peer has reset some of its outgoing streams, this will be called. An
// empty list indicates that all streams have been reset.
//
// It is allowed to call into this library from within this callback.
virtual void OnIncomingStreamsReset(
- rtc::ArrayView<const StreamID> incoming_streams) = 0;
+ webrtc::ArrayView<const StreamID> incoming_streams) = 0;
// Will be called when the amount of data buffered to be sent falls to or
// below the threshold set when calling `SetBufferedAmountLowThreshold`.
@@ -523,7 +523,7 @@
virtual ~DcSctpSocketInterface() = default;
// To be called when an incoming SCTP packet is to be processed.
- virtual void ReceivePacket(rtc::ArrayView<const uint8_t> data) = 0;
+ virtual void ReceivePacket(webrtc::ArrayView<const uint8_t> data) = 0;
// To be called when a timeout has expired. The `timeout_id` is provided
// when the timeout was initiated.
@@ -585,7 +585,7 @@
// This has identical semantics to Send, except that it may coalesce many
// messages into a single SCTP packet if they would fit.
virtual std::vector<SendStatus> SendMany(
- rtc::ArrayView<DcSctpMessage> messages,
+ webrtc::ArrayView<DcSctpMessage> messages,
const SendOptions& send_options) = 0;
// Resetting streams is an asynchronous operation and the results will
@@ -604,7 +604,7 @@
// supports stream resetting. Calling this method on e.g. a closed association
// or streams that don't support resetting will not perform any operation.
virtual ResetStreamsStatus ResetStreams(
- rtc::ArrayView<const StreamID> outgoing_streams) = 0;
+ webrtc::ArrayView<const StreamID> outgoing_streams) = 0;
// Returns the number of bytes of data currently queued to be sent on a given
// stream.
diff --git a/net/dcsctp/public/mock_dcsctp_socket.h b/net/dcsctp/public/mock_dcsctp_socket.h
index 627b20d..c1c59fe 100644
--- a/net/dcsctp/public/mock_dcsctp_socket.h
+++ b/net/dcsctp/public/mock_dcsctp_socket.h
@@ -21,7 +21,7 @@
public:
MOCK_METHOD(void,
ReceivePacket,
- (rtc::ArrayView<const uint8_t> data),
+ (webrtc::ArrayView<const uint8_t> data),
(override));
MOCK_METHOD(void, HandleTimeout, (TimeoutID timeout_id), (override));
@@ -60,13 +60,13 @@
MOCK_METHOD(std::vector<SendStatus>,
SendMany,
- (rtc::ArrayView<DcSctpMessage> messages,
+ (webrtc::ArrayView<DcSctpMessage> messages,
const SendOptions& send_options),
(override));
MOCK_METHOD(ResetStreamsStatus,
ResetStreams,
- (rtc::ArrayView<const StreamID> outgoing_streams),
+ (webrtc::ArrayView<const StreamID> outgoing_streams),
(override));
MOCK_METHOD(size_t, buffered_amount, (StreamID stream_id), (const, override));
diff --git a/net/dcsctp/public/packet_observer.h b/net/dcsctp/public/packet_observer.h
index fe75678..0eb1d4f 100644
--- a/net/dcsctp/public/packet_observer.h
+++ b/net/dcsctp/public/packet_observer.h
@@ -25,12 +25,12 @@
// Called when a packet is sent, with the current time (in milliseconds) as
// `now`, and the packet payload as `payload`.
virtual void OnSentPacket(TimeMs now,
- rtc::ArrayView<const uint8_t> payload) = 0;
+ webrtc::ArrayView<const uint8_t> payload) = 0;
// Called when a packet is received, with the current time (in milliseconds)
// as `now`, and the packet payload as `payload`.
virtual void OnReceivedPacket(TimeMs now,
- rtc::ArrayView<const uint8_t> payload) = 0;
+ webrtc::ArrayView<const uint8_t> payload) = 0;
};
} // namespace dcsctp
diff --git a/net/dcsctp/public/text_pcap_packet_observer.cc b/net/dcsctp/public/text_pcap_packet_observer.cc
index 35a80db..e435852 100644
--- a/net/dcsctp/public/text_pcap_packet_observer.cc
+++ b/net/dcsctp/public/text_pcap_packet_observer.cc
@@ -18,13 +18,13 @@
void TextPcapPacketObserver::OnSentPacket(
dcsctp::TimeMs now,
- rtc::ArrayView<const uint8_t> payload) {
+ webrtc::ArrayView<const uint8_t> payload) {
PrintPacket("O ", name_, now, payload);
}
void TextPcapPacketObserver::OnReceivedPacket(
dcsctp::TimeMs now,
- rtc::ArrayView<const uint8_t> payload) {
+ webrtc::ArrayView<const uint8_t> payload) {
PrintPacket("I ", name_, now, payload);
}
@@ -32,7 +32,7 @@
absl::string_view prefix,
absl::string_view socket_name,
dcsctp::TimeMs now,
- rtc::ArrayView<const uint8_t> payload) {
+ webrtc::ArrayView<const uint8_t> payload) {
webrtc::StringBuilder s;
s << "\n" << prefix;
int64_t remaining = *now % (24 * 60 * 60 * 1000);
diff --git a/net/dcsctp/public/text_pcap_packet_observer.h b/net/dcsctp/public/text_pcap_packet_observer.h
index 0685771..2434511 100644
--- a/net/dcsctp/public/text_pcap_packet_observer.h
+++ b/net/dcsctp/public/text_pcap_packet_observer.h
@@ -26,17 +26,17 @@
// Implementation of `dcsctp::PacketObserver`.
void OnSentPacket(dcsctp::TimeMs now,
- rtc::ArrayView<const uint8_t> payload) override;
+ webrtc::ArrayView<const uint8_t> payload) override;
void OnReceivedPacket(dcsctp::TimeMs now,
- rtc::ArrayView<const uint8_t> payload) override;
+ webrtc::ArrayView<const uint8_t> payload) override;
// Prints a packet to the log. Exposed to allow it to be used in compatibility
// tests suites that don't use PacketObserver.
static void PrintPacket(absl::string_view prefix,
absl::string_view socket_name,
dcsctp::TimeMs now,
- rtc::ArrayView<const uint8_t> payload);
+ webrtc::ArrayView<const uint8_t> payload);
private:
const std::string name_;
diff --git a/net/dcsctp/rx/interleaved_reassembly_streams.cc b/net/dcsctp/rx/interleaved_reassembly_streams.cc
index e4df138..c34c042 100644
--- a/net/dcsctp/rx/interleaved_reassembly_streams.cc
+++ b/net/dcsctp/rx/interleaved_reassembly_streams.cc
@@ -222,7 +222,8 @@
size_t InterleavedReassemblyStreams::HandleForwardTsn(
UnwrappedTSN /* new_cumulative_ack_tsn */,
- rtc::ArrayView<const AnyForwardTsnChunk::SkippedStream> skipped_streams) {
+ webrtc::ArrayView<const AnyForwardTsnChunk::SkippedStream>
+ skipped_streams) {
size_t removed_bytes = 0;
for (const auto& skipped : skipped_streams) {
removed_bytes +=
@@ -233,7 +234,7 @@
}
void InterleavedReassemblyStreams::ResetStreams(
- rtc::ArrayView<const StreamID> stream_ids) {
+ webrtc::ArrayView<const StreamID> stream_ids) {
if (stream_ids.empty()) {
for (auto& entry : streams_) {
entry.second.Reset();
diff --git a/net/dcsctp/rx/interleaved_reassembly_streams.h b/net/dcsctp/rx/interleaved_reassembly_streams.h
index 2dd7d16..2213fbb 100644
--- a/net/dcsctp/rx/interleaved_reassembly_streams.h
+++ b/net/dcsctp/rx/interleaved_reassembly_streams.h
@@ -35,10 +35,10 @@
size_t HandleForwardTsn(
UnwrappedTSN new_cumulative_ack_tsn,
- rtc::ArrayView<const AnyForwardTsnChunk::SkippedStream> skipped_streams)
- override;
+ webrtc::ArrayView<const AnyForwardTsnChunk::SkippedStream>
+ skipped_streams) override;
- void ResetStreams(rtc::ArrayView<const StreamID> stream_ids) override;
+ void ResetStreams(webrtc::ArrayView<const StreamID> stream_ids) override;
HandoverReadinessStatus GetHandoverReadiness() const override;
void AddHandoverState(DcSctpSocketHandoverState& state) override;
diff --git a/net/dcsctp/rx/reassembly_queue.cc b/net/dcsctp/rx/reassembly_queue.cc
index 5bd0b03..439863a 100644
--- a/net/dcsctp/rx/reassembly_queue.cc
+++ b/net/dcsctp/rx/reassembly_queue.cc
@@ -59,7 +59,7 @@
watermark_bytes_(max_size_bytes * kHighWatermarkLimit),
streams_(CreateStreams(
log_prefix_,
- [this](rtc::ArrayView<const UnwrappedTSN> tsns,
+ [this](webrtc::ArrayView<const UnwrappedTSN> tsns,
DcSctpMessage message) {
AddReassembledMessage(tsns, std::move(message));
},
@@ -113,7 +113,7 @@
}
void ReassemblyQueue::ResetStreamsAndLeaveDeferredReset(
- rtc::ArrayView<const StreamID> stream_ids) {
+ webrtc::ArrayView<const StreamID> stream_ids) {
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Resetting streams: ["
<< webrtc::StrJoin(stream_ids, ",",
[](webrtc::StringBuilder& sb,
@@ -146,7 +146,7 @@
void ReassemblyQueue::EnterDeferredReset(
TSN sender_last_assigned_tsn,
- rtc::ArrayView<const StreamID> streams) {
+ webrtc::ArrayView<const StreamID> streams) {
if (!deferred_reset_streams_.has_value()) {
RTC_DLOG(LS_VERBOSE) << log_prefix_
<< "Entering deferred reset; sender_last_assigned_tsn="
@@ -165,7 +165,7 @@
}
void ReassemblyQueue::AddReassembledMessage(
- rtc::ArrayView<const UnwrappedTSN> tsns,
+ webrtc::ArrayView<const UnwrappedTSN> tsns,
DcSctpMessage message) {
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Assembled message from TSN=["
<< webrtc::StrJoin(
@@ -182,7 +182,8 @@
void ReassemblyQueue::HandleForwardTsn(
TSN new_cumulative_tsn,
- rtc::ArrayView<const AnyForwardTsnChunk::SkippedStream> skipped_streams) {
+ webrtc::ArrayView<const AnyForwardTsnChunk::SkippedStream>
+ skipped_streams) {
UnwrappedTSN tsn = tsn_unwrapper_.Unwrap(new_cumulative_tsn);
if (deferred_reset_streams_.has_value() &&
diff --git a/net/dcsctp/rx/reassembly_queue.h b/net/dcsctp/rx/reassembly_queue.h
index ef6f0fe..7308fdd 100644
--- a/net/dcsctp/rx/reassembly_queue.h
+++ b/net/dcsctp/rx/reassembly_queue.h
@@ -90,16 +90,17 @@
// partial reliability.
void HandleForwardTsn(
TSN new_cumulative_tsn,
- rtc::ArrayView<const AnyForwardTsnChunk::SkippedStream> skipped_streams);
+ webrtc::ArrayView<const AnyForwardTsnChunk::SkippedStream>
+ skipped_streams);
// Resets the provided streams and leaves deferred reset processing, if
// enabled.
void ResetStreamsAndLeaveDeferredReset(
- rtc::ArrayView<const StreamID> stream_ids);
+ webrtc::ArrayView<const StreamID> stream_ids);
// Enters deferred reset processing.
void EnterDeferredReset(TSN sender_last_assigned_tsn,
- rtc::ArrayView<const StreamID> streams);
+ webrtc::ArrayView<const StreamID> streams);
// The number of payload bytes that have been queued. Note that the actual
// memory usage is higher due to additional overhead of tracking received
@@ -138,7 +139,7 @@
};
bool IsConsistent() const;
- void AddReassembledMessage(rtc::ArrayView<const UnwrappedTSN> tsns,
+ void AddReassembledMessage(webrtc::ArrayView<const UnwrappedTSN> tsns,
DcSctpMessage message);
const absl::string_view log_prefix_;
diff --git a/net/dcsctp/rx/reassembly_queue_test.cc b/net/dcsctp/rx/reassembly_queue_test.cc
index b0b2c06..dc15ace 100644
--- a/net/dcsctp/rx/reassembly_queue_test.cc
+++ b/net/dcsctp/rx/reassembly_queue_test.cc
@@ -97,7 +97,7 @@
TEST_F(ReassemblyQueueTest, LargeUnorderedChunkAllPermutations) {
std::vector<uint32_t> tsns = {10, 11, 12, 13};
- rtc::ArrayView<const uint8_t> payload(kLongPayload);
+ webrtc::ArrayView<const uint8_t> payload(kLongPayload);
do {
ReassemblyQueue reasm("log: ", kBufferSize);
@@ -133,7 +133,7 @@
TEST_F(ReassemblyQueueTest, ManySmallOrderedMessages) {
std::vector<uint32_t> tsns = {10, 11, 12, 13};
- rtc::ArrayView<const uint8_t> payload(kLongPayload);
+ webrtc::ArrayView<const uint8_t> payload(kLongPayload);
do {
ReassemblyQueue reasm("log: ", kBufferSize);
for (size_t i = 0; i < tsns.size(); i++) {
@@ -343,7 +343,7 @@
StreamID stream_ids[] = {StreamID(1), StreamID(2), StreamID(1),
StreamID(1), StreamID(2), StreamID(2)};
FSN fsns[] = {FSN(0), FSN(0), FSN(1), FSN(2), FSN(1), FSN(2)};
- rtc::ArrayView<const uint8_t> payload(kSixBytePayload);
+ webrtc::ArrayView<const uint8_t> payload(kSixBytePayload);
do {
ReassemblyQueue reasm("log: ", kBufferSize,
/*use_message_interleaving=*/true);
diff --git a/net/dcsctp/rx/reassembly_streams.h b/net/dcsctp/rx/reassembly_streams.h
index 0ecfac0..fab5966 100644
--- a/net/dcsctp/rx/reassembly_streams.h
+++ b/net/dcsctp/rx/reassembly_streams.h
@@ -46,7 +46,7 @@
// message has been assembled as well as indicating from which TSNs this
// message was assembled from.
using OnAssembledMessage =
- std::function<void(rtc::ArrayView<const UnwrappedTSN> tsns,
+ std::function<void(webrtc::ArrayView<const UnwrappedTSN> tsns,
DcSctpMessage message)>;
virtual ~ReassemblyStreams() = default;
@@ -71,13 +71,13 @@
// this operation.
virtual size_t HandleForwardTsn(
UnwrappedTSN new_cumulative_ack_tsn,
- rtc::ArrayView<const AnyForwardTsnChunk::SkippedStream>
+ webrtc::ArrayView<const AnyForwardTsnChunk::SkippedStream>
skipped_streams) = 0;
// Called for incoming (possibly deferred) RE_CONFIG chunks asking for
// either a few streams, or all streams (when the list is empty) to be
// reset - to have their next SSN or Message ID to be zero.
- virtual void ResetStreams(rtc::ArrayView<const StreamID> stream_ids) = 0;
+ virtual void ResetStreams(webrtc::ArrayView<const StreamID> stream_ids) = 0;
virtual HandoverReadinessStatus GetHandoverReadiness() const = 0;
virtual void AddHandoverState(DcSctpSocketHandoverState& state) = 0;
diff --git a/net/dcsctp/rx/traditional_reassembly_streams.cc b/net/dcsctp/rx/traditional_reassembly_streams.cc
index 296258c..aca565d 100644
--- a/net/dcsctp/rx/traditional_reassembly_streams.cc
+++ b/net/dcsctp/rx/traditional_reassembly_streams.cc
@@ -284,7 +284,8 @@
size_t TraditionalReassemblyStreams::HandleForwardTsn(
UnwrappedTSN new_cumulative_ack_tsn,
- rtc::ArrayView<const AnyForwardTsnChunk::SkippedStream> skipped_streams) {
+ webrtc::ArrayView<const AnyForwardTsnChunk::SkippedStream>
+ skipped_streams) {
size_t bytes_removed = 0;
// The `skipped_streams` only cover ordered messages - need to
// iterate all unordered streams manually to remove those chunks.
@@ -302,7 +303,7 @@
}
void TraditionalReassemblyStreams::ResetStreams(
- rtc::ArrayView<const StreamID> stream_ids) {
+ webrtc::ArrayView<const StreamID> stream_ids) {
if (stream_ids.empty()) {
for (auto& [stream_id, stream] : ordered_streams_) {
RTC_DLOG(LS_VERBOSE) << log_prefix_
diff --git a/net/dcsctp/rx/traditional_reassembly_streams.h b/net/dcsctp/rx/traditional_reassembly_streams.h
index 9214a9b..f755c5f 100644
--- a/net/dcsctp/rx/traditional_reassembly_streams.h
+++ b/net/dcsctp/rx/traditional_reassembly_streams.h
@@ -36,10 +36,10 @@
size_t HandleForwardTsn(
UnwrappedTSN new_cumulative_ack_tsn,
- rtc::ArrayView<const AnyForwardTsnChunk::SkippedStream> skipped_streams)
- override;
+ webrtc::ArrayView<const AnyForwardTsnChunk::SkippedStream>
+ skipped_streams) override;
- void ResetStreams(rtc::ArrayView<const StreamID> stream_ids) override;
+ void ResetStreams(webrtc::ArrayView<const StreamID> stream_ids) override;
HandoverReadinessStatus GetHandoverReadiness() const override;
void AddHandoverState(DcSctpSocketHandoverState& state) override;
diff --git a/net/dcsctp/socket/callback_deferrer.cc b/net/dcsctp/socket/callback_deferrer.cc
index 2cd3d04..a17ba75 100644
--- a/net/dcsctp/socket/callback_deferrer.cc
+++ b/net/dcsctp/socket/callback_deferrer.cc
@@ -37,7 +37,7 @@
}
SendPacketStatus CallbackDeferrer::SendPacketWithStatus(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
// Will not be deferred - call directly.
return underlying_.SendPacketWithStatus(data);
}
@@ -117,7 +117,7 @@
}
void CallbackDeferrer::OnStreamsResetFailed(
- rtc::ArrayView<const StreamID> outgoing_streams,
+ webrtc::ArrayView<const StreamID> outgoing_streams,
absl::string_view reason) {
RTC_DCHECK(prepared_);
deferred_.emplace_back(
@@ -131,7 +131,7 @@
}
void CallbackDeferrer::OnStreamsResetPerformed(
- rtc::ArrayView<const StreamID> outgoing_streams) {
+ webrtc::ArrayView<const StreamID> outgoing_streams) {
RTC_DCHECK(prepared_);
deferred_.emplace_back(
+[](CallbackData data, DcSctpSocketCallbacks& cb) {
@@ -142,7 +142,7 @@
}
void CallbackDeferrer::OnIncomingStreamsReset(
- rtc::ArrayView<const StreamID> incoming_streams) {
+ webrtc::ArrayView<const StreamID> incoming_streams) {
RTC_DCHECK(prepared_);
deferred_.emplace_back(
+[](CallbackData data, DcSctpSocketCallbacks& cb) {
diff --git a/net/dcsctp/socket/callback_deferrer.h b/net/dcsctp/socket/callback_deferrer.h
index ce4440f..d7cb0db 100644
--- a/net/dcsctp/socket/callback_deferrer.h
+++ b/net/dcsctp/socket/callback_deferrer.h
@@ -62,7 +62,7 @@
// Implementation of DcSctpSocketCallbacks
SendPacketStatus SendPacketWithStatus(
- rtc::ArrayView<const uint8_t> data) override;
+ webrtc::ArrayView<const uint8_t> data) override;
std::unique_ptr<Timeout> CreateTimeout(
webrtc::TaskQueueBase::DelayPrecision precision) override;
TimeMs TimeMillis() override;
@@ -74,12 +74,12 @@
void OnConnected() override;
void OnClosed() override;
void OnConnectionRestarted() override;
- void OnStreamsResetFailed(rtc::ArrayView<const StreamID> outgoing_streams,
+ void OnStreamsResetFailed(webrtc::ArrayView<const StreamID> outgoing_streams,
absl::string_view reason) override;
void OnStreamsResetPerformed(
- rtc::ArrayView<const StreamID> outgoing_streams) override;
+ webrtc::ArrayView<const StreamID> outgoing_streams) override;
void OnIncomingStreamsReset(
- rtc::ArrayView<const StreamID> incoming_streams) override;
+ webrtc::ArrayView<const StreamID> incoming_streams) override;
void OnBufferedAmountLow(StreamID stream_id) override;
void OnTotalBufferedAmountLow() override;
diff --git a/net/dcsctp/socket/dcsctp_socket.cc b/net/dcsctp/socket/dcsctp_socket.cc
index 7b4b762..6c889cb 100644
--- a/net/dcsctp/socket/dcsctp_socket.cc
+++ b/net/dcsctp/socket/dcsctp_socket.cc
@@ -168,7 +168,7 @@
}
SctpImplementation DeterminePeerImplementation(
- rtc::ArrayView<const uint8_t> cookie) {
+ webrtc::ArrayView<const uint8_t> cookie) {
if (cookie.size() > 8) {
absl::string_view magic(reinterpret_cast<const char*>(cookie.data()), 8);
if (magic == "dcSCTP00") {
@@ -491,7 +491,7 @@
}
std::vector<SendStatus> DcSctpSocket::SendMany(
- rtc::ArrayView<DcSctpMessage> messages,
+ webrtc::ArrayView<DcSctpMessage> messages,
const SendOptions& send_options) {
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
Timestamp now = callbacks_.Now();
@@ -557,7 +557,7 @@
}
ResetStreamsStatus DcSctpSocket::ResetStreams(
- rtc::ArrayView<const StreamID> outgoing_streams) {
+ webrtc::ArrayView<const StreamID> outgoing_streams) {
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
if (tcb_ == nullptr) {
@@ -779,7 +779,7 @@
RTC_DCHECK(IsConsistent());
}
-void DcSctpSocket::ReceivePacket(rtc::ArrayView<const uint8_t> data) {
+void DcSctpSocket::ReceivePacket(webrtc::ArrayView<const uint8_t> data) {
CallbackDeferrer::ScopedDeferrer deferrer(callbacks_);
++metrics_.rx_packets_count;
@@ -829,7 +829,8 @@
RTC_DCHECK(IsConsistent());
}
-void DcSctpSocket::DebugPrintOutgoing(rtc::ArrayView<const uint8_t> payload) {
+void DcSctpSocket::DebugPrintOutgoing(
+ webrtc::ArrayView<const uint8_t> payload) {
auto packet = SctpPacket::Parse(payload, options_);
RTC_DCHECK(packet.has_value());
@@ -1008,7 +1009,7 @@
return tcb_->current_rto();
}
-void DcSctpSocket::OnSentPacket(rtc::ArrayView<const uint8_t> packet,
+void DcSctpSocket::OnSentPacket(webrtc::ArrayView<const uint8_t> packet,
SendPacketStatus status) {
// The packet observer is invoked even if the packet was failed to be sent, to
// indicate an attempt was made.
diff --git a/net/dcsctp/socket/dcsctp_socket.h b/net/dcsctp/socket/dcsctp_socket.h
index f694307..d68711e 100644
--- a/net/dcsctp/socket/dcsctp_socket.h
+++ b/net/dcsctp/socket/dcsctp_socket.h
@@ -83,7 +83,7 @@
DcSctpSocket& operator=(const DcSctpSocket&) = delete;
// Implementation of `DcSctpSocketInterface`.
- void ReceivePacket(rtc::ArrayView<const uint8_t> data) override;
+ void ReceivePacket(webrtc::ArrayView<const uint8_t> data) override;
void HandleTimeout(TimeoutID timeout_id) override;
void Connect() override;
void RestoreFromState(const DcSctpSocketHandoverState& state) override;
@@ -91,10 +91,10 @@
void Close() override;
SendStatus Send(DcSctpMessage message,
const SendOptions& send_options) override;
- std::vector<SendStatus> SendMany(rtc::ArrayView<DcSctpMessage> messages,
+ std::vector<SendStatus> SendMany(webrtc::ArrayView<DcSctpMessage> messages,
const SendOptions& send_options) override;
ResetStreamsStatus ResetStreams(
- rtc::ArrayView<const StreamID> outgoing_streams) override;
+ webrtc::ArrayView<const StreamID> outgoing_streams) override;
SocketState state() const override;
const DcSctpOptions& options() const override { return options_; }
void SetMaxMessageSize(size_t max_message_size) override;
@@ -158,7 +158,7 @@
webrtc::TimeDelta OnInitTimerExpiry();
webrtc::TimeDelta OnCookieTimerExpiry();
webrtc::TimeDelta OnShutdownTimerExpiry();
- void OnSentPacket(rtc::ArrayView<const uint8_t> packet,
+ void OnSentPacket(webrtc::ArrayView<const uint8_t> packet,
SendPacketStatus status);
// Sends SHUTDOWN or SHUTDOWN-ACK if the socket is shutting down and if all
// outstanding data has been acknowledged.
@@ -181,7 +181,7 @@
bool ValidatePacket(const SctpPacket& packet);
// Parses `payload`, which is a serialized packet that is just going to be
// sent and prints all chunks.
- void DebugPrintOutgoing(rtc::ArrayView<const uint8_t> payload);
+ void DebugPrintOutgoing(webrtc::ArrayView<const uint8_t> payload);
// Called whenever data has been received, or the cumulative acknowledgment
// TSN has moved, that may result in delivering messages.
void MaybeDeliverMessages();
diff --git a/net/dcsctp/socket/dcsctp_socket_network_test.cc b/net/dcsctp/socket/dcsctp_socket_network_test.cc
index 2bcd47d..09a8bbb 100644
--- a/net/dcsctp/socket/dcsctp_socket_network_test.cc
+++ b/net/dcsctp/socket/dcsctp_socket_network_test.cc
@@ -114,13 +114,13 @@
dest_address_ = socket.source_address_;
}
- void SetReceiver(std::function<void(rtc::CopyOnWriteBuffer)> receiver) {
+ void SetReceiver(std::function<void(webrtc::CopyOnWriteBuffer)> receiver) {
receiver_ = std::move(receiver);
}
- void SendPacket(rtc::ArrayView<const uint8_t> data) {
+ void SendPacket(webrtc::ArrayView<const uint8_t> data) {
endpoint_->SendPacket(source_address_, dest_address_,
- rtc::CopyOnWriteBuffer(data.data(), data.size()));
+ webrtc::CopyOnWriteBuffer(data.data(), data.size()));
}
private:
@@ -129,7 +129,7 @@
receiver_(std::move(packet.data));
}
- std::function<void(rtc::CopyOnWriteBuffer)> receiver_;
+ std::function<void(webrtc::CopyOnWriteBuffer)> receiver_;
webrtc::EmulatedEndpoint* endpoint_ = nullptr;
webrtc::SocketAddress source_address_;
webrtc::SocketAddress dest_address_;
@@ -153,7 +153,7 @@
random_(GetUniqueSeed()),
sctp_socket_(name, *this, nullptr, sctp_options),
last_bandwidth_printout_(Now()) {
- emulated_socket.SetReceiver([this](rtc::CopyOnWriteBuffer buf) {
+ emulated_socket.SetReceiver([this](webrtc::CopyOnWriteBuffer buf) {
// The receiver will be executed on the NetworkEmulation task queue, but
// the dcSCTP socket is owned by `thread_` and is not thread-safe.
thread_->PostTask([this, buf] { this->sctp_socket_.ReceivePacket(buf); });
@@ -181,7 +181,7 @@
}
}
- void SendPacket(rtc::ArrayView<const uint8_t> data) override {
+ void SendPacket(webrtc::ArrayView<const uint8_t> data) override {
emulated_socket_.SendPacket(data);
}
@@ -218,14 +218,14 @@
void OnConnectionRestarted() override {}
void OnStreamsResetFailed(
- rtc::ArrayView<const StreamID> /* outgoing_streams */,
+ webrtc::ArrayView<const StreamID> /* outgoing_streams */,
absl::string_view /* reason */) override {}
void OnStreamsResetPerformed(
- rtc::ArrayView<const StreamID> /* outgoing_streams */) override {}
+ webrtc::ArrayView<const StreamID> /* outgoing_streams */) override {}
void OnIncomingStreamsReset(
- rtc::ArrayView<const StreamID> /* incoming_streams */) override {}
+ webrtc::ArrayView<const StreamID> /* incoming_streams */) override {}
void NotifyOutgoingMessageBufferEmpty() override {}
diff --git a/net/dcsctp/socket/heartbeat_handler.cc b/net/dcsctp/socket/heartbeat_handler.cc
index 424f0736..5131ee0 100644
--- a/net/dcsctp/socket/heartbeat_handler.cc
+++ b/net/dcsctp/socket/heartbeat_handler.cc
@@ -66,7 +66,7 @@
}
static std::optional<HeartbeatInfo> Deserialize(
- rtc::ArrayView<const uint8_t> data) {
+ webrtc::ArrayView<const uint8_t> data) {
if (data.size() != kBufferSize) {
RTC_LOG(LS_WARNING) << "Invalid heartbeat info: " << data.size()
<< " bytes";
diff --git a/net/dcsctp/socket/mock_dcsctp_socket_callbacks.h b/net/dcsctp/socket/mock_dcsctp_socket_callbacks.h
index c020dbb..5dddf08 100644
--- a/net/dcsctp/socket/mock_dcsctp_socket_callbacks.h
+++ b/net/dcsctp/socket/mock_dcsctp_socket_callbacks.h
@@ -58,7 +58,7 @@
random_(internal::GetUniqueSeed()),
timeout_manager_([this]() { return now_; }) {
ON_CALL(*this, SendPacketWithStatus)
- .WillByDefault([this](rtc::ArrayView<const uint8_t> data) {
+ .WillByDefault([this](webrtc::ArrayView<const uint8_t> data) {
sent_packets_.emplace_back(
std::vector<uint8_t>(data.begin(), data.end()));
return SendPacketStatus::kSuccess;
@@ -85,7 +85,7 @@
MOCK_METHOD(SendPacketStatus,
SendPacketWithStatus,
- (rtc::ArrayView<const uint8_t> data),
+ (webrtc::ArrayView<const uint8_t> data),
(override));
std::unique_ptr<Timeout> CreateTimeout(
@@ -113,16 +113,16 @@
MOCK_METHOD(void, OnConnectionRestarted, (), (override));
MOCK_METHOD(void,
OnStreamsResetFailed,
- (rtc::ArrayView<const StreamID> outgoing_streams,
+ (webrtc::ArrayView<const StreamID> outgoing_streams,
absl::string_view reason),
(override));
MOCK_METHOD(void,
OnStreamsResetPerformed,
- (rtc::ArrayView<const StreamID> outgoing_streams),
+ (webrtc::ArrayView<const StreamID> outgoing_streams),
(override));
MOCK_METHOD(void,
OnIncomingStreamsReset,
- (rtc::ArrayView<const StreamID> incoming_streams),
+ (webrtc::ArrayView<const StreamID> incoming_streams),
(override));
MOCK_METHOD(void, OnBufferedAmountLow, (StreamID stream_id), (override));
MOCK_METHOD(void, OnTotalBufferedAmountLow, (), (override));
diff --git a/net/dcsctp/socket/packet_sender.cc b/net/dcsctp/socket/packet_sender.cc
index f0134ee..cdaf95c 100644
--- a/net/dcsctp/socket/packet_sender.cc
+++ b/net/dcsctp/socket/packet_sender.cc
@@ -17,7 +17,7 @@
namespace dcsctp {
PacketSender::PacketSender(DcSctpSocketCallbacks& callbacks,
- std::function<void(rtc::ArrayView<const uint8_t>,
+ std::function<void(webrtc::ArrayView<const uint8_t>,
SendPacketStatus)> on_sent_packet)
: callbacks_(callbacks), on_sent_packet_(std::move(on_sent_packet)) {}
diff --git a/net/dcsctp/socket/packet_sender.h b/net/dcsctp/socket/packet_sender.h
index 395c2ef..273e094 100644
--- a/net/dcsctp/socket/packet_sender.h
+++ b/net/dcsctp/socket/packet_sender.h
@@ -21,7 +21,7 @@
class PacketSender {
public:
PacketSender(DcSctpSocketCallbacks& callbacks,
- std::function<void(rtc::ArrayView<const uint8_t>,
+ std::function<void(webrtc::ArrayView<const uint8_t>,
SendPacketStatus)> on_sent_packet);
// Sends the packet, and returns true if it was sent successfully.
@@ -32,7 +32,7 @@
// Callback that will be triggered for every send attempt, indicating the
// status of the operation.
- std::function<void(rtc::ArrayView<const uint8_t>, SendPacketStatus)>
+ std::function<void(webrtc::ArrayView<const uint8_t>, SendPacketStatus)>
on_sent_packet_;
};
} // namespace dcsctp
diff --git a/net/dcsctp/socket/packet_sender_test.cc b/net/dcsctp/socket/packet_sender_test.cc
index 079dc36..d10786a 100644
--- a/net/dcsctp/socket/packet_sender_test.cc
+++ b/net/dcsctp/socket/packet_sender_test.cc
@@ -31,7 +31,8 @@
DcSctpOptions options_;
testing::NiceMock<MockDcSctpSocketCallbacks> callbacks_;
- testing::MockFunction<void(rtc::ArrayView<const uint8_t>, SendPacketStatus)>
+ testing::MockFunction<void(webrtc::ArrayView<const uint8_t>,
+ SendPacketStatus)>
on_send_fn_;
PacketSender sender_;
};
diff --git a/net/dcsctp/socket/state_cookie.cc b/net/dcsctp/socket/state_cookie.cc
index 31488c3..d949382 100644
--- a/net/dcsctp/socket/state_cookie.cc
+++ b/net/dcsctp/socket/state_cookie.cc
@@ -49,7 +49,7 @@
}
std::optional<StateCookie> StateCookie::Deserialize(
- rtc::ArrayView<const uint8_t> cookie) {
+ webrtc::ArrayView<const uint8_t> cookie) {
if (cookie.size() != kCookieSize) {
RTC_DLOG(LS_WARNING) << "Invalid state cookie: " << cookie.size()
<< " bytes";
diff --git a/net/dcsctp/socket/state_cookie.h b/net/dcsctp/socket/state_cookie.h
index 731a68e..387744a 100644
--- a/net/dcsctp/socket/state_cookie.h
+++ b/net/dcsctp/socket/state_cookie.h
@@ -49,7 +49,7 @@
// Deserializes the cookie, and returns std::nullopt if that failed.
static std::optional<StateCookie> Deserialize(
- rtc::ArrayView<const uint8_t> cookie);
+ webrtc::ArrayView<const uint8_t> cookie);
VerificationTag peer_tag() const { return peer_tag_; }
VerificationTag my_tag() const { return my_tag_; }
diff --git a/net/dcsctp/socket/stream_reset_handler.cc b/net/dcsctp/socket/stream_reset_handler.cc
index 86dff0c..8d109ea 100644
--- a/net/dcsctp/socket/stream_reset_handler.cc
+++ b/net/dcsctp/socket/stream_reset_handler.cc
@@ -340,7 +340,7 @@
}
void StreamResetHandler::ResetStreams(
- rtc::ArrayView<const StreamID> outgoing_streams) {
+ webrtc::ArrayView<const StreamID> outgoing_streams) {
for (StreamID stream_id : outgoing_streams) {
retransmission_queue_->PrepareResetStream(stream_id);
}
diff --git a/net/dcsctp/socket/stream_reset_handler.h b/net/dcsctp/socket/stream_reset_handler.h
index ac0deb7..dba402e 100644
--- a/net/dcsctp/socket/stream_reset_handler.h
+++ b/net/dcsctp/socket/stream_reset_handler.h
@@ -100,7 +100,7 @@
// time and also multiple times. It will enqueue requests that can't be
// directly fulfilled, and will asynchronously process them when any ongoing
// request has completed.
- void ResetStreams(rtc::ArrayView<const StreamID> outgoing_streams);
+ void ResetStreams(webrtc::ArrayView<const StreamID> outgoing_streams);
// Creates a Reset Streams request that must be sent if returned. Will start
// the reconfig timer. Will return std::nullopt if there is no need to
diff --git a/net/dcsctp/socket/transmission_control_block_test.cc b/net/dcsctp/socket/transmission_control_block_test.cc
index 472d572..60876b3 100644
--- a/net/dcsctp/socket/transmission_control_block_test.cc
+++ b/net/dcsctp/socket/transmission_control_block_test.cc
@@ -63,7 +63,8 @@
Capabilities capabilities_;
StrictMock<MockDcSctpSocketCallbacks> callbacks_;
StrictMock<MockSendQueue> send_queue_;
- testing::MockFunction<void(rtc::ArrayView<const uint8_t>, SendPacketStatus)>
+ testing::MockFunction<void(webrtc::ArrayView<const uint8_t>,
+ SendPacketStatus)>
on_send_fn_;
testing::MockFunction<bool()> on_connection_established;
PacketSender sender_;
diff --git a/net/dcsctp/timer/task_queue_timeout.h b/net/dcsctp/timer/task_queue_timeout.h
index 4b40309..7dccd2a 100644
--- a/net/dcsctp/timer/task_queue_timeout.h
+++ b/net/dcsctp/timer/task_queue_timeout.h
@@ -72,7 +72,8 @@
// expiration time _further away_ than what is now the expected expiration
// time. In this scenario, a new delayed task has to be posted with a
// shorter duration and the old task has to be forgotten.
- rtc::scoped_refptr<webrtc::PendingTaskSafetyFlag> pending_task_safety_flag_;
+ webrtc::scoped_refptr<webrtc::PendingTaskSafetyFlag>
+ pending_task_safety_flag_;
// The time when the posted delayed task is set to expire. Will be set to
// the infinite future if there is no such task running.
webrtc::Timestamp posted_task_expiration_ =
diff --git a/net/dcsctp/tx/outstanding_data.cc b/net/dcsctp/tx/outstanding_data.cc
index 0e25b0b..a92fc6f 100644
--- a/net/dcsctp/tx/outstanding_data.cc
+++ b/net/dcsctp/tx/outstanding_data.cc
@@ -131,7 +131,7 @@
OutstandingData::AckInfo OutstandingData::HandleSack(
UnwrappedTSN cumulative_tsn_ack,
- rtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
+ webrtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
bool is_in_fast_recovery) {
OutstandingData::AckInfo ack_info(cumulative_tsn_ack);
// Erase all items up to cumulative_tsn_ack.
@@ -192,7 +192,7 @@
void OutstandingData::AckGapBlocks(
UnwrappedTSN cumulative_tsn_ack,
- rtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
+ webrtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
AckInfo& ack_info) {
// Mark all non-gaps as ACKED (but they can't be removed) as (from RFC)
// "SCTP considers the information carried in the Gap Ack Blocks in the
@@ -213,7 +213,7 @@
void OutstandingData::NackBetweenAckBlocks(
UnwrappedTSN cumulative_tsn_ack,
- rtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
+ webrtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
bool is_in_fast_recovery,
OutstandingData::AckInfo& ack_info) {
// Mark everything between the blocks as NACKED/TO_BE_RETRANSMITTED.
diff --git a/net/dcsctp/tx/outstanding_data.h b/net/dcsctp/tx/outstanding_data.h
index 95bf6c2..a259697 100644
--- a/net/dcsctp/tx/outstanding_data.h
+++ b/net/dcsctp/tx/outstanding_data.h
@@ -87,7 +87,7 @@
AckInfo HandleSack(
UnwrappedTSN cumulative_tsn_ack,
- rtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
+ webrtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
bool is_in_fast_recovery);
// Returns as many of the chunks that are eligible for fast retransmissions
@@ -308,9 +308,10 @@
// Will mark the chunks covered by the `gap_ack_blocks` from an incoming SACK
// as "acked" and update `ack_info` by adding new TSNs to `added_tsns`.
- void AckGapBlocks(UnwrappedTSN cumulative_tsn_ack,
- rtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
- AckInfo& ack_info);
+ void AckGapBlocks(
+ UnwrappedTSN cumulative_tsn_ack,
+ webrtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
+ AckInfo& ack_info);
// Mark chunks reported as "missing", as "nacked" or "to be retransmitted"
// depending how many times this has happened. Only packets up until
@@ -318,7 +319,7 @@
// nacked/retransmitted. The method will set `ack_info.has_packet_loss`.
void NackBetweenAckBlocks(
UnwrappedTSN cumulative_tsn_ack,
- rtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
+ webrtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
bool is_in_fast_recovery,
OutstandingData::AckInfo& ack_info);
diff --git a/net/dcsctp/tx/retransmission_queue.cc b/net/dcsctp/tx/retransmission_queue.cc
index 65b572e..dae64a0 100644
--- a/net/dcsctp/tx/retransmission_queue.cc
+++ b/net/dcsctp/tx/retransmission_queue.cc
@@ -433,7 +433,7 @@
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Fast-retransmitting TSN "
<< webrtc::StrJoin(to_be_sent, ",",
- [&](rtc::StringBuilder& sb,
+ [&](webrtc::StringBuilder& sb,
const std::pair<TSN, Data>& c) {
sb << *c.first;
})
@@ -526,7 +526,7 @@
}
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Sending TSN "
<< webrtc::StrJoin(to_be_sent, ",",
- [&](rtc::StringBuilder& sb,
+ [&](webrtc::StringBuilder& sb,
const std::pair<TSN, Data>& c) {
sb << *c.first;
})
diff --git a/net/dcsctp/tx/rr_send_queue.cc b/net/dcsctp/tx/rr_send_queue.cc
index 16212a4..26d8436 100644
--- a/net/dcsctp/tx/rr_send_queue.cc
+++ b/net/dcsctp/tx/rr_send_queue.cc
@@ -167,9 +167,9 @@
}
// Grab the next `max_size` fragment from this message and calculate flags.
- rtc::ArrayView<const uint8_t> chunk_payload =
+ webrtc::ArrayView<const uint8_t> chunk_payload =
item.message.payload().subview(item.remaining_offset, max_size);
- rtc::ArrayView<const uint8_t> message_payload = message.payload();
+ webrtc::ArrayView<const uint8_t> message_payload = message.payload();
Data::IsBeginning is_beginning(chunk_payload.data() ==
message_payload.data());
Data::IsEnd is_end((chunk_payload.data() + chunk_payload.size()) ==
