mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 15:20:42 +01:00
2a9bed3ee3
This is the receive-side part of supporting what is frequently called "ndata", but actually RFC8260 - "User Message Interleaving". This CL adds a new ReassemblyStreams implementation that can assemble I-DATA chunks and process I-FORWARD-TSN for partial reliability. Bug: webrtc:5696 Change-Id: I3cfbea62e7b6c02fbd3f51b43ba3fb7863cf0f88 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/218506 Commit-Queue: Victor Boivie <boivie@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37128}
154 lines
5.9 KiB
C++
154 lines
5.9 KiB
C++
/*
|
|
* Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#include "net/dcsctp/rx/interleaved_reassembly_streams.h"
|
|
|
|
#include <cstdint>
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "net/dcsctp/common/sequence_numbers.h"
|
|
#include "net/dcsctp/packet/chunk/forward_tsn_common.h"
|
|
#include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h"
|
|
#include "net/dcsctp/packet/data.h"
|
|
#include "net/dcsctp/rx/reassembly_streams.h"
|
|
#include "net/dcsctp/testing/data_generator.h"
|
|
#include "rtc_base/gunit.h"
|
|
#include "test/gmock.h"
|
|
|
|
namespace dcsctp {
|
|
namespace {
|
|
using ::testing::MockFunction;
|
|
using ::testing::NiceMock;
|
|
|
|
class InterleavedReassemblyStreamsTest : public testing::Test {
|
|
protected:
|
|
UnwrappedTSN tsn(uint32_t value) { return tsn_.Unwrap(TSN(value)); }
|
|
|
|
InterleavedReassemblyStreamsTest() {}
|
|
DataGenerator gen_;
|
|
UnwrappedTSN::Unwrapper tsn_;
|
|
};
|
|
|
|
TEST_F(InterleavedReassemblyStreamsTest,
|
|
AddUnorderedMessageReturnsCorrectSize) {
|
|
NiceMock<MockFunction<ReassemblyStreams::OnAssembledMessage>> on_assembled;
|
|
|
|
InterleavedReassemblyStreams streams("", on_assembled.AsStdFunction());
|
|
|
|
EXPECT_EQ(streams.Add(tsn(1), gen_.Unordered({1}, "B")), 1);
|
|
EXPECT_EQ(streams.Add(tsn(2), gen_.Unordered({2, 3, 4})), 3);
|
|
EXPECT_EQ(streams.Add(tsn(3), gen_.Unordered({5, 6})), 2);
|
|
// Adding the end fragment should make it empty again.
|
|
EXPECT_EQ(streams.Add(tsn(4), gen_.Unordered({7}, "E")), -6);
|
|
}
|
|
|
|
TEST_F(InterleavedReassemblyStreamsTest,
|
|
AddSimpleOrderedMessageReturnsCorrectSize) {
|
|
NiceMock<MockFunction<ReassemblyStreams::OnAssembledMessage>> on_assembled;
|
|
|
|
InterleavedReassemblyStreams streams("", on_assembled.AsStdFunction());
|
|
|
|
EXPECT_EQ(streams.Add(tsn(1), gen_.Ordered({1}, "B")), 1);
|
|
EXPECT_EQ(streams.Add(tsn(2), gen_.Ordered({2, 3, 4})), 3);
|
|
EXPECT_EQ(streams.Add(tsn(3), gen_.Ordered({5, 6})), 2);
|
|
EXPECT_EQ(streams.Add(tsn(4), gen_.Ordered({7}, "E")), -6);
|
|
}
|
|
|
|
TEST_F(InterleavedReassemblyStreamsTest,
|
|
AddMoreComplexOrderedMessageReturnsCorrectSize) {
|
|
NiceMock<MockFunction<ReassemblyStreams::OnAssembledMessage>> on_assembled;
|
|
|
|
InterleavedReassemblyStreams streams("", on_assembled.AsStdFunction());
|
|
|
|
EXPECT_EQ(streams.Add(tsn(1), gen_.Ordered({1}, "B")), 1);
|
|
Data late = gen_.Ordered({2, 3, 4});
|
|
EXPECT_EQ(streams.Add(tsn(3), gen_.Ordered({5, 6})), 2);
|
|
EXPECT_EQ(streams.Add(tsn(4), gen_.Ordered({7}, "E")), 1);
|
|
|
|
EXPECT_EQ(streams.Add(tsn(5), gen_.Ordered({1}, "BE")), 1);
|
|
EXPECT_EQ(streams.Add(tsn(6), gen_.Ordered({5, 6}, "B")), 2);
|
|
EXPECT_EQ(streams.Add(tsn(7), gen_.Ordered({7}, "E")), 1);
|
|
EXPECT_EQ(streams.Add(tsn(2), std::move(late)), -8);
|
|
}
|
|
|
|
TEST_F(InterleavedReassemblyStreamsTest,
|
|
DeleteUnorderedMessageReturnsCorrectSize) {
|
|
NiceMock<MockFunction<ReassemblyStreams::OnAssembledMessage>> on_assembled;
|
|
|
|
InterleavedReassemblyStreams streams("", on_assembled.AsStdFunction());
|
|
|
|
EXPECT_EQ(streams.Add(tsn(1), gen_.Unordered({1}, "B")), 1);
|
|
EXPECT_EQ(streams.Add(tsn(2), gen_.Unordered({2, 3, 4})), 3);
|
|
EXPECT_EQ(streams.Add(tsn(3), gen_.Unordered({5, 6})), 2);
|
|
|
|
IForwardTsnChunk::SkippedStream skipped[] = {
|
|
IForwardTsnChunk::SkippedStream(IsUnordered(true), StreamID(1), MID(0))};
|
|
EXPECT_EQ(streams.HandleForwardTsn(tsn(3), skipped), 6u);
|
|
}
|
|
|
|
TEST_F(InterleavedReassemblyStreamsTest,
|
|
DeleteSimpleOrderedMessageReturnsCorrectSize) {
|
|
NiceMock<MockFunction<ReassemblyStreams::OnAssembledMessage>> on_assembled;
|
|
|
|
InterleavedReassemblyStreams streams("", on_assembled.AsStdFunction());
|
|
|
|
EXPECT_EQ(streams.Add(tsn(1), gen_.Ordered({1}, "B")), 1);
|
|
EXPECT_EQ(streams.Add(tsn(2), gen_.Ordered({2, 3, 4})), 3);
|
|
EXPECT_EQ(streams.Add(tsn(3), gen_.Ordered({5, 6})), 2);
|
|
|
|
IForwardTsnChunk::SkippedStream skipped[] = {
|
|
IForwardTsnChunk::SkippedStream(IsUnordered(false), StreamID(1), MID(0))};
|
|
EXPECT_EQ(streams.HandleForwardTsn(tsn(3), skipped), 6u);
|
|
}
|
|
|
|
TEST_F(InterleavedReassemblyStreamsTest,
|
|
DeleteManyOrderedMessagesReturnsCorrectSize) {
|
|
NiceMock<MockFunction<ReassemblyStreams::OnAssembledMessage>> on_assembled;
|
|
|
|
InterleavedReassemblyStreams streams("", on_assembled.AsStdFunction());
|
|
|
|
EXPECT_EQ(streams.Add(tsn(1), gen_.Ordered({1}, "B")), 1);
|
|
gen_.Ordered({2, 3, 4});
|
|
EXPECT_EQ(streams.Add(tsn(3), gen_.Ordered({5, 6})), 2);
|
|
EXPECT_EQ(streams.Add(tsn(4), gen_.Ordered({7}, "E")), 1);
|
|
|
|
EXPECT_EQ(streams.Add(tsn(5), gen_.Ordered({1}, "BE")), 1);
|
|
EXPECT_EQ(streams.Add(tsn(6), gen_.Ordered({5, 6}, "B")), 2);
|
|
EXPECT_EQ(streams.Add(tsn(7), gen_.Ordered({7}, "E")), 1);
|
|
|
|
// Expire all three messages
|
|
IForwardTsnChunk::SkippedStream skipped[] = {
|
|
IForwardTsnChunk::SkippedStream(IsUnordered(false), StreamID(1), MID(2))};
|
|
EXPECT_EQ(streams.HandleForwardTsn(tsn(8), skipped), 8u);
|
|
}
|
|
|
|
TEST_F(InterleavedReassemblyStreamsTest,
|
|
DeleteOrderedMessageDelivesTwoReturnsCorrectSize) {
|
|
NiceMock<MockFunction<ReassemblyStreams::OnAssembledMessage>> on_assembled;
|
|
|
|
InterleavedReassemblyStreams streams("", on_assembled.AsStdFunction());
|
|
|
|
EXPECT_EQ(streams.Add(tsn(1), gen_.Ordered({1}, "B")), 1);
|
|
gen_.Ordered({2, 3, 4});
|
|
EXPECT_EQ(streams.Add(tsn(3), gen_.Ordered({5, 6})), 2);
|
|
EXPECT_EQ(streams.Add(tsn(4), gen_.Ordered({7}, "E")), 1);
|
|
|
|
EXPECT_EQ(streams.Add(tsn(5), gen_.Ordered({1}, "BE")), 1);
|
|
EXPECT_EQ(streams.Add(tsn(6), gen_.Ordered({5, 6}, "B")), 2);
|
|
EXPECT_EQ(streams.Add(tsn(7), gen_.Ordered({7}, "E")), 1);
|
|
|
|
// The first ordered message expire, and the following two are delivered.
|
|
IForwardTsnChunk::SkippedStream skipped[] = {
|
|
IForwardTsnChunk::SkippedStream(IsUnordered(false), StreamID(1), MID(0))};
|
|
EXPECT_EQ(streams.HandleForwardTsn(tsn(4), skipped), 8u);
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace dcsctp
|