mediasoup 3.19.21 → 3.20.0

package/worker/test/src/RTC/SCTP/packet/TestChunk.cpp

@@ -6,7 +6,7 @@
 #include "RTC/SCTP/packet/errorCauses/ProtocolViolationErrorCause.hpp"
 #include "RTC/SCTP/packet/parameters/ForwardTsnSupportedParameter.hpp"
 #include "RTC/SCTP/packet/parameters/ZeroChecksumAcceptableParameter.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 
 SCENARIO("SCTP Chunk", "[serializable][sctp][chunk]")

package/worker/test/src/RTC/SCTP/packet/TestPacket.cpp

@@ -12,7 +12,7 @@
 #include "RTC/SCTP/packet/parameters/CookiePreservativeParameter.hpp"
 #include "RTC/SCTP/packet/parameters/HeartbeatInfoParameter.hpp"
 #include "RTC/SCTP/packet/parameters/IPv4AddressParameter.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 

package/worker/test/src/RTC/SCTP/packet/chunks/TestAbortAssociationChunk.cpp

@@ -4,7 +4,7 @@
 #include "RTC/SCTP/packet/ErrorCause.hpp"
 #include "RTC/SCTP/packet/chunks/AbortAssociationChunk.hpp"
 #include "RTC/SCTP/packet/errorCauses/StaleCookieErrorCause.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 

package/worker/test/src/RTC/SCTP/packet/chunks/TestCookieAckChunk.cpp

@@ -2,7 +2,7 @@
 #include "MediaSoupErrors.hpp"
 #include "RTC/SCTP/packet/Chunk.hpp"
 #include "RTC/SCTP/packet/chunks/CookieAckChunk.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 

package/worker/test/src/RTC/SCTP/packet/chunks/TestCookieEchoChunk.cpp

@@ -2,7 +2,7 @@
 #include "MediaSoupErrors.hpp"
 #include "RTC/SCTP/packet/Chunk.hpp"
 #include "RTC/SCTP/packet/chunks/CookieEchoChunk.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 

package/worker/test/src/RTC/SCTP/packet/chunks/TestDataChunk.cpp

@@ -2,9 +2,10 @@
 #include "MediaSoupErrors.hpp"
 #include "RTC/SCTP/packet/Chunk.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "RTC/SCTP/packet/UserData.hpp"
 #include "RTC/SCTP/packet/chunks/DataChunk.hpp"
 #include "RTC/SCTP/packet/parameters/IPv4AddressParameter.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 #include <vector>
@@ -69,7 +70,7 @@ SCENARIO("SCTP Payload Data Chunk (0)", "[serializable][sctp][chunk]")
 		// This should be padding.
 		REQUIRE(chunk->GetUserDataPayload()[3] == 0x00);
 
-		auto userData = chunk->GetUserData();
+		auto userData = chunk->MakeUserData();
 
 		std::vector<uint8_t> expectedPayload = { 0xAB, 0xCD, 0xEF };
 
@@ -118,7 +119,7 @@ SCENARIO("SCTP Payload Data Chunk (0)", "[serializable][sctp][chunk]")
 		// This should be padding.
 		REQUIRE(chunk->GetUserDataPayload()[3] == 0x00);
 
-		userData = chunk->GetUserData();
+		userData = chunk->MakeUserData();
 
 		REQUIRE(userData.GetStreamId() == 0xFF00);
 		REQUIRE(userData.GetStreamSequenceNumber() == 0x6677);
@@ -166,7 +167,7 @@ SCENARIO("SCTP Payload Data Chunk (0)", "[serializable][sctp][chunk]")
 		// This should be padding.
 		REQUIRE(clonedChunk->GetUserDataPayload()[3] == 0x00);
 
-		userData = clonedChunk->GetUserData();
+		userData = clonedChunk->MakeUserData();
 
 		REQUIRE(userData.GetStreamId() == 0xFF00);
 		REQUIRE(userData.GetStreamSequenceNumber() == 0x6677);
@@ -209,7 +210,7 @@ SCENARIO("SCTP Payload Data Chunk (0)", "[serializable][sctp][chunk]")
 		REQUIRE(chunk->HasUserDataPayload() == false);
 		REQUIRE(chunk->GetUserDataPayloadLength() == 0);
 
-		auto userData = chunk->GetUserData();
+		auto userData = chunk->MakeUserData();
 
 		std::vector<uint8_t> expectedPayload = {};
 
@@ -276,7 +277,7 @@ SCENARIO("SCTP Payload Data Chunk (0)", "[serializable][sctp][chunk]")
 		// Last byte must be a zero byte padding.
 		REQUIRE(chunk->GetUserDataPayload()[3] == 0x00);
 
-		userData        = chunk->GetUserData();
+		userData        = chunk->MakeUserData();
 		expectedPayload = { 0x00, 0x01, 0x02 };
 
 		REQUIRE(userData.GetStreamId() == 9988);
@@ -323,7 +324,7 @@ SCENARIO("SCTP Payload Data Chunk (0)", "[serializable][sctp][chunk]")
 		// Last byte must be a zero byte padding.
 		REQUIRE(parsedChunk->GetUserDataPayload()[3] == 0x00);
 
-		userData = parsedChunk->GetUserData();
+		userData = parsedChunk->MakeUserData();
 
 		REQUIRE(userData.GetStreamId() == 9988);
 		REQUIRE(userData.GetStreamSequenceNumber() == 2211);
@@ -373,4 +374,73 @@ SCENARIO("SCTP Payload Data Chunk (0)", "[serializable][sctp][chunk]")
 
 		delete chunk;
 	}
+
+	SECTION("DataChunk::SetUserData() succeeds")
+	{
+		auto* chunk =
+		  RTC::SCTP::DataChunk::Factory(sctpCommon::FactoryBuffer, sizeof(sctpCommon::FactoryBuffer));
+
+		RTC::SCTP::UserData userData(
+		  /*streamId*/ 123,
+		  /*ssn*/ 4444,
+		  /*mid*/ 0, // Not in DATA chunks.
+		  /*fsn*/ 0, // Not in DATA chunks.
+		  /*ppid*/ 56789,
+		  /*payload*/ { 1, 2, 3, 4 },
+		  /*isBeginning*/ true,
+		  /*isEnd*/ true,
+		  /*isUnordered*/ true);
+
+		REQUIRE(userData.GetStreamId() == 123);
+		REQUIRE(userData.GetStreamSequenceNumber() == 4444);
+		REQUIRE(userData.GetMessageId() == 0);
+		REQUIRE(userData.GetFragmentSequenceNumber() == 0);
+		REQUIRE(userData.GetPayloadProtocolId() == 56789);
+		REQUIRE(userData.GetPayloadLength() == 4);
+		REQUIRE(userData.GetPayload()[0] == 1);
+		REQUIRE(userData.GetPayload()[1] == 2);
+		REQUIRE(userData.GetPayload()[2] == 3);
+		REQUIRE(userData.GetPayload()[3] == 4);
+		REQUIRE(userData.IsBeginning() == true);
+		REQUIRE(userData.IsEnd() == true);
+		REQUIRE(userData.IsUnordered() == true);
+
+		chunk->SetUserData(std::move(userData));
+
+		CHECK_SCTP_CHUNK(
+		  /*chunk*/ chunk,
+		  /*buffer*/ sctpCommon::FactoryBuffer,
+		  /*bufferLength*/ sizeof(sctpCommon::FactoryBuffer),
+		  /*length*/ 16 + 4,
+		  /*chunkType*/ RTC::SCTP::Chunk::ChunkType::DATA,
+		  /*unknownType*/ false,
+		  /*actionForUnknownChunkType*/ RTC::SCTP::Chunk::ActionForUnknownChunkType::STOP,
+		  /*flags*/ 0b00000111,
+		  /*canHaveParameters*/ false,
+		  /*parametersCount*/ 0,
+		  /*canHaveErrorCauses*/ false,
+		  /*errorCausesCount*/ 0);
+
+		auto gotUserData = chunk->MakeUserData();
+
+		std::vector<uint8_t> expectedPayload = { 1, 2, 3, 4 };
+
+		REQUIRE(gotUserData.GetStreamId() == 123);
+		REQUIRE(gotUserData.GetStreamSequenceNumber() == 4444);
+		REQUIRE(gotUserData.GetMessageId() == 0);
+		REQUIRE(gotUserData.GetFragmentSequenceNumber() == 0);
+		REQUIRE(gotUserData.GetPayloadProtocolId() == 56789);
+		REQUIRE(gotUserData.GetPayloadLength() == 4);
+		REQUIRE(gotUserData.GetPayload()[0] == 1);
+		REQUIRE(gotUserData.GetPayload()[1] == 2);
+		REQUIRE(gotUserData.GetPayload()[2] == 3);
+		REQUIRE(gotUserData.GetPayload()[3] == 4);
+		REQUIRE(gotUserData.IsBeginning() == true);
+		REQUIRE(gotUserData.IsEnd() == true);
+		REQUIRE(gotUserData.IsUnordered() == true);
+		// NOLINTNEXTLINE(bugprone-use-after-move, hicpp-invalid-access-moved)
+		REQUIRE(std::move(gotUserData).ReleasePayload() == expectedPayload);
+
+		delete chunk;
+	}
 }

package/worker/test/src/RTC/SCTP/packet/chunks/TestForwardTsnChunk.cpp

@@ -3,7 +3,7 @@
 #include "RTC/SCTP/packet/Chunk.hpp"
 #include "RTC/SCTP/packet/chunks/AnyForwardTsnChunk.hpp"
 #include "RTC/SCTP/packet/chunks/ForwardTsnChunk.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 #include <vector>
@@ -49,13 +49,11 @@ SCENARIO("Forward Cumulative TSN Chunk (192)", "[serializable][sctp][chunk]")
 
 		REQUIRE(chunk->GetNewCumulativeTsn() == 287454020);
 		REQUIRE(chunk->GetNumberOfSkippedStreams() == 2);
-
-		const std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream> expectedSkippedStreams{
-			{ 4660,  17185 },
-      { 22136, 34661 }
-		};
-
-		REQUIRE(chunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  chunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                  { 4660,  17185 },
+                                      { 22136, 34661 }
+    });
 
 		/* Serialize it. */
 
@@ -79,7 +77,11 @@ SCENARIO("Forward Cumulative TSN Chunk (192)", "[serializable][sctp][chunk]")
 
 		REQUIRE(chunk->GetNewCumulativeTsn() == 287454020);
 		REQUIRE(chunk->GetNumberOfSkippedStreams() == 2);
-		REQUIRE(chunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  chunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                  { 4660,  17185 },
+                                      { 22136, 34661 }
+    });
 
 		/* Clone it. */
 
@@ -105,7 +107,11 @@ SCENARIO("Forward Cumulative TSN Chunk (192)", "[serializable][sctp][chunk]")
 
 		REQUIRE(clonedChunk->GetNewCumulativeTsn() == 287454020);
 		REQUIRE(clonedChunk->GetNumberOfSkippedStreams() == 2);
-		REQUIRE(clonedChunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  clonedChunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                        { 4660,  17185 },
+                                            { 22136, 34661 }
+    });
 
 		delete clonedChunk;
 	}
@@ -151,17 +157,17 @@ SCENARIO("Forward Cumulative TSN Chunk (192)", "[serializable][sctp][chunk]")
 
 		REQUIRE(chunk->GetNewCumulativeTsn() == 0);
 		REQUIRE(chunk->GetNumberOfSkippedStreams() == 0);
-
-		std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream> expectedSkippedStreams{};
-
-		REQUIRE(chunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(chunk->GetSkippedStreams().empty());
 
 		/* Modify it. */
 
 		chunk->SetNewCumulativeTsn(1234);
-		chunk->AddStream(1111, 11110);
-		chunk->AddStream(2222, 22220);
-		chunk->AddStream(3333, 33330);
+		chunk->AddSkippedStream(
+		  RTC::SCTP::AnyForwardTsnChunk::SkippedStream{ /*streamId*/ 1111, /*ssn*/ 11110 });
+		chunk->AddSkippedStream(
+		  RTC::SCTP::AnyForwardTsnChunk::SkippedStream{ /*streamId*/ 2222, /*ssn*/ 22220 });
+		chunk->AddSkippedStream(
+		  RTC::SCTP::AnyForwardTsnChunk::SkippedStream{ /*streamId*/ 3333, /*ssn*/ 33330 });
 
 		CHECK_SCTP_CHUNK(
 		  /*chunk*/ chunk,
@@ -179,14 +185,12 @@ SCENARIO("Forward Cumulative TSN Chunk (192)", "[serializable][sctp][chunk]")
 
 		REQUIRE(chunk->GetNewCumulativeTsn() == 1234);
 		REQUIRE(chunk->GetNumberOfSkippedStreams() == 3);
-
-		expectedSkippedStreams = {
-			{ 1111, 11110 },
-			{ 2222, 22220 },
-			{ 3333, 33330 },
-		};
-
-		REQUIRE(chunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  chunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                  { 1111, 11110 },
+		                                  { 2222, 22220 },
+		                                  { 3333, 33330 },
+    });
 
 		/* Parse itself and compare. */
 
@@ -210,7 +214,12 @@ SCENARIO("Forward Cumulative TSN Chunk (192)", "[serializable][sctp][chunk]")
 
 		REQUIRE(parsedChunk->GetNewCumulativeTsn() == 1234);
 		REQUIRE(parsedChunk->GetNumberOfSkippedStreams() == 3);
-		REQUIRE(parsedChunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  parsedChunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                        { 1111, 11110 },
+		                                        { 2222, 22220 },
+		                                        { 3333, 33330 },
+    });
 
 		delete parsedChunk;
 	}

package/worker/test/src/RTC/SCTP/packet/chunks/TestHeartbeatAckChunk.cpp

@@ -5,7 +5,7 @@
 #include "RTC/SCTP/packet/chunks/HeartbeatAckChunk.hpp"
 #include "RTC/SCTP/packet/parameters/HeartbeatInfoParameter.hpp"
 #include "RTC/SCTP/packet/parameters/UnknownParameter.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 

package/worker/test/src/RTC/SCTP/packet/chunks/TestHeartbeatRequestChunk.cpp

@@ -5,7 +5,7 @@
 #include "RTC/SCTP/packet/chunks/HeartbeatRequestChunk.hpp"
 #include "RTC/SCTP/packet/parameters/HeartbeatInfoParameter.hpp"
 #include "RTC/SCTP/packet/parameters/UnknownParameter.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 

package/worker/test/src/RTC/SCTP/packet/chunks/TestIDataChunk.cpp

@@ -2,7 +2,7 @@
 #include "MediaSoupErrors.hpp"
 #include "RTC/SCTP/packet/Chunk.hpp"
 #include "RTC/SCTP/packet/chunks/IDataChunk.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 #include <vector>
@@ -68,7 +68,7 @@ SCENARIO("SCTP I-Data Chunk (64)", "[serializable][sctp][chunk]")
 		// This should be padding.
 		REQUIRE(chunk->GetUserDataPayload()[3] == 0x00);
 
-		auto userData = chunk->GetUserData();
+		auto userData = chunk->MakeUserData();
 
 		std::vector<uint8_t> expectedPayload = { 0xAB, 0xCD, 0xEF };
 
@@ -122,7 +122,7 @@ SCENARIO("SCTP I-Data Chunk (64)", "[serializable][sctp][chunk]")
 		// This should be padding.
 		REQUIRE(chunk->GetUserDataPayload()[3] == 0x00);
 
-		userData = chunk->GetUserData();
+		userData = chunk->MakeUserData();
 
 		REQUIRE(userData.GetStreamId() == 5001);
 		REQUIRE(userData.GetStreamSequenceNumber() == 0);
@@ -170,7 +170,7 @@ SCENARIO("SCTP I-Data Chunk (64)", "[serializable][sctp][chunk]")
 		// This should be padding.
 		REQUIRE(chunk->GetUserDataPayload()[3] == 0x00);
 
-		userData = chunk->GetUserData();
+		userData = chunk->MakeUserData();
 
 		REQUIRE(userData.GetStreamId() == 5001);
 		REQUIRE(userData.GetStreamSequenceNumber() == 0);
@@ -213,7 +213,7 @@ SCENARIO("SCTP I-Data Chunk (64)", "[serializable][sctp][chunk]")
 		REQUIRE(chunk->HasUserDataPayload() == false);
 		REQUIRE(chunk->GetUserDataPayloadLength() == 0);
 
-		auto userData = chunk->GetUserData();
+		auto userData = chunk->MakeUserData();
 
 		std::vector<uint8_t> expectedPayload = {};
 
@@ -285,7 +285,7 @@ SCENARIO("SCTP I-Data Chunk (64)", "[serializable][sctp][chunk]")
 		// Last byte must be a zero byte padding.
 		REQUIRE(chunk->GetUserDataPayload()[3] == 0x00);
 
-		userData = chunk->GetUserData();
+		userData = chunk->MakeUserData();
 
 		expectedPayload = { 0x00, 0x01, 0x02 };
 
@@ -333,7 +333,7 @@ SCENARIO("SCTP I-Data Chunk (64)", "[serializable][sctp][chunk]")
 		// Last byte must be a zero byte padding.
 		REQUIRE(chunk->GetUserDataPayload()[3] == 0x00);
 
-		userData = chunk->GetUserData();
+		userData = chunk->MakeUserData();
 
 		REQUIRE(userData.GetStreamId() == 9988);
 		REQUIRE(userData.GetStreamSequenceNumber() == 0);
@@ -379,4 +379,74 @@ SCENARIO("SCTP I-Data Chunk (64)", "[serializable][sctp][chunk]")
 		  /*canHaveErrorCauses*/ false,
 		  /*errorCausesCount*/ 0);
 	}
+
+	SECTION("IDataChunk::SetUserData() succeeds")
+	{
+		auto* chunk =
+		  RTC::SCTP::IDataChunk::Factory(sctpCommon::FactoryBuffer, sizeof(sctpCommon::FactoryBuffer));
+
+		RTC::SCTP::UserData userData(
+		  /*streamId*/ 123,
+		  /*ssn*/ 0, // Not in I-DATA chunks.
+		  /*mid*/ 5555,
+		  /*fsn*/ 6666,
+		  /*ppid*/ 56789,
+		  /*payload*/ { 1, 2, 3, 4 },
+		  /*isBeginning*/ true,
+		  /*isEnd*/ true,
+		  /*isUnordered*/ true);
+
+		REQUIRE(userData.GetStreamId() == 123);
+		REQUIRE(userData.GetStreamSequenceNumber() == 0);
+		REQUIRE(userData.GetMessageId() == 5555);
+		REQUIRE(userData.GetFragmentSequenceNumber() == 6666);
+		REQUIRE(userData.GetPayloadProtocolId() == 56789);
+		REQUIRE(userData.GetPayloadLength() == 4);
+		REQUIRE(userData.GetPayload()[0] == 1);
+		REQUIRE(userData.GetPayload()[1] == 2);
+		REQUIRE(userData.GetPayload()[2] == 3);
+		REQUIRE(userData.GetPayload()[3] == 4);
+		REQUIRE(userData.IsBeginning() == true);
+		REQUIRE(userData.IsEnd() == true);
+		REQUIRE(userData.IsUnordered() == true);
+
+		chunk->SetUserData(std::move(userData));
+
+		CHECK_SCTP_CHUNK(
+		  /*chunk*/ chunk,
+		  /*buffer*/ sctpCommon::FactoryBuffer,
+		  /*bufferLength*/ sizeof(sctpCommon::FactoryBuffer),
+		  /*length*/ 20 + 4,
+		  /*chunkType*/ RTC::SCTP::Chunk::ChunkType::I_DATA,
+		  /*unknownType*/ false,
+		  /*actionForUnknownChunkType*/ RTC::SCTP::Chunk::ActionForUnknownChunkType::STOP_AND_REPORT,
+		  /*flags*/ 0b00000111,
+		  /*canHaveParameters*/ false,
+		  /*parametersCount*/ 0,
+		  /*canHaveErrorCauses*/ false,
+		  /*errorCausesCount*/ 0);
+
+		auto gotUserData = chunk->MakeUserData();
+
+		std::vector<uint8_t> expectedPayload = { 1, 2, 3, 4 };
+
+		REQUIRE(gotUserData.GetStreamId() == 123);
+		REQUIRE(gotUserData.GetStreamSequenceNumber() == 0);
+		REQUIRE(gotUserData.GetMessageId() == 5555);
+		// Bit B is set in the I_DATA Chunk so this must be 0.
+		REQUIRE(gotUserData.GetFragmentSequenceNumber() == 0);
+		REQUIRE(gotUserData.GetPayloadProtocolId() == 56789);
+		REQUIRE(gotUserData.GetPayloadLength() == 4);
+		REQUIRE(gotUserData.GetPayload()[0] == 1);
+		REQUIRE(gotUserData.GetPayload()[1] == 2);
+		REQUIRE(gotUserData.GetPayload()[2] == 3);
+		REQUIRE(gotUserData.GetPayload()[3] == 4);
+		REQUIRE(gotUserData.IsBeginning() == true);
+		REQUIRE(gotUserData.IsEnd() == true);
+		REQUIRE(gotUserData.IsUnordered() == true);
+		// NOLINTNEXTLINE(bugprone-use-after-move, hicpp-invalid-access-moved)
+		REQUIRE(std::move(gotUserData).ReleasePayload() == expectedPayload);
+
+		delete chunk;
+	}
 }

package/worker/test/src/RTC/SCTP/packet/chunks/TestIForwardTsnChunk.cpp

@@ -3,7 +3,7 @@
 #include "RTC/SCTP/packet/Chunk.hpp"
 #include "RTC/SCTP/packet/chunks/AnyForwardTsnChunk.hpp"
 #include "RTC/SCTP/packet/chunks/IForwardTsnChunk.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 #include <vector>
@@ -57,14 +57,18 @@ SCENARIO("I-Forward Cumulative TSN Chunk (194)", "[serializable][sctp][chunk]")
 
 		REQUIRE(chunk->GetNewCumulativeTsn() == 287454020);
 		REQUIRE(chunk->GetNumberOfSkippedStreams() == 3);
-
-		const std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream> expectedSkippedStreams{
-			{ 4097,  true,  285212689 },
-			{ 8194,  false, 570425378 },
-			{ 12291, true,  855638067 },
-		};
-
-		REQUIRE(chunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  chunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                  {
+                                       true,  4097,
+                                       285212689, },
+		                                  {
+                                       false,    8194,
+                                       570425378, },
+		                                  {
+                                       true,12291,
+                                       855638067, },
+    });
 
 		/* Serialize it. */
 
@@ -88,7 +92,18 @@ SCENARIO("I-Forward Cumulative TSN Chunk (194)", "[serializable][sctp][chunk]")
 
 		REQUIRE(chunk->GetNewCumulativeTsn() == 287454020);
 		REQUIRE(chunk->GetNumberOfSkippedStreams() == 3);
-		REQUIRE(chunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  chunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                  {
+                                       true,  4097,
+                                       285212689, },
+		                                  {
+                                       false,    8194,
+                                       570425378, },
+		                                  {
+                                       true,12291,
+                                       855638067, },
+    });
 
 		/* Clone it. */
 
@@ -114,7 +129,18 @@ SCENARIO("I-Forward Cumulative TSN Chunk (194)", "[serializable][sctp][chunk]")
 
 		REQUIRE(clonedChunk->GetNewCumulativeTsn() == 287454020);
 		REQUIRE(clonedChunk->GetNumberOfSkippedStreams() == 3);
-		REQUIRE(clonedChunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  clonedChunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                        {
+                                             true,  4097,
+                                             285212689, },
+		                                        {
+                                             false,    8194,
+                                             570425378, },
+		                                        {
+                                             true,12291,
+                                             855638067, },
+    });
 
 		delete clonedChunk;
 	}
@@ -164,17 +190,20 @@ SCENARIO("I-Forward Cumulative TSN Chunk (194)", "[serializable][sctp][chunk]")
 
 		REQUIRE(chunk->GetNewCumulativeTsn() == 0);
 		REQUIRE(chunk->GetNumberOfSkippedStreams() == 0);
-
-		std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream> expectedSkippedStreams{};
-
-		REQUIRE(chunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(chunk->GetSkippedStreams().empty());
 
 		/* Modify it. */
 
 		chunk->SetNewCumulativeTsn(12345678);
-		chunk->AddStream(1111, true, 11110001);
-		chunk->AddStream(2222, false, 22220002);
-		chunk->AddStream(3333, true, 33330003);
+		chunk->AddSkippedStream(
+		  RTC::SCTP::AnyForwardTsnChunk::SkippedStream{
+		    /*unordered*/ true, /*streamId*/ 1111, /*mid*/ 11110001 });
+		chunk->AddSkippedStream(
+		  RTC::SCTP::AnyForwardTsnChunk::SkippedStream{
+		    /*unordered*/ false, /*streamId*/ 2222, /*mid*/ 22220002 });
+		chunk->AddSkippedStream(
+		  RTC::SCTP::AnyForwardTsnChunk::SkippedStream{
+		    /*unordered*/ true, /*streamId*/ 3333, /*mid*/ 33330003 });
 
 		CHECK_SCTP_CHUNK(
 		  /*chunk*/ chunk,
@@ -192,14 +221,12 @@ SCENARIO("I-Forward Cumulative TSN Chunk (194)", "[serializable][sctp][chunk]")
 
 		REQUIRE(chunk->GetNewCumulativeTsn() == 12345678);
 		REQUIRE(chunk->GetNumberOfSkippedStreams() == 3);
-
-		expectedSkippedStreams = {
-			{ 1111, true,  11110001 },
-			{ 2222, false, 22220002 },
-			{ 3333, true,  33330003 },
-		};
-
-		REQUIRE(chunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  chunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                  { true,  1111, 11110001 },
+		                                  { false, 2222, 22220002 },
+		                                  { true,  3333, 33330003 },
+    });
 
 		/* Parse itself and compare. */
 
@@ -223,7 +250,12 @@ SCENARIO("I-Forward Cumulative TSN Chunk (194)", "[serializable][sctp][chunk]")
 
 		REQUIRE(parsedChunk->GetNewCumulativeTsn() == 12345678);
 		REQUIRE(parsedChunk->GetNumberOfSkippedStreams() == 3);
-		REQUIRE(parsedChunk->GetSkippedStreams() == expectedSkippedStreams);
+		REQUIRE(
+		  parsedChunk->GetSkippedStreams() == std::vector<RTC::SCTP::AnyForwardTsnChunk::SkippedStream>{
+		                                        { true,  1111, 11110001 },
+		                                        { false, 2222, 22220002 },
+		                                        { true,  3333, 33330003 },
+    });
 
 		delete parsedChunk;
 	}

package/worker/test/src/RTC/SCTP/packet/chunks/TestInitAckChunk.cpp

@@ -4,7 +4,7 @@
 #include "RTC/SCTP/packet/Parameter.hpp"
 #include "RTC/SCTP/packet/chunks/InitAckChunk.hpp"
 #include "RTC/SCTP/packet/parameters/IPv4AddressParameter.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 

package/worker/test/src/RTC/SCTP/packet/chunks/TestInitChunk.cpp

@@ -7,7 +7,7 @@
 #include "RTC/SCTP/packet/parameters/IPv4AddressParameter.hpp"
 #include "RTC/SCTP/packet/parameters/IPv6AddressParameter.hpp"
 #include "RTC/SCTP/packet/parameters/SupportedAddressTypesParameter.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 

package/worker/test/src/RTC/SCTP/packet/chunks/TestOperationErrorChunk.cpp

@@ -7,7 +7,7 @@
 #include "RTC/SCTP/packet/errorCauses/OutOfResourceErrorCause.hpp"
 #include "RTC/SCTP/packet/errorCauses/UnknownErrorCause.hpp"
 #include "RTC/SCTP/packet/errorCauses/UnrecognizedChunkTypeErrorCause.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 

package/worker/test/src/RTC/SCTP/packet/chunks/TestReConfigChunk.cpp

@@ -6,7 +6,7 @@
 #include "RTC/SCTP/packet/parameters/IncomingSsnResetRequestParameter.hpp"
 #include "RTC/SCTP/packet/parameters/OutgoingSsnResetRequestParameter.hpp"
 #include "RTC/SCTP/packet/parameters/ReconfigurationResponseParameter.hpp"
-#include "RTC/SCTP/sctpCommon.hpp"
+#include "test/include/RTC/SCTP/sctpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 #include <vector>