aboutsummaryrefslogtreecommitdiff
path: root/net/dcsctp/packet/chunk
diff options
context:
space:
mode:
Diffstat (limited to 'net/dcsctp/packet/chunk')
-rw-r--r--net/dcsctp/packet/chunk/data_common.h6
-rw-r--r--net/dcsctp/packet/chunk/forward_tsn_common.h13
-rw-r--r--net/dcsctp/packet/chunk/idata_chunk.cc8
-rw-r--r--net/dcsctp/packet/chunk/idata_chunk.h4
-rw-r--r--net/dcsctp/packet/chunk/idata_chunk_test.cc12
-rw-r--r--net/dcsctp/packet/chunk/iforward_tsn_chunk.cc6
-rw-r--r--net/dcsctp/packet/chunk/sack_chunk.cc2
7 files changed, 24 insertions, 27 deletions
diff --git a/net/dcsctp/packet/chunk/data_common.h b/net/dcsctp/packet/chunk/data_common.h
index b67efeee1e..66d67bac3d 100644
--- a/net/dcsctp/packet/chunk/data_common.h
+++ b/net/dcsctp/packet/chunk/data_common.h
@@ -48,7 +48,7 @@ class AnyDataChunk : public Chunk {
StreamID stream_id() const { return data_.stream_id; }
SSN ssn() const { return data_.ssn; }
- MID message_id() const { return data_.message_id; }
+ 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; }
@@ -59,7 +59,7 @@ class AnyDataChunk : public Chunk {
AnyDataChunk(TSN tsn,
StreamID stream_id,
SSN ssn,
- MID message_id,
+ MID mid,
FSN fsn,
PPID ppid,
std::vector<uint8_t> payload,
@@ -67,7 +67,7 @@ class AnyDataChunk : public Chunk {
: tsn_(tsn),
data_(stream_id,
ssn,
- message_id,
+ mid,
fsn,
ppid,
std::move(payload),
diff --git a/net/dcsctp/packet/chunk/forward_tsn_common.h b/net/dcsctp/packet/chunk/forward_tsn_common.h
index 37bd2aafff..b9dddd2cbf 100644
--- a/net/dcsctp/packet/chunk/forward_tsn_common.h
+++ b/net/dcsctp/packet/chunk/forward_tsn_common.h
@@ -24,12 +24,9 @@ class AnyForwardTsnChunk : public Chunk {
public:
struct SkippedStream {
SkippedStream(StreamID stream_id, SSN ssn)
- : stream_id(stream_id), ssn(ssn), unordered(false), message_id(0) {}
- SkippedStream(IsUnordered unordered, StreamID stream_id, MID message_id)
- : stream_id(stream_id),
- ssn(0),
- unordered(unordered),
- message_id(message_id) {}
+ : stream_id(stream_id), ssn(ssn), unordered(false), mid(0) {}
+ SkippedStream(IsUnordered unordered, StreamID stream_id, MID mid)
+ : stream_id(stream_id), ssn(0), unordered(unordered), mid(mid) {}
StreamID stream_id;
@@ -38,11 +35,11 @@ class AnyForwardTsnChunk : public Chunk {
// Set for I-FORWARD_TSN
IsUnordered unordered;
- MID message_id;
+ MID mid;
bool operator==(const SkippedStream& other) const {
return stream_id == other.stream_id && ssn == other.ssn &&
- unordered == other.unordered && message_id == other.message_id;
+ unordered == other.unordered && mid == other.mid;
}
};
diff --git a/net/dcsctp/packet/chunk/idata_chunk.cc b/net/dcsctp/packet/chunk/idata_chunk.cc
index 9f19c7f053..e9a777dfdc 100644
--- a/net/dcsctp/packet/chunk/idata_chunk.cc
+++ b/net/dcsctp/packet/chunk/idata_chunk.cc
@@ -54,7 +54,7 @@ absl::optional<IDataChunk> IDataChunk::Parse(
uint8_t flags = reader->Load8<1>();
TSN tsn(reader->Load32<4>());
StreamID stream_identifier(reader->Load16<8>());
- MID message_id(reader->Load32<12>());
+ MID mid(reader->Load32<12>());
uint32_t ppid_or_fsn = reader->Load32<16>();
Options options;
@@ -65,7 +65,7 @@ absl::optional<IDataChunk> IDataChunk::Parse(
options.immediate_ack =
ImmediateAckFlag((flags & (1 << kFlagsBitImmediateAck)) != 0);
- return IDataChunk(tsn, stream_identifier, message_id,
+ return IDataChunk(tsn, stream_identifier, mid,
PPID(options.is_beginning ? ppid_or_fsn : 0),
FSN(options.is_beginning ? 0 : ppid_or_fsn),
std::vector<uint8_t>(reader->variable_data().begin(),
@@ -83,7 +83,7 @@ void IDataChunk::SerializeTo(std::vector<uint8_t>& out) const {
(*options().immediate_ack ? (1 << kFlagsBitImmediateAck) : 0));
writer.Store32<4>(*tsn());
writer.Store16<8>(*stream_id());
- writer.Store32<12>(*message_id());
+ writer.Store32<12>(*mid());
writer.Store32<16>(options().is_beginning ? *ppid() : *fsn());
writer.CopyToVariableData(payload());
}
@@ -97,7 +97,7 @@ std::string IDataChunk::ToString() const {
: *options().is_end ? "last"
: "middle")
<< ", tsn=" << *tsn() << ", stream_id=" << *stream_id()
- << ", message_id=" << *message_id();
+ << ", mid=" << *mid();
if (*options().is_beginning) {
sb << ", ppid=" << *ppid();
diff --git a/net/dcsctp/packet/chunk/idata_chunk.h b/net/dcsctp/packet/chunk/idata_chunk.h
index 8cdf2a1fc4..36b7e7eaab 100644
--- a/net/dcsctp/packet/chunk/idata_chunk.h
+++ b/net/dcsctp/packet/chunk/idata_chunk.h
@@ -42,7 +42,7 @@ class IDataChunk : public AnyDataChunk, public TLVTrait<IDataChunkConfig> {
static constexpr size_t kHeaderSize = IDataChunkConfig::kHeaderSize;
IDataChunk(TSN tsn,
StreamID stream_id,
- MID message_id,
+ MID mid,
PPID ppid,
FSN fsn,
std::vector<uint8_t> payload,
@@ -50,7 +50,7 @@ class IDataChunk : public AnyDataChunk, public TLVTrait<IDataChunkConfig> {
: AnyDataChunk(tsn,
stream_id,
SSN(0),
- message_id,
+ mid,
fsn,
ppid,
std::move(payload),
diff --git a/net/dcsctp/packet/chunk/idata_chunk_test.cc b/net/dcsctp/packet/chunk/idata_chunk_test.cc
index fea492d71e..d1cc0d8f90 100644
--- a/net/dcsctp/packet/chunk/idata_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/idata_chunk_test.cc
@@ -44,7 +44,7 @@ TEST(IDataChunkTest, AtBeginningFromCapture) {
ASSERT_HAS_VALUE_AND_ASSIGN(IDataChunk chunk, IDataChunk::Parse(data));
EXPECT_EQ(*chunk.tsn(), 2487901653);
EXPECT_EQ(*chunk.stream_id(), 1);
- EXPECT_EQ(*chunk.message_id(), 0u);
+ EXPECT_EQ(*chunk.mid(), 0u);
EXPECT_EQ(*chunk.ppid(), 53u);
EXPECT_EQ(*chunk.fsn(), 0u); // Not provided (so set to zero)
}
@@ -62,13 +62,13 @@ TEST(IDataChunkTest, AtBeginningSerializeAndDeserialize) {
IDataChunk::Parse(serialized));
EXPECT_EQ(*deserialized.tsn(), 123u);
EXPECT_EQ(*deserialized.stream_id(), 456u);
- EXPECT_EQ(*deserialized.message_id(), 789u);
+ EXPECT_EQ(*deserialized.mid(), 789u);
EXPECT_EQ(*deserialized.ppid(), 53u);
EXPECT_EQ(*deserialized.fsn(), 0u);
EXPECT_EQ(deserialized.ToString(),
"I-DATA, type=ordered::first, tsn=123, stream_id=456, "
- "message_id=789, ppid=53, length=1");
+ "mid=789, ppid=53, length=1");
}
TEST(IDataChunkTest, InMiddleFromCapture) {
@@ -93,7 +93,7 @@ TEST(IDataChunkTest, InMiddleFromCapture) {
ASSERT_HAS_VALUE_AND_ASSIGN(IDataChunk chunk, IDataChunk::Parse(data));
EXPECT_EQ(*chunk.tsn(), 2487901706);
EXPECT_EQ(*chunk.stream_id(), 3u);
- EXPECT_EQ(*chunk.message_id(), 1u);
+ EXPECT_EQ(*chunk.mid(), 1u);
EXPECT_EQ(*chunk.ppid(), 0u); // Not provided (so set to zero)
EXPECT_EQ(*chunk.fsn(), 8u);
}
@@ -109,14 +109,14 @@ TEST(IDataChunkTest, InMiddleSerializeAndDeserialize) {
IDataChunk::Parse(serialized));
EXPECT_EQ(*deserialized.tsn(), 123u);
EXPECT_EQ(*deserialized.stream_id(), 456u);
- EXPECT_EQ(*deserialized.message_id(), 789u);
+ EXPECT_EQ(*deserialized.mid(), 789u);
EXPECT_EQ(*deserialized.ppid(), 0u);
EXPECT_EQ(*deserialized.fsn(), 101112u);
EXPECT_THAT(deserialized.payload(), ElementsAre(1, 2, 3));
EXPECT_EQ(deserialized.ToString(),
"I-DATA, type=ordered::middle, tsn=123, stream_id=456, "
- "message_id=789, fsn=101112, length=3");
+ "mid=789, fsn=101112, length=3");
}
} // namespace
diff --git a/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc b/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc
index a647a8bf8a..2b8e9c917a 100644
--- a/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc
+++ b/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc
@@ -68,8 +68,8 @@ absl::optional<IForwardTsnChunk> IForwardTsnChunk::Parse(
StreamID stream_id(sub_reader.Load16<0>());
IsUnordered unordered(sub_reader.Load8<3>() & 0x01);
- MID message_id(sub_reader.Load32<4>());
- skipped_streams.emplace_back(unordered, stream_id, message_id);
+ MID mid(sub_reader.Load32<4>());
+ skipped_streams.emplace_back(unordered, stream_id, mid);
offset += kSkippedStreamBufferSize;
}
RTC_DCHECK(offset == reader->variable_data_size());
@@ -89,7 +89,7 @@ void IForwardTsnChunk::SerializeTo(std::vector<uint8_t>& out) const {
sub_writer.Store16<0>(*skipped[i].stream_id);
sub_writer.Store8<3>(skipped[i].unordered ? 1 : 0);
- sub_writer.Store32<4>(*skipped[i].message_id);
+ sub_writer.Store32<4>(*skipped[i].mid);
offset += kSkippedStreamBufferSize;
}
RTC_DCHECK(offset == variable_size);
diff --git a/net/dcsctp/packet/chunk/sack_chunk.cc b/net/dcsctp/packet/chunk/sack_chunk.cc
index d80e430082..179f7ea379 100644
--- a/net/dcsctp/packet/chunk/sack_chunk.cc
+++ b/net/dcsctp/packet/chunk/sack_chunk.cc
@@ -18,11 +18,11 @@
#include "absl/types/optional.h"
#include "api/array_view.h"
-#include "net/dcsctp/common/str_join.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/logging.h"
+#include "rtc_base/strings/str_join.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 12:47:50 +0000