mediasoup 3.19.22 → 3.20.0

package/worker/src/RTC/TransportCongestionControlClient.cpp

@@ -3,7 +3,6 @@
 #define USE_TREND_CALCULATOR
 
 #include "RTC/TransportCongestionControlClient.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include <libwebrtc/api/transport/network_types.h> // webrtc::TargetRateConstraints
 #include <limits>                                  // std::numeric_limits
@@ -116,7 +115,7 @@ namespace RTC
 		MS_TRACE();
 
 #ifdef USE_TREND_CALCULATOR
-		auto nowMs = DepLibUV::GetTimeMsInt64();
+		const auto nowMs = this->shared->GetTimeMsInt64();
 #endif
 
 		this->bitrates.desiredBitrate          = 0u;
@@ -309,7 +308,7 @@ namespace RTC
 		MS_TRACE();
 
 #ifdef USE_TREND_CALCULATOR
-		auto nowMs = DepLibUV::GetTimeMsInt64();
+		const auto nowMs = this->shared->GetTimeMsInt64();
 #endif
 
 		// Manage it via trending and increase it a bit to avoid immediate oscillations.
@@ -411,7 +410,7 @@ namespace RTC
 
 		webrtc::TargetRateConstraints constraints;
 
-		constraints.at_time       = webrtc::Timestamp::ms(DepLibUV::GetTimeMs());
+		constraints.at_time       = webrtc::Timestamp::ms(this->shared->GetTimeMs());
 		constraints.min_data_rate = webrtc::DataRate::bps(this->bitrates.minBitrate);
 		constraints.max_data_rate = webrtc::DataRate::bps(this->bitrates.maxBitrate);
 		constraints.starting_rate = webrtc::DataRate::bps(this->bitrates.startBitrate);
@@ -437,14 +436,14 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->lastAvailableBitrateEventAtMs = DepLibUV::GetTimeMs();
+		this->lastAvailableBitrateEventAtMs = this->shared->GetTimeMs();
 	}
 
 	void TransportCongestionControlClient::MayEmitAvailableBitrateEvent(uint32_t previousAvailableBitrate)
 	{
 		MS_TRACE();
 
-		const uint64_t nowMs = DepLibUV::GetTimeMsInt64();
+		const uint64_t nowMs = this->shared->GetTimeMsInt64();
 		bool notify{ false };
 
 		// Ignore if first event.

package/worker/src/RTC/TransportCongestionControlServer.cpp

@@ -2,7 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/TransportCongestionControlServer.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "RTC/RTCP/FeedbackPsRemb.hpp"
 
@@ -287,7 +286,7 @@ namespace RTC
 			// This is to ensure that we send N REMB packets with bitrate 0 (unlimited).
 			this->unlimitedRembCounter = UnlimitedRembNumPackets;
 
-			auto nowMs = DepLibUV::GetTimeMs();
+			auto nowMs = this->shared->GetTimeMs();
 
 			MaySendLimitationRembFeedback(nowMs);
 		}

package/worker/src/RTC/WebRtcServer.cpp

@@ -4,9 +4,9 @@
 
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
+#include "RTC/WebRtcServer.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
-#include "RTC/WebRtcServer.hpp"
 #include <cmath> // std::pow()
 
 namespace RTC

package/worker/src/RTC/WebRtcTransport.cpp

@@ -2,11 +2,11 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/WebRtcTransport.hpp"
+#include "FBS/webRtcTransport.h"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
-#include "FBS/webRtcTransport.h"
 #include <cmath> // std::pow()
 
 namespace RTC
@@ -339,7 +339,7 @@ namespace RTC
 		// We need to tell the Transport parent class that we are about to destroy
 		// the class instance. This is because child's destructor runs before
 		// parent's destructor. See comment in Transport::OnSctpAssociationSendData().
-		Destroying();
+		SetDestroying();
 
 		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
@@ -860,22 +860,14 @@ namespace RTC
 	}
 
 	void WebRtcTransport::SendMessage(
-	  RTC::DataConsumer* dataConsumer, const uint8_t* msg, size_t len, uint32_t ppid, onQueuedCallback* cb)
+	  RTC::DataConsumer* dataConsumer, RTC::SCTP::Message message, onQueuedCallback* cb)
 	{
 		MS_TRACE();
 
-		if (Settings::configuration.useBuiltInSctpStack)
-		{
-			// TODO: SCTP
-		}
-		// TODO: Remove once we only use built-in SCTP stack.
-		else
-		{
-			this->oldSctpAssociation->SendSctpMessage(dataConsumer, msg, len, ppid, cb);
-		}
+		SendSctpMessage(dataConsumer, std::move(message), cb);
 	}
 
-	bool WebRtcTransport::SendSctpData(const uint8_t* data, size_t len)
+	bool WebRtcTransport::SendData(const uint8_t* data, size_t len)
 	{
 		MS_TRACE();
 

package/worker/src/Settings.cpp

@@ -52,16 +52,15 @@ void Settings::SetConfiguration(int argc, char* argv[])
 	// clang-format off
 	struct option options[] =
 	{
-		{ "logLevel",             optional_argument, nullptr, 'l' },
-		{ "logTags",              optional_argument, nullptr, 't' },
-		{ "rtcMinPort",           optional_argument, nullptr, 'm' },
-		{ "rtcMaxPort",           optional_argument, nullptr, 'M' },
-		{ "dtlsCertificateFile",  optional_argument, nullptr, 'c' },
-		{ "dtlsPrivateKeyFile",   optional_argument, nullptr, 'p' },
-		{ "libwebrtcFieldTrials", optional_argument, nullptr, 'W' },
-		{ "disableLiburing",      optional_argument, nullptr, 'd' },
-		{ "useBuiltInSctpStack",  optional_argument, nullptr, 's' },
-		{ nullptr,                0,                 nullptr,  0  }
+		{ .name="logLevel",             .has_arg=optional_argument, .flag=nullptr, .val='l' },
+		{ .name="logTags",              .has_arg=optional_argument, .flag=nullptr, .val='t' },
+		{ .name="rtcMinPort",           .has_arg=optional_argument, .flag=nullptr, .val='m' },
+		{ .name="rtcMaxPort",           .has_arg=optional_argument, .flag=nullptr, .val='M' },
+		{ .name="dtlsCertificateFile",  .has_arg=optional_argument, .flag=nullptr, .val='c' },
+		{ .name="dtlsPrivateKeyFile",   .has_arg=optional_argument, .flag=nullptr, .val='p' },
+		{ .name="libwebrtcFieldTrials", .has_arg=optional_argument, .flag=nullptr, .val='W' },
+		{ .name="disableLiburing",      .has_arg=optional_argument, .flag=nullptr, .val='d' },
+		{ .name=nullptr,                .has_arg=0,                 .flag=nullptr,  .val=0  }
 	};
 	// clang-format on
 	std::string stringValue;
@@ -172,22 +171,6 @@ void Settings::SetConfiguration(int argc, char* argv[])
 				break;
 			}
 
-			case 's':
-			{
-				stringValue = std::string(optarg);
-
-				if (stringValue == "true")
-				{
-					Settings::configuration.useBuiltInSctpStack = true;
-				}
-				else
-				{
-					Settings::configuration.useBuiltInSctpStack = false;
-				}
-
-				break;
-			}
-
 			// Invalid option.
 			case '?':
 			{
@@ -400,8 +383,6 @@ void Settings::PrintConfiguration()
 		  info, "  libwebrtcFieldTrials: %s", Settings::configuration.libwebrtcFieldTrials.c_str());
 	}
 	MS_DEBUG_TAG(info, "  disableLiburing: %s", Settings::configuration.disableLiburing ? "yes" : "no");
-	MS_DEBUG_TAG(
-	  info, "  useBuiltInSctpStack: %s", Settings::configuration.useBuiltInSctpStack ? "yes" : "no");
 
 	MS_DEBUG_TAG(info, "</configuration>");
 }

package/worker/src/Shared.cpp

@@ -2,9 +2,9 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "Shared.hpp"
-#include "Logger.hpp"
 #include "handles/BackoffTimerHandle.hpp"
 #include "handles/TimerHandle.hpp"
+#include "Logger.hpp"
 
 Shared::Shared(
   Channel::ChannelMessageRegistrator* channelMessageRegistrator,
@@ -19,7 +19,7 @@ Shared::~Shared()
 	MS_TRACE();
 }
 
-TimerHandleInterface* Shared::CreateTimer(TimerHandleInterface::Listener* listener) const
+TimerHandleInterface* Shared::CreateTimer(TimerHandleInterface::Listener* listener)
 {
 	MS_TRACE();
 
@@ -27,7 +27,7 @@ TimerHandleInterface* Shared::CreateTimer(TimerHandleInterface::Listener* listen
 }
 
 BackoffTimerHandleInterface* Shared::CreateBackoffTimer(
-  const BackoffTimerHandleInterface::BackoffTimerHandleOptions& options) const
+  const BackoffTimerHandleInterface::BackoffTimerHandleOptions& options)
 {
 	MS_TRACE();
 

package/worker/src/Utils/Crypto.cpp

@@ -8,7 +8,7 @@
 
 namespace Utils
 {
-	/* Static variables. */
+	/* Class variables. */
 
 	thread_local std::mt19937_64 Crypto::rng;
 	thread_local EVP_MAC* Crypto::mac{ nullptr };

package/worker/src/Utils/String.cpp

@@ -19,7 +19,7 @@
 /* Static. */
 
 static constexpr size_t BufferOutSize{ 65536 };
-thread_local uint8_t BufferOut[BufferOutSize];
+static thread_local uint8_t BufferOut[BufferOutSize];
 static const uint8_t Base64Table[65] =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 

package/worker/src/Worker.cpp

@@ -5,14 +5,12 @@
 #ifdef MS_LIBURING_SUPPORTED
 #include "DepLibUring.hpp"
 #endif
+#include "FBS/response.h"
+#include "FBS/worker.h"
 #include "DepLibUV.hpp"
-// TODO: Remove once we only use built-in SCTP stack.
-#include "DepUsrSCTP.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 #include "Settings.hpp"
-#include "FBS/response.h"
-#include "FBS/worker.h"
 
 /* Instance methods. */
 
@@ -35,13 +33,6 @@ Worker::Worker(::Channel::ChannelSocket* channel, SharedInterface* shared)
 	}
 #endif
 
-	// TODO: Remove once we only use built-in SCTP stack.
-	if (!Settings::configuration.useBuiltInSctpStack)
-	{
-		// Create the Checker instance in DepUsrSCTP.
-		DepUsrSCTP::CreateChecker(this->shared);
-	}
-
 #ifdef MS_LIBURING_SUPPORTED
 	if (DepLibUring::IsEnabled())
 	{
@@ -52,7 +43,7 @@ Worker::Worker(::Channel::ChannelSocket* channel, SharedInterface* shared)
 
 	// Tell the Node process that we are running.
 	this->shared->GetChannelNotifier()->Emit(
-	  std::to_string(Logger::pid), FBS::Notification::Event::WORKER_RUNNING);
+	  std::to_string(Logger::Pid), FBS::Notification::Event::WORKER_RUNNING);
 
 	MS_DEBUG_DEV("starting libuv loop");
 	DepLibUV::RunLoop();
@@ -101,13 +92,6 @@ void Worker::Close()
 	}
 	this->mapWebRtcServers.clear();
 
-	// TODO: Remove once we only use built-in SCTP stack.
-	if (!Settings::configuration.useBuiltInSctpStack)
-	{
-		// Close the Checker instance in DepUsrSCTP.
-		DepUsrSCTP::CloseChecker();
-	}
-
 #ifdef MS_LIBURING_SUPPORTED
 	if (DepLibUring::IsEnabled())
 	{
@@ -153,7 +137,7 @@ flatbuffers::Offset<FBS::Worker::DumpResponse> Worker::FillBuffer(
 	{
 		return FBS::Worker::CreateDumpResponseDirect(
 		  builder,
-		  Logger::pid,
+		  Logger::Pid,
 		  &webRtcServerIds,
 		  &routerIds,
 		  channelMessageHandlers,
@@ -162,11 +146,11 @@ flatbuffers::Offset<FBS::Worker::DumpResponse> Worker::FillBuffer(
 	else
 	{
 		return FBS::Worker::CreateDumpResponseDirect(
-		  builder, Logger::pid, &webRtcServerIds, &routerIds, channelMessageHandlers);
+		  builder, Logger::Pid, &webRtcServerIds, &routerIds, channelMessageHandlers);
 	}
 #else
 	return FBS::Worker::CreateDumpResponseDirect(
-	  builder, Logger::pid, &webRtcServerIds, &routerIds, channelMessageHandlers);
+	  builder, Logger::Pid, &webRtcServerIds, &routerIds, channelMessageHandlers);
 #endif
 }
 
@@ -232,7 +216,7 @@ flatbuffers::Offset<FBS::Worker::ResourceUsageResponse> Worker::FillBufferResour
 	  uvRusage.ru_nivcsw);
 }
 
-RTC::WebRtcServer* Worker::GetWebRtcServer(const std::string& webRtcServerId) const
+RTC::WebRtcServer* Worker::AssertAndGetWebRtcServerById(const std::string& webRtcServerId) const
 {
 	auto it = this->mapWebRtcServers.find(webRtcServerId);
 
@@ -244,7 +228,7 @@ RTC::WebRtcServer* Worker::GetWebRtcServer(const std::string& webRtcServerId) co
 	return it->second;
 }
 
-RTC::Router* Worker::GetRouter(const std::string& routerId) const
+RTC::Router* Worker::AssertAndGetRouterById(const std::string& routerId) const
 {
 	MS_TRACE();
 
@@ -348,7 +332,7 @@ void Worker::HandleRequest(Channel::ChannelRequest* request)
 
 			try
 			{
-				webRtcServer = GetWebRtcServer(webRtcServerId);
+				webRtcServer = AssertAndGetWebRtcServerById(webRtcServerId);
 			}
 			catch (const MediaSoupError& error)
 			{
@@ -403,7 +387,7 @@ void Worker::HandleRequest(Channel::ChannelRequest* request)
 
 			try
 			{
-				router = GetRouter(routerId);
+				router = AssertAndGetRouterById(routerId);
 			}
 			catch (const MediaSoupError& error)
 			{

package/worker/src/handles/BackoffTimerHandle.cpp

@@ -8,8 +8,9 @@
 
 /* Instance methods. */
 
-BackoffTimerHandle::BackoffTimerHandle(const BackoffTimerHandleOptions& options)
+BackoffTimerHandle::BackoffTimerHandle(BackoffTimerHandleOptions options)
   : listener(options.listener),
+    label(std::move(options.label)),
     baseTimeoutMs(options.baseTimeoutMs),
     backoffAlgorithm(options.backoffAlgorithm),
     maxBackoffTimeoutMs(options.maxBackoffTimeoutMs),
@@ -17,8 +18,24 @@ BackoffTimerHandle::BackoffTimerHandle(const BackoffTimerHandleOptions& options)
 {
 	MS_TRACE();
 
-	// NOTE: This may throw.
-	SetBaseTimeoutMs(baseTimeoutMs);
+	if (!this->listener)
+	{
+		MS_THROW_TYPE_ERROR("options.listener must be given");
+	}
+
+	if (this->label.empty())
+	{
+		MS_THROW_TYPE_ERROR("options.label must be given");
+	}
+
+	if (this->baseTimeoutMs > BackoffTimerHandleInterface::MaxTimeoutMs)
+	{
+		MS_THROW_ERROR(
+		  "[%s] base timeout (%" PRIu64 " ms) cannot be greater than %" PRIu64 " ms",
+		  this->label.c_str(),
+		  this->baseTimeoutMs,
+		  BackoffTimerHandleInterface::MaxTimeoutMs);
+	}
 
 	this->timer = new TimerHandle(this);
 }
@@ -58,7 +75,8 @@ void BackoffTimerHandle::SetBaseTimeoutMs(uint64_t baseTimeoutMs)
 	if (baseTimeoutMs > BackoffTimerHandleInterface::MaxTimeoutMs)
 	{
 		MS_THROW_ERROR(
-		  "base timeout (%" PRIu64 " ms) cannot be greater than %" PRIu64 " ms",
+		  "[%s] base timeout (%" PRIu64 " ms) cannot be greater than %" PRIu64 " ms",
+		  this->label.c_str(),
 		  baseTimeoutMs,
 		  BackoffTimerHandleInterface::MaxTimeoutMs);
 	}
@@ -108,7 +126,7 @@ void BackoffTimerHandle::OnTimer(TimerHandleInterface* /*timer*/)
 	this->expirationCount++;
 
 	// Compute whether the BackoffTimer should still be running after this timeout
-	// expiration so the parent can check IsRunning() within the OnTimer()
+	// expiration so the parent can check IsRunning() within the `OnBackoffTimer()`
 	// callback.
 	this->running =
 	  !this->maxRestarts.has_value() || this->expirationCount <= this->maxRestarts.value();
@@ -118,7 +136,7 @@ void BackoffTimerHandle::OnTimer(TimerHandleInterface* /*timer*/)
 
 	// Call the listener by passing base timeout as reference so the parent has
 	// a chance to change it and affect the next timeout.
-	this->listener->OnTimer(this, baseTimeoutMs, stop);
+	this->listener->OnBackoffTimer(this, baseTimeoutMs, stop);
 
 	// If the parent has set `stop` to true it means that it has deleted the
 	// instance, so stop here.

package/worker/src/handles/UdpSocketHandle.cpp

@@ -17,7 +17,7 @@ static constexpr size_t ReadBufferSize{ 65536 };
 // it to structs (e.g. RTP::Packet::FixedHeader) that require 4-byte alignment.
 // Without this, accessing multi-byte fields would be undefined behavior on
 // strict-alignment architectures.
-alignas(4) thread_local uint8_t ReadBuffer[ReadBufferSize];
+alignas(4) static thread_local uint8_t ReadBuffer[ReadBufferSize];
 
 /* Static methods for UV callbacks. */
 

package/worker/src/lib.cpp

@@ -7,22 +7,20 @@
 #ifdef MS_LIBURING_SUPPORTED
 #include "DepLibUring.hpp"
 #endif
+#include "Channel/ChannelMessageRegistrator.hpp"
+#include "Channel/ChannelNotifier.hpp"
+#include "Channel/ChannelSocket.hpp"
 #include "DepLibUV.hpp"
 #include "DepLibWebRTC.hpp"
 #include "DepOpenSSL.hpp"
-// TODO: Remove once we only use built-in SCTP stack.
-#include "DepUsrSCTP.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
+#include "RTC/DtlsTransport.hpp"
+#include "RTC/SrtpSession.hpp"
 #include "Settings.hpp"
 #include "Shared.hpp"
 #include "Utils.hpp"
 #include "Worker.hpp"
-#include "Channel/ChannelMessageRegistrator.hpp"
-#include "Channel/ChannelNotifier.hpp"
-#include "Channel/ChannelSocket.hpp"
-#include "RTC/DtlsTransport.hpp"
-#include "RTC/SrtpSession.hpp"
 #include <absl/container/flat_hash_map.h>
 #include <csignal> // sigaction()
 #include <string>
@@ -156,11 +154,6 @@ extern "C" int mediasoup_worker_run(
 		// Initialize static stuff.
 		DepOpenSSL::ClassInit();
 		DepLibSRTP::ClassInit();
-		// TODO: Remove once we only use built-in SCTP stack.
-		if (!Settings::configuration.useBuiltInSctpStack)
-		{
-			DepUsrSCTP::ClassInit();
-		}
 #ifdef MS_LIBURING_SUPPORTED
 		DepLibUring::ClassInit();
 #endif
@@ -187,11 +180,6 @@ extern "C" int mediasoup_worker_run(
 		DepLibUring::ClassDestroy();
 #endif
 		RTC::DtlsTransport::ClassDestroy();
-		// TODO: Remove once we only use built-in SCTP stack.
-		if (!Settings::configuration.useBuiltInSctpStack)
-		{
-			DepUsrSCTP::ClassDestroy();
-		}
 		DepLibUV::ClassDestroy();
 
 		return 0;

package/worker/subprojects/catch2.wrap

@@ -1,10 +1,10 @@
 [wrap-file]
-directory = Catch2-3.13.0
-source_url = https://github.com/catchorg/Catch2/archive/v3.13.0.tar.gz
-source_filename = Catch2-3.13.0.tar.gz
-source_hash = 650795f6501af514f806e78c554729847b98db6935e69076f36bb03ed2e985ef
-source_fallback_url = https://wrapdb.mesonbuild.com/v2/catch2_3.13.0-1/get_source/Catch2-3.13.0.tar.gz
-wrapdb_version = 3.13.0-1
+directory = Catch2-3.14.0
+source_url = https://github.com/catchorg/Catch2/archive/v3.14.0.tar.gz
+source_filename = Catch2-3.14.0.tar.gz
+source_hash = ba2a939efead3c833c499cf487e185762f419a71d30158cd1b43c6079c586490
+source_fallback_url = https://wrapdb.mesonbuild.com/v2/catch2_3.14.0-1/get_source/Catch2-3.14.0.tar.gz
+wrapdb_version = 3.14.0-1
 
 [provide]
 catch2 = catch2_dep

package/worker/test/include/RTC/ICE/iceCommon.hpp

@@ -2,13 +2,13 @@
 #define MS_TEST_RTC_ICE_COMMON_HPP
 
 #include "common.hpp"
-#include "MediaSoupErrors.hpp"          // IWYU pragma: export
-#include "Utils.hpp"                    // IWYU pragma: export
-#include "testHelpers.hpp"              // IWYU pragma: export
-#include "RTC/ICE/StunPacket.hpp"       // IWYU pragma: export
-#include <catch2/catch_test_macros.hpp> // IWYU pragma: export
-#include <cstdlib>                      // std::malloc(), std::free()
-#include <cstring>                      // std::memcpy()
+#include "MediaSoupErrors.hpp"
+#include "RTC/ICE/StunPacket.hpp"
+#include "Utils.hpp"
+#include "test/include/testHelpers.hpp"
+#include <catch2/catch_test_macros.hpp>
+#include <cstdlib> // std::malloc(), std::free()
+#include <cstring> // std::memcpy()
 #include <string_view>
 
 namespace iceCommon

package/worker/test/include/RTC/RTP/rtpCommon.hpp

@@ -2,12 +2,12 @@
 #define MS_TEST_RTC_RTP_COMMON_HPP
 
 #include "common.hpp"
-#include "MediaSoupErrors.hpp"          // IWYU pragma: export
-#include "testHelpers.hpp"              // IWYU pragma: export
-#include "RTC/RTP/Packet.hpp"           // IWYU pragma: export
-#include <catch2/catch_test_macros.hpp> // IWYU pragma: export
-#include <cstdlib>                      // std::malloc(), std::free()
-#include <cstring>                      // std::memcpy()
+#include "MediaSoupErrors.hpp"
+#include "RTC/RTP/Packet.hpp"
+#include "test/include/testHelpers.hpp"
+#include <catch2/catch_test_macros.hpp>
+#include <cstdlib> // std::malloc(), std::free()
+#include <cstring> // std::memcpy()
 
 namespace rtpCommon
 {

package/worker/test/include/RTC/SCTP/sctpCommon.hpp

@@ -2,16 +2,16 @@
 #define MS_TEST_RTC_SCTP_COMMON_HPP
 
 #include "common.hpp"
-#include "MediaSoupErrors.hpp"                                               // IWYU pragma: export
-#include "Utils.hpp"                                                         // IWYU pragma: export
-#include "testHelpers.hpp"                                                   // IWYU pragma: export
-#include "RTC/SCTP/packet/Chunk.hpp"                                         // IWYU pragma: export
-#include "RTC/SCTP/packet/ErrorCause.hpp"                                    // IWYU pragma: export
-#include "RTC/SCTP/packet/Packet.hpp"                                        // IWYU pragma: export
-#include "RTC/SCTP/packet/Parameter.hpp"                                     // IWYU pragma: export
-#include "RTC/SCTP/packet/errorCauses/InvalidStreamIdentifierErrorCause.hpp" // IWYU pragma: export
-#include "RTC/SCTP/packet/parameters/HeartbeatInfoParameter.hpp"             // IWYU pragma: export
-#include <catch2/catch_test_macros.hpp>                                      // IWYU pragma: export
+#include "MediaSoupErrors.hpp"
+#include "RTC/SCTP/packet/Chunk.hpp"
+#include "RTC/SCTP/packet/ErrorCause.hpp"
+#include "RTC/SCTP/packet/Packet.hpp"
+#include "RTC/SCTP/packet/Parameter.hpp"
+#include "RTC/SCTP/packet/errorCauses/InvalidStreamIdentifierErrorCause.hpp"
+#include "RTC/SCTP/packet/parameters/HeartbeatInfoParameter.hpp"
+#include "Utils.hpp"
+#include "test/include/testHelpers.hpp"
+#include <catch2/catch_test_macros.hpp>
 
 namespace sctpCommon
 {

package/worker/test/include/catch2Macros.hpp

@@ -0,0 +1,31 @@
+#ifndef MS_CATCH2_MACROS_HPP
+#define MS_CATCH2_MACROS_HPP
+
+#include <catch2/catch_test_macros.hpp>
+
+/**
+ * `VerificationResult` struct is defined in mocks/include/mockTypes.hpp.
+ */
+// clang-format off
+#define REQUIRE_VERIFICATION_RESULT(verificationResult) \
+	do \
+	{ \
+		const auto& result = (verificationResult); \
+		\
+		if (!(result.ok)) \
+		{ \
+			FAIL(result.errorMessage); \
+		} \
+	} while (false)
+
+// clang-format off
+#define REQUIRE_WITH_MESSAGE(condition, errorMessage) \
+	do \
+	{ \
+		if (!(condition)) \
+		{ \
+			FAIL(errorMessage); \
+		} \
+	} while (false)
+
+#endif

package/worker/test/src/RTC/ICE/TestStunPacket.cpp

@@ -1,8 +1,8 @@
 #include "common.hpp"
-#include "Utils.hpp"
-#include "testHelpers.hpp"
 #include "RTC/ICE/StunPacket.hpp"
-#include "RTC/ICE/iceCommon.hpp"
+#include "Utils.hpp"
+#include "test/include/RTC/ICE/iceCommon.hpp"
+#include "test/include/testHelpers.hpp"
 #include <uv.h>
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()

package/worker/test/src/RTC/ICE/iceCommon.cpp

@@ -1,5 +1,5 @@
-#include "RTC/ICE/iceCommon.hpp" // in worker/test/include/
-#include <cstring>               // std::memset
+#include "test/include/RTC/ICE/iceCommon.hpp" // in worker/test/include/
+#include <cstring>                            // std::memset
 
 namespace iceCommon
 {

package/worker/test/src/RTC/RTP/Codecs/TestVP8.cpp

@@ -1,7 +1,7 @@
 #include "common.hpp"
 #include "RTC/RTP/Codecs/VP8.hpp"
 #include "RTC/RTP/Packet.hpp"
-#include "RTC/RTP/rtpCommon.hpp"
+#include "test/include/RTC/RTP/rtpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memcmp(), std::memcpy()
 

package/worker/test/src/RTC/RTP/Codecs/TestVP9.cpp

@@ -1,7 +1,7 @@
 #include "common.hpp"
 #include "RTC/RTP/Codecs/VP9.hpp"
 #include "RTC/RTP/Packet.hpp"
-#include "RTC/RTP/rtpCommon.hpp"
+#include "test/include/RTC/RTP/rtpCommon.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memcmp()
 

package/worker/test/src/RTC/RTP/TestPacket.cpp

@@ -1,10 +1,10 @@
 #include "common.hpp"
-#include "Utils.hpp"
-#include "testHelpers.hpp"
 #include "RTC/RTP/HeaderExtensionIds.hpp"
 #include "RTC/RTP/Packet.hpp"
-#include "RTC/RTP/rtpCommon.hpp"
 #include "RTC/RtpDictionaries.hpp"
+#include "Utils.hpp"
+#include "test/include/RTC/RTP/rtpCommon.hpp"
+#include "test/include/testHelpers.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <cstring> // std::memset()
 #include <string>