mediasoup 3.19.21 → 3.19.22

package/worker/src/RTC/WebRtcTransport.cpp

@@ -33,7 +33,7 @@ namespace RTC
 	 * This constructor is used when the WebRtcTransport doesn't use a WebRtcServer.
 	 */
 	WebRtcTransport::WebRtcTransport(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Transport::Listener* listener,
 	  const FBS::WebRtcTransport::WebRtcTransportOptions* options)
@@ -226,13 +226,17 @@ namespace RTC
 
 			// Create a ICE server.
 			this->iceServer = new RTC::ICE::IceServer(
-			  this, Utils::Crypto::GetRandomString(32), Utils::Crypto::GetRandomString(32), iceConsentTimeout);
+			  this,
+			  this->shared,
+			  Utils::Crypto::GetRandomString(32),
+			  Utils::Crypto::GetRandomString(32),
+			  iceConsentTimeout);
 
 			// Create a DTLS transport.
-			this->dtlsTransport = new RTC::DtlsTransport(this);
+			this->dtlsTransport = new RTC::DtlsTransport(this, this->shared);
 
 			// NOTE: This may throw.
-			this->shared->channelMessageRegistrator->RegisterHandler(
+			this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 			  this->id,
 			  /*channelRequestHandler*/ this,
 			  /*channelNotificationHandler*/ this);
@@ -273,7 +277,7 @@ namespace RTC
 	 * This constructor is used when the WebRtcTransport uses a WebRtcServer.
 	 */
 	WebRtcTransport::WebRtcTransport(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Transport::Listener* listener,
 	  WebRtcTransportListener* webRtcTransportListener,
@@ -296,16 +300,20 @@ namespace RTC
 
 			// Create a ICE server.
 			this->iceServer = new RTC::ICE::IceServer(
-			  this, Utils::Crypto::GetRandomString(32), Utils::Crypto::GetRandomString(32), iceConsentTimeout);
+			  this,
+			  this->shared,
+			  Utils::Crypto::GetRandomString(32),
+			  Utils::Crypto::GetRandomString(32),
+			  iceConsentTimeout);
 
 			// Create a DTLS transport.
-			this->dtlsTransport = new RTC::DtlsTransport(this);
+			this->dtlsTransport = new RTC::DtlsTransport(this, this->shared);
 
 			// Notify the webRtcTransportListener.
 			this->webRtcTransportListener->OnWebRtcTransportCreated(this);
 
 			// NOTE: This may throw.
-			this->shared->channelMessageRegistrator->RegisterHandler(
+			this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 			  this->id,
 			  /*channelRequestHandler*/ this,
 			  /*channelNotificationHandler*/ this);
@@ -333,7 +341,7 @@ namespace RTC
 		// parent's destructor. See comment in Transport::OnSctpAssociationSendData().
 		Destroying();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		// Must delete the DTLS transport first since it will generate a DTLS alert
 		// to be sent.
@@ -1221,12 +1229,12 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto tuple = this->iceServer->GetSelectedTuple()->FillBuffer(
-		  this->shared->channelNotifier->GetBufferBuilder());
+		  this->shared->GetChannelNotifier()->GetBufferBuilder());
 
 		auto notification = FBS::WebRtcTransport::CreateIceSelectedTupleChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), tuple);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), tuple);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_ICE_SELECTED_TUPLE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_IceSelectedTupleChangeNotification,
@@ -1241,9 +1249,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto iceStateChangeOffset = FBS::WebRtcTransport::CreateIceStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::IceState::CONNECTED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::IceState::CONNECTED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_ICE_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_IceStateChangeNotification,
@@ -1267,9 +1276,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto iceStateChangeOffset = FBS::WebRtcTransport::CreateIceStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::IceState::COMPLETED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::IceState::COMPLETED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_ICE_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_IceStateChangeNotification,
@@ -1293,10 +1303,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto iceStateChangeOffset = FBS::WebRtcTransport::CreateIceStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::WebRtcTransport::IceState::DISCONNECTED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_ICE_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_IceStateChangeNotification,
@@ -1317,9 +1327,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto dtlsStateChangeOffset = FBS::WebRtcTransport::CreateDtlsStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::DtlsState::CONNECTING);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::DtlsState::CONNECTING);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_DTLS_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_DtlsStateChangeNotification,
@@ -1363,11 +1374,11 @@ namespace RTC
 
 			// Notify the Node WebRtcTransport.
 			auto dtlsStateChangeOffset = FBS::WebRtcTransport::CreateDtlsStateChangeNotificationDirect(
-			  this->shared->channelNotifier->GetBufferBuilder(),
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 			  FBS::WebRtcTransport::DtlsState::CONNECTED,
 			  remoteCert.c_str());
 
-			this->shared->channelNotifier->Emit(
+			this->shared->GetChannelNotifier()->Emit(
 			  this->id,
 			  FBS::Notification::Event::WEBRTCTRANSPORT_DTLS_STATE_CHANGE,
 			  FBS::Notification::Body::WebRtcTransport_DtlsStateChangeNotification,
@@ -1393,9 +1404,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto dtlsStateChangeOffset = FBS::WebRtcTransport::CreateDtlsStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::DtlsState::FAILED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::DtlsState::FAILED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_DTLS_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_DtlsStateChangeNotification,
@@ -1410,9 +1422,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto dtlsStateChangeOffset = FBS::WebRtcTransport::CreateDtlsStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::DtlsState::CLOSED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::DtlsState::CLOSED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_DTLS_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_DtlsStateChangeNotification,

package/worker/src/Shared.cpp

@@ -0,0 +1,35 @@
+#define MS_CLASS "Shared"
+// #define MS_LOG_DEV_LEVEL 3
+
+#include "Shared.hpp"
+#include "Logger.hpp"
+#include "handles/BackoffTimerHandle.hpp"
+#include "handles/TimerHandle.hpp"
+
+Shared::Shared(
+  Channel::ChannelMessageRegistrator* channelMessageRegistrator,
+  Channel::ChannelNotifier* channelNotifier)
+  : channelMessageRegistrator(channelMessageRegistrator), channelNotifier(channelNotifier)
+{
+	MS_TRACE();
+}
+
+Shared::~Shared()
+{
+	MS_TRACE();
+}
+
+TimerHandleInterface* Shared::CreateTimer(TimerHandleInterface::Listener* listener) const
+{
+	MS_TRACE();
+
+	return new TimerHandle(listener);
+}
+
+BackoffTimerHandleInterface* Shared::CreateBackoffTimer(
+  const BackoffTimerHandleInterface::BackoffTimerHandleOptions& options) const
+{
+	MS_TRACE();
+
+	return new BackoffTimerHandle(options);
+}

package/worker/src/Worker.cpp

@@ -2,7 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "Worker.hpp"
-#include "ChannelMessageRegistrator.hpp"
 #ifdef MS_LIBURING_SUPPORTED
 #include "DepLibUring.hpp"
 #endif
@@ -12,13 +11,13 @@
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 #include "Settings.hpp"
-#include "Channel/ChannelNotifier.hpp"
 #include "FBS/response.h"
 #include "FBS/worker.h"
 
 /* Instance methods. */
 
-Worker::Worker(::Channel::ChannelSocket* channel) : channel(channel)
+Worker::Worker(::Channel::ChannelSocket* channel, SharedInterface* shared)
+  : channel(channel), shared(shared)
 {
 	MS_TRACE();
 
@@ -28,11 +27,6 @@ Worker::Worker(::Channel::ChannelSocket* channel) : channel(channel)
 	// Set the SignalHandle.
 	this->signalHandle = new SignalHandle(this);
 
-	// Set up the RTC::Shared singleton.
-	this->shared = new RTC::Shared(
-	  /*channelMessageRegistrator*/ new ChannelMessageRegistrator(),
-	  /*channelNotifier*/ new Channel::ChannelNotifier(this->channel));
-
 #ifdef MS_EXECUTABLE
 	{
 		// Add signals to handle.
@@ -45,7 +39,7 @@ Worker::Worker(::Channel::ChannelSocket* channel) : channel(channel)
 	if (!Settings::configuration.useBuiltInSctpStack)
 	{
 		// Create the Checker instance in DepUsrSCTP.
-		DepUsrSCTP::CreateChecker();
+		DepUsrSCTP::CreateChecker(this->shared);
 	}
 
 #ifdef MS_LIBURING_SUPPORTED
@@ -57,7 +51,7 @@ Worker::Worker(::Channel::ChannelSocket* channel) : channel(channel)
 #endif
 
 	// Tell the Node process that we are running.
-	this->shared->channelNotifier->Emit(
+	this->shared->GetChannelNotifier()->Emit(
 	  std::to_string(Logger::pid), FBS::Notification::Event::WORKER_RUNNING);
 
 	MS_DEBUG_DEV("starting libuv loop");
@@ -107,9 +101,6 @@ void Worker::Close()
 	}
 	this->mapWebRtcServers.clear();
 
-	// Delete the RTC::Shared singleton.
-	delete this->shared;
-
 	// TODO: Remove once we only use built-in SCTP stack.
 	if (!Settings::configuration.useBuiltInSctpStack)
 	{
@@ -155,7 +146,7 @@ flatbuffers::Offset<FBS::Worker::DumpResponse> Worker::FillBuffer(
 	}
 
 	// Add channelMessageHandlers.
-	auto channelMessageHandlers = this->shared->channelMessageRegistrator->FillBuffer(builder);
+	auto channelMessageHandlers = this->shared->GetChannelMessageRegistrator()->FillBuffer(builder);
 
 #ifdef MS_LIBURING_SUPPORTED
 	if (DepLibUring::IsEnabled())
@@ -437,7 +428,7 @@ void Worker::HandleRequest(Channel::ChannelRequest* request)
 			try
 			{
 				auto* handler =
-				  this->shared->channelMessageRegistrator->GetChannelRequestHandler(request->handlerId);
+				  this->shared->GetChannelMessageRegistrator()->GetChannelRequestHandler(request->handlerId);
 
 				if (handler == nullptr)
 				{
@@ -486,7 +477,7 @@ void Worker::HandleNotification(Channel::ChannelNotification* notification)
 		{
 			try
 			{
-				auto* handler = this->shared->channelMessageRegistrator->GetChannelNotificationHandler(
+				auto* handler = this->shared->GetChannelMessageRegistrator()->GetChannelNotificationHandler(
 				  notification->handlerId);
 
 				if (handler == nullptr)
@@ -513,7 +504,8 @@ void Worker::OnChannelClosed(Channel::ChannelSocket* /*socket*/)
 {
 	MS_TRACE_STD();
 
-	// Only needed for executable, library user can close channel earlier and it is fine.
+	// Only needed for executable, library user can close channel earlier and it
+	// is fine.
 #ifdef MS_EXECUTABLE
 	// If the pipe is remotely closed it may mean that mediasoup Node process
 	// abruptly died (SIGKILL?) so we must die.
@@ -537,11 +529,6 @@ void Worker::OnSignal(SignalHandle* /*signalHandle*/, int signum)
 		case SIGINT:
 		case SIGTERM:
 		{
-			if (this->closed)
-			{
-				return;
-			}
-
 			MS_DEBUG_DEV("%s signal received, closing myself", signum == SIGINT ? "INT" : "TERM");
 
 			Close();
@@ -551,7 +538,7 @@ void Worker::OnSignal(SignalHandle* /*signalHandle*/, int signum)
 
 		default:
 		{
-			MS_WARN_DEV("received a non handled signal [signum:%d]", signum);
+			MS_WARN_DEV("ignoring received non handled signal [signum:%d]", signum);
 		}
 	}
 }

package/worker/src/handles/BackoffTimerHandle.cpp

@@ -8,17 +8,12 @@
 
 /* Instance methods. */
 
-BackoffTimerHandle::BackoffTimerHandle(
-  Listener* listener,
-  uint64_t baseTimeoutMs,
-  BackoffAlgorithm backoffAlgorithm,
-  std::optional<uint64_t> maxBackoffTimeoutMs,
-  std::optional<size_t> maxRestarts)
-  : listener(listener),
-    baseTimeoutMs(baseTimeoutMs),
-    backoffAlgorithm(backoffAlgorithm),
-    maxBackoffTimeoutMs(maxBackoffTimeoutMs),
-    maxRestarts(maxRestarts)
+BackoffTimerHandle::BackoffTimerHandle(const BackoffTimerHandleOptions& options)
+  : listener(options.listener),
+    baseTimeoutMs(options.baseTimeoutMs),
+    backoffAlgorithm(options.backoffAlgorithm),
+    maxBackoffTimeoutMs(options.maxBackoffTimeoutMs),
+    maxRestarts(options.maxRestarts)
 {
 	MS_TRACE();
 
@@ -60,12 +55,12 @@ void BackoffTimerHandle::SetBaseTimeoutMs(uint64_t baseTimeoutMs)
 {
 	MS_TRACE();
 
-	if (baseTimeoutMs > BackoffTimerHandle::MaxTimeoutMs)
+	if (baseTimeoutMs > BackoffTimerHandleInterface::MaxTimeoutMs)
 	{
 		MS_THROW_ERROR(
 		  "base timeout (%" PRIu64 " ms) cannot be greater than %" PRIu64 " ms",
 		  baseTimeoutMs,
-		  BackoffTimerHandle::MaxTimeoutMs);
+		  BackoffTimerHandleInterface::MaxTimeoutMs);
 	}
 
 	this->baseTimeoutMs = baseTimeoutMs;
@@ -88,7 +83,7 @@ uint64_t BackoffTimerHandle::ComputeNextTimeoutMs() const
 		{
 			auto timeoutMs = this->baseTimeoutMs;
 
-			while (expirationCount > 0 && timeoutMs < BackoffTimerHandle::MaxTimeoutMs)
+			while (expirationCount > 0 && timeoutMs < BackoffTimerHandleInterface::MaxTimeoutMs)
 			{
 				timeoutMs *= 2;
 				--expirationCount;
@@ -99,14 +94,14 @@ uint64_t BackoffTimerHandle::ComputeNextTimeoutMs() const
 				}
 			}
 
-			return std::min<uint64_t>(timeoutMs, BackoffTimerHandle::MaxTimeoutMs);
+			return std::min<uint64_t>(timeoutMs, BackoffTimerHandleInterface::MaxTimeoutMs);
 		}
 
 			NO_DEFAULT_GCC();
 	}
 }
 
-void BackoffTimerHandle::OnTimer(TimerHandle* timer)
+void BackoffTimerHandle::OnTimer(TimerHandleInterface* /*timer*/)
 {
 	MS_TRACE();
 

package/worker/src/handles/TimerHandle.cpp

@@ -8,19 +8,20 @@
 
 /* Static methods for UV callbacks. */
 
-inline static void onTimer(uv_timer_t* handle)
+static void onTimer(uv_timer_t* handle)
 {
 	static_cast<TimerHandle*>(handle->data)->OnUvTimer();
 }
 
-inline static void onCloseTimer(uv_handle_t* handle)
+static void onCloseTimer(uv_handle_t* handle)
 {
 	delete reinterpret_cast<uv_timer_t*>(handle);
 }
 
 /* Instance methods. */
 
-TimerHandle::TimerHandle(Listener* listener) : listener(listener), uvHandle(new uv_timer_t)
+TimerHandle::TimerHandle(TimerHandleInterface::Listener* listener)
+  : listener(listener), uvHandle(new uv_timer_t)
 {
 	MS_TRACE();
 
@@ -174,7 +175,7 @@ void TimerHandle::InternalClose()
 	uv_close(reinterpret_cast<uv_handle_t*>(this->uvHandle), static_cast<uv_close_cb>(onCloseTimer));
 }
 
-inline void TimerHandle::OnUvTimer()
+void TimerHandle::OnUvTimer()
 {
 	MS_TRACE();
 

package/worker/src/lib.cpp

@@ -1,6 +1,7 @@
 #define MS_CLASS "mediasoup-worker"
 // #define MS_LOG_DEV_LEVEL 3
 
+#include "lib.hpp"
 #include "common.hpp"
 #include "DepLibSRTP.hpp"
 #ifdef MS_LIBURING_SUPPORTED
@@ -14,8 +15,11 @@
 #include "Logger.hpp"
 #include "MediaSoupErrors.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"
@@ -82,6 +86,11 @@ extern "C" int mediasoup_worker_run(
 	}
 #endif
 
+	// Create a Shared singleton.
+	std::unique_ptr<Shared> shared{ new Shared(
+		/*channelMessageRegistrator*/ new Channel::ChannelMessageRegistrator(),
+		/*channelNotifier*/ new Channel::ChannelNotifier(channel.get())) };
+
 	// Initialize the Logger.
 	Logger::ClassInit(channel.get());
 
@@ -163,8 +172,12 @@ extern "C" int mediasoup_worker_run(
 		// Ignore some signals.
 		ignoreSignals();
 
+		MS_DEBUG_TAG(info, "creating Worker instance");
+
 		// Run the Worker.
-		const Worker worker(channel.get());
+		const Worker worker(channel.get(), shared.get());
+
+		MS_DEBUG_TAG(info, "Worker instance terminated");
 
 		// Free static stuff.
 		DepLibSRTP::ClassDestroy();

package/worker/tasks.py

@@ -496,7 +496,7 @@ def test_asan_undefined(ctx):
         );
 
 
-@task(pre=[call(setup, meson_args=MESON_ARGS + ' -Db_sanitize=address -Db_lundef=false'), flatc])
+@task(pre=[call(setup, meson_args=MESON_ARGS + ' -Dms_build_fuzzer=true -Db_sanitize=address -Db_lundef=false'), flatc])
 def fuzzer(ctx):
     """
     Build the mediasoup-worker-fuzzer binary (which uses libFuzzer)

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

@@ -65,6 +65,7 @@ namespace iceCommon
 		REQUIRE(packet->GetBufferLength() == bufferLength);                                               \
 		REQUIRE(packet->GetLength() != 0);                                                                \
 		REQUIRE(packet->GetLength() == length);                                                           \
+		REQUIRE(packet->GetAvailableLength() == packet->GetBufferLength() - packet->GetLength());         \
 		REQUIRE(packet->GetClass() == klass);                                                             \
 		REQUIRE(packet->GetMethod() == method);                                                           \
 		REQUIRE(packet->HasAttribute(RTC::ICE::StunPacket::AttributeType::USERNAME) == hasUsername);      \

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

@@ -55,6 +55,7 @@ namespace rtpCommon
 		REQUIRE(packet->GetBufferLength() == bufferLength);                                              \
 		REQUIRE(packet->GetLength() != 0);                                                               \
 		REQUIRE(packet->GetLength() == length);                                                          \
+		REQUIRE(packet->GetAvailableLength() == packet->GetBufferLength() - packet->GetLength());        \
 		REQUIRE(static_cast<unsigned>(packet->GetVersion()) == 2);                                       \
 		REQUIRE(static_cast<unsigned>(packet->GetPayloadType()) == payloadType);                         \
 		REQUIRE(packet->HasMarker() == hasMarker);                                                       \

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

@@ -49,6 +49,7 @@ namespace sctpCommon
 		REQUIRE(packet->GetBufferLength() == bufferLength);                                            \
 		REQUIRE(packet->GetLength() != 0);                                                             \
 		REQUIRE(packet->GetLength() == length);                                                        \
+		REQUIRE(packet->GetAvailableLength() == packet->GetBufferLength() - packet->GetLength());      \
 		REQUIRE(Utils::Byte::IsPaddedTo4Bytes(packet->GetLength()) == true);                           \
 		REQUIRE(packet->GetSourcePort() == sourcePort);                                                \
 		REQUIRE(packet->GetDestinationPort() == destinationPort);                                      \
@@ -92,6 +93,7 @@ namespace sctpCommon
 		REQUIRE(chunk->GetBufferLength() == bufferLength);                                             \
 		REQUIRE(chunk->GetLength() != 0);                                                              \
 		REQUIRE(chunk->GetLength() == length);                                                         \
+		REQUIRE(chunk->GetAvailableLength() == chunk->GetBufferLength() - chunk->GetLength());         \
 		REQUIRE(Utils::Byte::IsPaddedTo4Bytes(chunk->GetLength()) == true);                            \
 		REQUIRE(chunk->GetType() == chunkType);                                                        \
 		REQUIRE(chunk->HasUnknownType() == unknownType);                                               \
@@ -152,6 +154,8 @@ namespace sctpCommon
 		REQUIRE(parameter->GetBufferLength() == bufferLength);                                          \
 		REQUIRE(parameter->GetLength() != 0);                                                           \
 		REQUIRE(parameter->GetLength() == length);                                                      \
+		REQUIRE(                                                                                        \
+		  parameter->GetAvailableLength() == parameter->GetBufferLength() - parameter->GetLength());    \
 		REQUIRE(Utils::Byte::IsPaddedTo4Bytes(parameter->GetLength()) == true);                         \
 		REQUIRE(parameter->GetType() == parameterType);                                                 \
 		REQUIRE(parameter->HasUnknownType() == unknownType);                                            \
@@ -189,6 +193,8 @@ namespace sctpCommon
 		REQUIRE(errorCause->GetBufferLength() == bufferLength);                                          \
 		REQUIRE(errorCause->GetLength() != 0);                                                           \
 		REQUIRE(errorCause->GetLength() == length);                                                      \
+		REQUIRE(                                                                                         \
+		  errorCause->GetAvailableLength() == errorCause->GetBufferLength() - errorCause->GetLength());  \
 		REQUIRE(Utils::Byte::IsPaddedTo4Bytes(errorCause->GetLength()) == true);                         \
 		REQUIRE(errorCause->GetCode() == causeCode);                                                     \
 		REQUIRE(errorCause->HasUnknownCode() == unknownCode);                                            \

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

@@ -1,5 +1,6 @@
 #include "common.hpp"
 #include "DepLibUV.hpp"
+#include "mocks/include/MockShared.hpp"
 #include "RTC/RTP/Packet.hpp"
 #include "RTC/RTP/RtpStream.hpp"
 #include "RTC/RTP/RtpStreamRecv.hpp"
@@ -118,8 +119,10 @@ SCENARIO("RtpStreamRecv", "[rtp][rtpstream][rtpstreamrecv]")
 		std::vector<uint16_t> nackedSeqNumbers;
 	};
 
+	mocks::MockShared shared;
+
 	// clang-format off
-	uint8_t buffer[] =
+	alignas(4) uint8_t buffer[] =
 	{
 		0x80, 0x01, 0x00, 0x01,
 		0x00, 0x00, 0x00, 0x04,
@@ -148,7 +151,8 @@ SCENARIO("RtpStreamRecv", "[rtp][rtpstream][rtpstreamrecv]")
 	SECTION("NACK one packet")
 	{
 		RtpStreamRecvListener listener;
-		RTC::RTP::RtpStreamRecv rtpStream(&listener, params, SendNackDelay, UseRtpInactivityCheck);
+		RTC::RTP::RtpStreamRecv rtpStream(
+		  std::addressof(listener), std::addressof(shared), params, SendNackDelay, UseRtpInactivityCheck);
 
 		packet->SetSequenceNumber(1);
 		rtpStream.ReceivePacket(packet.get());
@@ -177,7 +181,8 @@ SCENARIO("RtpStreamRecv", "[rtp][rtpstream][rtpstreamrecv]")
 	SECTION("receive RTX before corresponding RTP")
 	{
 		RtpStreamRecvListener listener;
-		RTC::RTP::RtpStreamRecv rtpStream(&listener, params, SendNackDelay, UseRtpInactivityCheck);
+		RTC::RTP::RtpStreamRecv rtpStream(
+		  std::addressof(listener), std::addressof(shared), params, SendNackDelay, UseRtpInactivityCheck);
 
 		packet->SetSequenceNumber(1);
 		rtpStream.ReceivePacket(packet.get());
@@ -210,7 +215,8 @@ SCENARIO("RtpStreamRecv", "[rtp][rtpstream][rtpstreamrecv]")
 	SECTION("wrapping sequence numbers")
 	{
 		RtpStreamRecvListener listener;
-		RTC::RTP::RtpStreamRecv rtpStream(&listener, params, SendNackDelay, UseRtpInactivityCheck);
+		RTC::RTP::RtpStreamRecv rtpStream(
+		  std::addressof(listener), std::addressof(shared), params, SendNackDelay, UseRtpInactivityCheck);
 
 		packet->SetSequenceNumber(0xfffe);
 		rtpStream.ReceivePacket(packet.get());
@@ -230,7 +236,8 @@ SCENARIO("RtpStreamRecv", "[rtp][rtpstream][rtpstreamrecv]")
 	SECTION("require key frame")
 	{
 		RtpStreamRecvListener listener;
-		RTC::RTP::RtpStreamRecv rtpStream(&listener, params, SendNackDelay, UseRtpInactivityCheck);
+		RTC::RTP::RtpStreamRecv rtpStream(
+		  std::addressof(listener), std::addressof(shared), params, SendNackDelay, UseRtpInactivityCheck);
 
 		packet->SetSequenceNumber(1);
 		rtpStream.ReceivePacket(packet.get());