mediasoup 3.19.21 → 3.20.0

package/worker/src/RTC/DirectTransport.cpp

@@ -11,7 +11,7 @@ namespace RTC
 
 	// NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
 	DirectTransport::DirectTransport(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Transport::Listener* listener,
 	  const FBS::DirectTransport::DirectTransportOptions* options)
@@ -20,7 +20,7 @@ namespace RTC
 		MS_TRACE();
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*channelNotificationHandler*/ this);
@@ -32,9 +32,9 @@ namespace RTC
 
 		// Tell the Transport parent class that we are about to destroy
 		// the class instance.
-		Destroying();
+		SetDestroying();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 	}
 
 	flatbuffers::Offset<FBS::DirectTransport::DumpResponse> DirectTransport::FillBuffer(
@@ -156,13 +156,13 @@ namespace RTC
 			return;
 		}
 
-		const auto data = this->shared->channelNotifier->GetBufferBuilder().CreateVector(
+		const auto data = this->shared->GetChannelNotifier()->GetBufferBuilder().CreateVector(
 		  packet->GetBuffer(), packet->GetLength());
 
-		auto notification =
-		  FBS::Consumer::CreateRtpNotification(this->shared->channelNotifier->GetBufferBuilder(), data);
+		auto notification = FBS::Consumer::CreateRtpNotification(
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), data);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  consumer->id,
 		  FBS::Notification::Event::CONSUMER_RTP,
 		  FBS::Notification::Body::Consumer_RtpNotification,
@@ -183,13 +183,13 @@ namespace RTC
 		MS_TRACE();
 
 		// Notify the Node DirectTransport.
-		const auto data = this->shared->channelNotifier->GetBufferBuilder().CreateVector(
+		const auto data = this->shared->GetChannelNotifier()->GetBufferBuilder().CreateVector(
 		  packet->GetData(), packet->GetSize());
 
 		auto notification = FBS::DirectTransport::CreateRtcpNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), data);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), data);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::DIRECTTRANSPORT_RTCP,
 		  FBS::Notification::Body::DirectTransport_RtcpNotification,
@@ -205,13 +205,13 @@ namespace RTC
 
 		packet->Serialize(RTC::RTCP::SerializationBuffer);
 
-		const auto data = this->shared->channelNotifier->GetBufferBuilder().CreateVector(
+		const auto data = this->shared->GetChannelNotifier()->GetBufferBuilder().CreateVector(
 		  packet->GetData(), packet->GetSize());
 
 		auto notification = FBS::DirectTransport::CreateRtcpNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), data);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), data);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::DIRECTTRANSPORT_RTCP,
 		  FBS::Notification::Body::DirectTransport_RtcpNotification,
@@ -219,17 +219,18 @@ namespace RTC
 	}
 
 	void DirectTransport::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();
 
 		// Notify the Node DirectTransport.
-		auto data = this->shared->channelNotifier->GetBufferBuilder().CreateVector(msg, len);
+		auto data = this->shared->GetChannelNotifier()->GetBufferBuilder().CreateVector(
+		  message.GetPayload().data(), message.GetPayloadLength());
 
 		auto notification = FBS::DataConsumer::CreateMessageNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), ppid, data);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), message.GetPayloadProtocolId(), data);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  dataConsumer->id,
 		  FBS::Notification::Event::DATACONSUMER_MESSAGE,
 		  FBS::Notification::Body::DataConsumer_MessageNotification,
@@ -242,10 +243,10 @@ namespace RTC
 		}
 
 		// Increase send transmission.
-		RTC::Transport::DataSent(len);
+		RTC::Transport::DataSent(message.GetPayloadLength());
 	}
 
-	bool DirectTransport::SendSctpData(const uint8_t* /*data*/, size_t /*len*/)
+	bool DirectTransport::SendData(const uint8_t* /*data*/, size_t /*len*/)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/DtlsTransport.cpp

@@ -709,8 +709,8 @@ namespace RTC
 
 	/* Instance methods. */
 
-	DtlsTransport::DtlsTransport(Listener* listener)
-	  : listener(listener), ssl(SSL_new(DtlsTransport::sslCtx))
+	DtlsTransport::DtlsTransport(Listener* listener, SharedInterface* shared)
+	  : listener(listener), shared(shared), ssl(SSL_new(DtlsTransport::sslCtx))
 	{
 		MS_TRACE();
 
@@ -764,7 +764,7 @@ namespace RTC
 		DTLS_set_timer_cb(this->ssl, onSslDtlsTimer);
 
 		// Set the DTLS timer.
-		this->timer = new TimerHandle(this);
+		this->timer = this->shared->CreateTimer(this);
 
 		return;
 
@@ -1699,7 +1699,7 @@ namespace RTC
 	}
 
 	// NOLINTNEXTLINE(misc-no-recursion)
-	void DtlsTransport::OnTimer(TimerHandle* /*timer*/)
+	void DtlsTransport::OnTimer(TimerHandleInterface* /*timer*/)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/ICE/IceServer.cpp

@@ -12,7 +12,7 @@ namespace RTC
 		/* Static. */
 
 		static constexpr size_t StunResponseFactoryBufferLength{ 65536 };
-		thread_local uint8_t StunResponseFactoryBuffer[StunResponseFactoryBufferLength];
+		static thread_local uint8_t StunResponseFactoryBuffer[StunResponseFactoryBufferLength];
 		static constexpr size_t MaxTuples{ 8 };
 		static constexpr uint8_t ConsentCheckMinTimeoutSec{ 10u };
 		static constexpr uint8_t ConsentCheckMaxTimeoutSec{ 60u };
@@ -72,10 +72,11 @@ namespace RTC
 
 		IceServer::IceServer(
 		  Listener* listener,
+		  SharedInterface* shared,
 		  const std::string& usernameFragment,
 		  const std::string& password,
 		  uint8_t consentTimeoutSec)
-		  : listener(listener), usernameFragment(usernameFragment), password(password)
+		  : listener(listener), shared(shared), usernameFragment(usernameFragment), password(password)
 		{
 			MS_TRACE();
 
@@ -559,7 +560,7 @@ namespace RTC
 			}
 			else
 			{
-				thread_local std::string_view errorReasonPhrase;
+				static thread_local std::string_view errorReasonPhrase;
 
 				response->GetErrorCode(errorReasonPhrase);
 
@@ -935,7 +936,7 @@ namespace RTC
 			// Create the ICE consent check timer if it doesn't exist.
 			if (!this->consentCheckTimer)
 			{
-				this->consentCheckTimer = new TimerHandle(this);
+				this->consentCheckTimer = this->shared->CreateTimer(this);
 			}
 
 			this->consentCheckTimer->Start(this->consentTimeoutMs);
@@ -962,7 +963,7 @@ namespace RTC
 			this->consentCheckTimer->Stop();
 		}
 
-		inline void IceServer::OnTimer(TimerHandle* timer)
+		inline void IceServer::OnTimer(TimerHandleInterface* timer)
 		{
 			MS_TRACE();
 

package/worker/src/RTC/ICE/StunPacket.cpp

@@ -15,7 +15,7 @@ namespace RTC
 		/* Static. */
 
 		static constexpr size_t AttributeFactoryBufferLength{ 65536 };
-		thread_local uint8_t AttributeFactoryBuffer[AttributeFactoryBufferLength];
+		static thread_local uint8_t AttributeFactoryBuffer[AttributeFactoryBufferLength];
 
 		/* Class variables. */
 

package/worker/src/RTC/KeyFrameRequestManager.cpp

@@ -8,8 +8,9 @@ static constexpr uint32_t KeyFrameRetransmissionWaitTime{ 1000u };
 
 /* PendingKeyFrameInfo methods. */
 
-RTC::PendingKeyFrameInfo::PendingKeyFrameInfo(PendingKeyFrameInfo::Listener* listener, uint32_t ssrc)
-  : listener(listener), ssrc(ssrc), timer(new TimerHandle(this))
+RTC::PendingKeyFrameInfo::PendingKeyFrameInfo(
+  PendingKeyFrameInfo::Listener* listener, SharedInterface* shared, uint32_t ssrc)
+  : listener(listener), ssrc(ssrc), timer(shared->CreateTimer(this))
 {
 	MS_TRACE();
 
@@ -24,7 +25,7 @@ RTC::PendingKeyFrameInfo::~PendingKeyFrameInfo()
 	delete this->timer;
 }
 
-inline void RTC::PendingKeyFrameInfo::OnTimer(TimerHandle* timer)
+void RTC::PendingKeyFrameInfo::OnTimer(TimerHandleInterface* timer)
 {
 	MS_TRACE();
 
@@ -37,8 +38,8 @@ inline void RTC::PendingKeyFrameInfo::OnTimer(TimerHandle* timer)
 /* KeyFrameRequestDelayer methods. */
 
 RTC::KeyFrameRequestDelayer::KeyFrameRequestDelayer(
-  KeyFrameRequestDelayer::Listener* listener, uint32_t ssrc, uint32_t delay)
-  : listener(listener), ssrc(ssrc), timer(new TimerHandle(this))
+  KeyFrameRequestDelayer::Listener* listener, SharedInterface* shared, uint32_t ssrc, uint32_t delay)
+  : listener(listener), ssrc(ssrc), timer(shared->CreateTimer(this))
 {
 	MS_TRACE();
 
@@ -53,7 +54,7 @@ RTC::KeyFrameRequestDelayer::~KeyFrameRequestDelayer()
 	delete this->timer;
 }
 
-inline void RTC::KeyFrameRequestDelayer::OnTimer(TimerHandle* timer)
+void RTC::KeyFrameRequestDelayer::OnTimer(TimerHandleInterface* timer)
 {
 	MS_TRACE();
 
@@ -66,8 +67,8 @@ inline void RTC::KeyFrameRequestDelayer::OnTimer(TimerHandle* timer)
 /* KeyFrameRequestManager methods. */
 
 RTC::KeyFrameRequestManager::KeyFrameRequestManager(
-  KeyFrameRequestManager::Listener* listener, uint32_t keyFrameRequestDelay)
-  : listener(listener), keyFrameRequestDelay(keyFrameRequestDelay)
+  KeyFrameRequestManager::Listener* listener, SharedInterface* shared, uint32_t keyFrameRequestDelay)
+  : listener(listener), shared(shared), keyFrameRequestDelay(keyFrameRequestDelay)
 {
 	MS_TRACE();
 }
@@ -118,7 +119,7 @@ void RTC::KeyFrameRequestManager::KeyFrameNeeded(uint32_t ssrc)
 			MS_DEBUG_DEV("creating a delayer for the given ssrc");
 
 			this->mapSsrcKeyFrameRequestDelayer[ssrc] =
-			  new KeyFrameRequestDelayer(this, ssrc, this->keyFrameRequestDelay);
+			  new KeyFrameRequestDelayer(this, this->shared, ssrc, this->keyFrameRequestDelay);
 		}
 	}
 
@@ -135,7 +136,7 @@ void RTC::KeyFrameRequestManager::KeyFrameNeeded(uint32_t ssrc)
 		return;
 	}
 
-	this->mapSsrcPendingKeyFrameInfo[ssrc] = new PendingKeyFrameInfo(this, ssrc);
+	this->mapSsrcPendingKeyFrameInfo[ssrc] = new PendingKeyFrameInfo(this, this->shared, ssrc);
 
 	this->listener->OnKeyFrameNeeded(this, ssrc);
 }
@@ -158,7 +159,7 @@ void RTC::KeyFrameRequestManager::ForceKeyFrameNeeded(uint32_t ssrc)
 		}
 
 		this->mapSsrcKeyFrameRequestDelayer[ssrc] =
-		  new KeyFrameRequestDelayer(this, ssrc, this->keyFrameRequestDelay);
+		  new KeyFrameRequestDelayer(this, this->shared, ssrc, this->keyFrameRequestDelay);
 	}
 
 	auto it = this->mapSsrcPendingKeyFrameInfo.find(ssrc);
@@ -173,7 +174,7 @@ void RTC::KeyFrameRequestManager::ForceKeyFrameNeeded(uint32_t ssrc)
 	}
 	else
 	{
-		this->mapSsrcPendingKeyFrameInfo[ssrc] = new PendingKeyFrameInfo(this, ssrc);
+		this->mapSsrcPendingKeyFrameInfo[ssrc] = new PendingKeyFrameInfo(this, this->shared, ssrc);
 	}
 
 	this->listener->OnKeyFrameNeeded(this, ssrc);
@@ -198,7 +199,7 @@ void RTC::KeyFrameRequestManager::KeyFrameReceived(uint32_t ssrc)
 	this->mapSsrcPendingKeyFrameInfo.erase(it);
 }
 
-inline void RTC::KeyFrameRequestManager::OnKeyFrameRequestTimeout(PendingKeyFrameInfo* pendingKeyFrameInfo)
+void RTC::KeyFrameRequestManager::OnKeyFrameRequestTimeout(PendingKeyFrameInfo* pendingKeyFrameInfo)
 {
 	MS_TRACE();
 
@@ -225,8 +226,7 @@ inline void RTC::KeyFrameRequestManager::OnKeyFrameRequestTimeout(PendingKeyFram
 	this->listener->OnKeyFrameNeeded(this, pendingKeyFrameInfo->GetSsrc());
 }
 
-inline void RTC::KeyFrameRequestManager::OnKeyFrameDelayTimeout(
-  KeyFrameRequestDelayer* keyFrameRequestDelayer)
+void RTC::KeyFrameRequestManager::OnKeyFrameDelayTimeout(KeyFrameRequestDelayer* keyFrameRequestDelayer)
 {
 	MS_TRACE();
 

package/worker/src/RTC/NackGenerator.cpp

@@ -2,7 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/NackGenerator.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 
 namespace RTC
@@ -17,10 +16,11 @@ namespace RTC
 
 	/* Instance methods. */
 
-	NackGenerator::NackGenerator(Listener* listener, unsigned int sendNackDelayMs)
+	NackGenerator::NackGenerator(Listener* listener, SharedInterface* shared, unsigned int sendNackDelayMs)
 	  : listener(listener),
+	    shared(shared),
 	    sendNackDelayMs(sendNackDelayMs),
-	    timer(new TimerHandle(this)),
+	    timer(shared->CreateTimer(this)),
 	    rtt(DefaultRtt)
 	{
 		MS_TRACE();
@@ -211,7 +211,7 @@ namespace RTC
 			this->nackList.emplace(
 			  seq,
 			  NackInfo{
-			    DepLibUV::GetTimeMs(),
+			    this->shared->GetTimeMs(),
 			    seq,
 			    seq,
 			  });
@@ -247,7 +247,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		const uint64_t nowMs = DepLibUV::GetTimeMs();
+		const uint64_t nowMs = this->shared->GetTimeMs();
 		std::vector<uint16_t> nackBatch;
 
 		auto it = this->nackList.begin();
@@ -365,7 +365,7 @@ namespace RTC
 		}
 	}
 
-	inline void NackGenerator::OnTimer(TimerHandle* /*timer*/)
+	inline void NackGenerator::OnTimer(TimerHandleInterface* /*timer*/)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/PipeConsumer.cpp

@@ -4,8 +4,8 @@
 #include "RTC/PipeConsumer.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
-#include "Utils.hpp"
 #include "RTC/RTP/Codecs/Tools.hpp"
+#include "Utils.hpp"
 #ifdef MS_RTC_LOGGER_RTP
 #include "RTC/RtcLogger.hpp"
 #endif
@@ -58,7 +58,7 @@ namespace RTC
 	/* Instance methods. */
 
 	PipeConsumer::PipeConsumer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  const std::string& producerId,
 	  RTC::Consumer::Listener* listener,
@@ -82,7 +82,7 @@ namespace RTC
 		CreateRtpStreams();
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*channelNotificationHandler*/ nullptr);
@@ -92,7 +92,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		for (auto* rtpStream : this->rtpStreams)
 		{
@@ -803,7 +803,8 @@ namespace RTC
 				}
 			}
 
-			auto* rtpStream = new RTC::RTP::RtpStreamSend(this, params, this->rtpParameters.mid);
+			auto* rtpStream =
+			  new RTC::RTP::RtpStreamSend(this, this->shared, params, this->rtpParameters.mid);
 
 			// If the Consumer is paused, tell the RtpStreamSend.
 			if (IsPaused() || IsProducerPaused())

package/worker/src/RTC/PipeTransport.cpp

@@ -4,9 +4,9 @@
 #include "RTC/PipeTransport.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
+#include "RTC/SCTP/packet/Packet.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
-#include "RTC/SCTP/packet/Packet.hpp"
 #include <cstring> // std::memcpy()
 
 namespace RTC
@@ -24,7 +24,7 @@ namespace RTC
 
 	// NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
 	PipeTransport::PipeTransport(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Transport::Listener* listener,
 	  const FBS::PipeTransport::PipeTransportOptions* options)
@@ -122,7 +122,7 @@ namespace RTC
 			  udpSocket->GetRecvBufferSize());
 
 			// NOTE: This may throw.
-			this->shared->channelMessageRegistrator->RegisterHandler(
+			this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 			  this->id,
 			  /*channelRequestHandler*/ this,
 			  /*channelNotificationHandler*/ this);
@@ -144,9 +144,9 @@ namespace RTC
 
 		// Tell the Transport parent class that we are about to destroy
 		// the class instance.
-		Destroying();
+		SetDestroying();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		delete this->udpSocket;
 		this->udpSocket = nullptr;
@@ -579,22 +579,14 @@ namespace RTC
 	}
 
 	void PipeTransport::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 PipeTransport::SendSctpData(const uint8_t* data, size_t len)
+	bool PipeTransport::SendData(const uint8_t* data, size_t len)
 	{
 		MS_TRACE();
 
@@ -650,12 +642,7 @@ namespace RTC
 			OnRtpDataReceived(tuple, data, len, bufferLen);
 		}
 		// Check if it's SCTP.
-		else if (Settings::configuration.useBuiltInSctpStack && RTC::SCTP::Packet::IsSctp(data, len))
-		{
-			OnSctpDataReceived(tuple, data, len);
-		}
-		// TODO: Remove once we only use built-in SCTP stack.
-		else if (!Settings::configuration.useBuiltInSctpStack && RTC::SctpAssociation::IsSctp(data, len))
+		else if (RTC::SCTP::Packet::IsSctp(data, len))
 		{
 			OnSctpDataReceived(tuple, data, len);
 		}

package/worker/src/RTC/PlainTransport.cpp

@@ -4,9 +4,9 @@
 #include "RTC/PlainTransport.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
+#include "RTC/SCTP/packet/Packet.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
-#include "RTC/SCTP/packet/Packet.hpp"
 #include <cstring> // std::memcpy()
 
 namespace RTC
@@ -32,7 +32,7 @@ namespace RTC
 	/* Instance methods. */
 
 	PlainTransport::PlainTransport(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Transport::Listener* listener,
 	  const FBS::PlainTransport::PlainTransportOptions* options)
@@ -243,7 +243,7 @@ namespace RTC
 			}
 
 			// NOTE: This may throw.
-			this->shared->channelMessageRegistrator->RegisterHandler(
+			this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 			  this->id,
 			  /*channelRequestHandler*/ this,
 			  /*channelNotificationHandler*/ this);
@@ -266,9 +266,9 @@ namespace RTC
 
 		// Tell the Transport parent class that we are about to destroy
 		// the class instance.
-		Destroying();
+		SetDestroying();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		delete this->udpSocket;
 		this->udpSocket = nullptr;
@@ -899,22 +899,14 @@ namespace RTC
 	}
 
 	void PlainTransport::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 PlainTransport::SendSctpData(const uint8_t* data, size_t len)
+	bool PlainTransport::SendData(const uint8_t* data, size_t len)
 	{
 		MS_TRACE();
 
@@ -972,12 +964,7 @@ namespace RTC
 			OnRtpDataReceived(tuple, data, len, bufferLen);
 		}
 		// Check if it's SCTP.
-		else if (Settings::configuration.useBuiltInSctpStack && RTC::SCTP::Packet::IsSctp(data, len))
-		{
-			OnSctpDataReceived(tuple, data, len);
-		}
-		// TODO: Remove once we only use built-in SCTP stack.
-		else if (!Settings::configuration.useBuiltInSctpStack && RTC::SctpAssociation::IsSctp(data, len))
+		else if (RTC::SCTP::Packet::IsSctp(data, len))
 		{
 			OnSctpDataReceived(tuple, data, len);
 		}
@@ -1231,11 +1218,11 @@ namespace RTC
 
 	inline void PlainTransport::EmitTuple() const
 	{
-		auto tuple        = this->tuple->FillBuffer(this->shared->channelNotifier->GetBufferBuilder());
+		auto tuple = this->tuple->FillBuffer(this->shared->GetChannelNotifier()->GetBufferBuilder());
 		auto notification = FBS::PlainTransport::CreateTupleNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), tuple);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), tuple);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::PLAINTRANSPORT_TUPLE,
 		  FBS::Notification::Body::PlainTransport_TupleNotification,
@@ -1244,11 +1231,12 @@ namespace RTC
 
 	inline void PlainTransport::EmitRtcpTuple() const
 	{
-		auto rtcpTuple = this->rtcpTuple->FillBuffer(this->shared->channelNotifier->GetBufferBuilder());
+		auto rtcpTuple =
+		  this->rtcpTuple->FillBuffer(this->shared->GetChannelNotifier()->GetBufferBuilder());
 		auto notification = FBS::PlainTransport::CreateRtcpTupleNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), rtcpTuple);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), rtcpTuple);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::PLAINTRANSPORT_RTCP_TUPLE,
 		  FBS::Notification::Body::PlainTransport_RtcpTupleNotification,