mediasoup 3.20.0 → 3.20.2

package/worker/src/RTC/SCTP/packet/parameters/CookiePreservativeParameter.cpp

@@ -27,7 +27,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::COOKIE_PRESERVATIVE)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -67,7 +67,7 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "CookiePreservativeParameter Length field must be %zu",
+				  "CookiePreservativeParameter length field must be %zu",
 				  CookiePreservativeParameter::CookiePreservativeParameterHeaderLength);
 
 				return nullptr;

package/worker/src/RTC/SCTP/packet/parameters/ForwardTsnSupportedParameter.cpp

@@ -27,7 +27,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::FORWARD_TSN_SUPPORTED)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -64,7 +64,7 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "ForwardTsnSupportedParameter Length field must be %zu",
+				  "ForwardTsnSupportedParameter length field must be %zu",
 				  Parameter::ParameterHeaderLength);
 
 				return nullptr;

package/worker/src/RTC/SCTP/packet/parameters/HeartbeatInfoParameter.cpp

@@ -26,7 +26,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::HEARTBEAT_INFO)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}

package/worker/src/RTC/SCTP/packet/parameters/IPv4AddressParameter.cpp

@@ -28,7 +28,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::IPV4_ADDRESS)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -68,7 +68,7 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "IPv4AddressParameter Length field must be %zu",
+				  "IPv4AddressParameter length field must be %zu",
 				  IPv4AddressParameter::IPv4AddressParameterHeaderLength);
 
 				return nullptr;

package/worker/src/RTC/SCTP/packet/parameters/IPv6AddressParameter.cpp

@@ -28,7 +28,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::IPV6_ADDRESS)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -68,7 +68,7 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "IPv6AddressParameter Length field must be %zu",
+				  "IPv6AddressParameter length field must be %zu",
 				  IPv6AddressParameter::IPv6AddressParameterHeaderLength);
 
 				return nullptr;

package/worker/src/RTC/SCTP/packet/parameters/IncomingSsnResetRequestParameter.cpp

@@ -27,7 +27,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::INCOMING_SSN_RESET_REQUEST)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -69,7 +69,7 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "IncomingSsnResetRequestParameter Length field must be equal or greater than %zu",
+				  "IncomingSsnResetRequestParameter length field must be equal or greater than %zu",
 				  IncomingSsnResetRequestParameter::IncomingSsnResetRequestParameterHeaderLength);
 
 				return nullptr;

package/worker/src/RTC/SCTP/packet/parameters/OutgoingSsnResetRequestParameter.cpp

@@ -27,7 +27,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::OUTGOING_SSN_RESET_REQUEST)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -71,7 +71,7 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "OutgoingSsnResetRequestParameter Length field must be equal or greater than %zu",
+				  "OutgoingSsnResetRequestParameter length field must be equal or greater than %zu",
 				  OutgoingSsnResetRequestParameter::OutgoingSsnResetRequestParameterHeaderLength);
 
 				return nullptr;

package/worker/src/RTC/SCTP/packet/parameters/ReconfigurationResponseParameter.cpp

@@ -12,7 +12,7 @@ namespace RTC
 		/* Class variables. */
 
 		// clang-format off
-		const std::unordered_map<ReconfigurationResponseParameter::Result, std::string> ReconfigurationResponseParameter::Result2String =
+		const ankerl::unordered_dense::map<ReconfigurationResponseParameter::Result, std::string> ReconfigurationResponseParameter::Result2String =
 		{
 			{ ReconfigurationResponseParameter::Result::SUCCESS_NOTHING_TO_DO,             "SUCCESS_NOTHING_TO_DO"             },
 			{ ReconfigurationResponseParameter::Result::SUCCESS_PERFORMED,                 "SUCCESS_PERFORMED"                 },
@@ -42,7 +42,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::RECONFIGURATION_RESPONSE)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -106,7 +106,7 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "ReconfigurationResponseParameter Length field must be %zu or %zu",
+				  "ReconfigurationResponseParameter length field must be %zu or %zu",
 				  ReconfigurationResponseParameter::ReconfigurationResponseParameterHeaderLength,
 				  ReconfigurationResponseParameter::ReconfigurationResponseParameterHeaderLengthWithOptionalFields);
 

package/worker/src/RTC/SCTP/packet/parameters/SsnTsnResetRequestParameter.cpp

@@ -27,7 +27,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::SSN_TSN_RESET_REQUEST)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -67,7 +67,7 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "SsnTsnResetRequestParameter Length field must be %zu",
+				  "SsnTsnResetRequestParameter length field must be %zu",
 				  SsnTsnResetRequestParameter::SsnTsnResetRequestParameterHeaderLength);
 
 				return nullptr;

package/worker/src/RTC/SCTP/packet/parameters/StateCookieParameter.cpp

@@ -27,7 +27,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::STATE_COOKIE)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -127,11 +127,11 @@ namespace RTC
 			MS_TRACE();
 
 			// The buffer in which the StateCookie will be written starts at the
-			// position of the Cookie field in the StateCookieParameter.
+			// position of the cookie field in the StateCookieParameter.
 			auto* buffer = GetVariableLengthValuePointer();
 			// The available buffer length is the total buffer length of the
 			// StateCookieParameter minus its fixed header length (no matter there
-			// was a Cookie already in the Parameter since we are overriding it
+			// was a cookie already in the parameter since we are overriding it
 			// anyway).
 			const size_t bufferLength = GetBufferLength() - Parameter::ParameterHeaderLength;
 

package/worker/src/RTC/SCTP/packet/parameters/SupportedAddressTypesParameter.cpp

@@ -27,7 +27,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::SUPPORTED_ADDRESS_TYPES)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -64,10 +64,10 @@ namespace RTC
 			auto* parameter =
 			  new SupportedAddressTypesParameter(const_cast<uint8_t*>(buffer), bufferLength);
 
-			// Here we must validate that Length field is even.
+			// Here we must validate that length field is even.
 			if (parameter->GetLengthField() % 2 != 0)
 			{
-				MS_WARN_TAG(sctp, "wrong Length value (not even)");
+				MS_WARN_TAG(sctp, "wrong length value (not even)");
 
 				delete parameter;
 				return nullptr;

package/worker/src/RTC/SCTP/packet/parameters/SupportedExtensionsParameter.cpp

@@ -27,7 +27,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::SUPPORTED_EXTENSIONS)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}

package/worker/src/RTC/SCTP/packet/parameters/UnrecognizedParameterParameter.cpp

@@ -27,7 +27,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::UNRECOGNIZED_PARAMETER)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}

package/worker/src/RTC/SCTP/packet/parameters/ZeroChecksumAcceptableParameter.cpp

@@ -12,7 +12,7 @@ namespace RTC
 		/* Class variables. */
 
 		// clang-format off
-		const std::unordered_map<ZeroChecksumAcceptableParameter::AlternateErrorDetectionMethod, std::string> ZeroChecksumAcceptableParameter::AlternateErrorDetectionMethod2String =
+		const ankerl::unordered_dense::map<ZeroChecksumAcceptableParameter::AlternateErrorDetectionMethod, std::string> ZeroChecksumAcceptableParameter::AlternateErrorDetectionMethod2String =
 		{
 			{ ZeroChecksumAcceptableParameter::AlternateErrorDetectionMethod::NONE,           "NONE"           },
 			{ ZeroChecksumAcceptableParameter::AlternateErrorDetectionMethod::SCTP_OVER_DTLS, "SCTP_OVER_DTLS" },
@@ -37,7 +37,7 @@ namespace RTC
 
 			if (parameterType != Parameter::ParameterType::ZERO_CHECKSUM_ACCEPTABLE)
 			{
-				MS_WARN_DEV("invalid Parameter type");
+				MS_WARN_DEV("invalid parameter type");
 
 				return nullptr;
 			}
@@ -79,7 +79,7 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "ZeroChecksumAcceptableParameter Length field must be %zu",
+				  "ZeroChecksumAcceptableParameter length field must be %zu",
 				  ZeroChecksumAcceptableParameter::ZeroChecksumAcceptableParameterHeaderLength);
 
 				return nullptr;

package/worker/src/RTC/SCTP/rx/InterleavedReassemblyStreams.cpp

@@ -3,6 +3,7 @@
 
 #include "RTC/SCTP/rx/InterleavedReassemblyStreams.hpp"
 #include "Logger.hpp"
+#include <numeric> // std::accumulate()
 
 namespace RTC
 {

package/worker/src/RTC/SCTP/rx/TraditionalReassemblyStreams.cpp

@@ -3,6 +3,7 @@
 
 #include "RTC/SCTP/rx/TraditionalReassemblyStreams.hpp"
 #include "Logger.hpp"
+#include <numeric> // std::accumulate()
 
 namespace RTC
 {

package/worker/src/RTC/SCTP/tx/OutstandingData.cpp

@@ -125,7 +125,7 @@ namespace RTC
 			// ACK packets reported in the gap ack blocks.
 			AckGapBlocks(cumulativeTsnAck, gapAckBlocks, ackInfo);
 
-			// NACK and possibly mark for retransmit Chunks that weren't acked.
+			// NACK and possibly mark for retransmit chunks that weren't acked.
 			NackBetweenAckBlocks(
 			  cumulativeTsnAck, gapAckBlocks, isInFastRecovery, cumulativeTsnAckAdvanced, ackInfo);
 
@@ -185,7 +185,7 @@ namespace RTC
 				tsn.Increment();
 
 				// Chunks that are nacked can be expired. Care should be taken not to
-				// expire unacked (in-flight) Chunks as they might have been received,
+				// expire unacked (in-flight) chunks as they might have been received,
 				// but the SACK is either delayed or in-flight and may be received
 				// later.
 				if (item.IsAbandoned())
@@ -198,7 +198,7 @@ namespace RTC
 				}
 				else
 				{
-					// A non-expired Chunk. No need to iterate any further.
+					// A non-expired chunk. No need to iterate any further.
 					break;
 				}
 			}
@@ -212,7 +212,7 @@ namespace RTC
 
 				MS_WARN_TAG(
 				  sctp,
-				  "marking nacked Chunk %" PRIu32 " and message %" PRIu32 " as expired",
+				  "marking nacked chunk %" PRIu32 " and message %" PRIu32 " as expired",
 				  tsnToExpire.Wrap(),
 				  item.GetData().GetMessageId());
 
@@ -239,7 +239,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			// All Chunks are always padded to be even divisible by 4.
+			// All chunks are always padded to be even divisible by 4.
 			const size_t chunkLength = GetSerializedChunkLength(data);
 
 			this->unackedPayloadBytes += data.GetPayloadLength();
@@ -255,7 +255,7 @@ namespace RTC
 				// No need to send it, it was expired when it was in the send queue.
 				MS_WARN_TAG(
 				  sctp,
-				  "marking freshly produced Chunk %" PRIu32 " and message %" PRIu32 " as expired",
+				  "marking freshly produced chunk %" PRIu32 " and message %" PRIu32 " as expired",
 				  tsn.Wrap(),
 				  item.GetData().GetMessageId());
 
@@ -777,7 +777,7 @@ namespace RTC
 				  /*expiresAtMs*/ Types::ExpiresAtMsInfinite,
 				  /*lifecycleId*/ std::nullopt);
 
-				// The added Chunk shouldn't be included in `this->unackedPacketBytes`,
+				// The added chunk shouldn't be included in `this->unackedPacketBytes`,
 				// so set it as acked.
 				addedItem.Ack();
 
@@ -794,7 +794,7 @@ namespace RTC
 				  !other.IsAbandoned() && other.GetData().GetStreamId() == item.GetData().GetStreamId() &&
 				  other.GetOutgoingMessageId() == item.GetOutgoingMessageId())
 				{
-					MS_WARN_TAG(sctp, "marking Chunk %" PRIu32 " as abandoned", tsn.Wrap());
+					MS_WARN_TAG(sctp, "marking chunk %" PRIu32 " as abandoned", tsn.Wrap());
 
 					if (other.ShouldBeRetransmitted())
 					{

package/worker/src/RTC/SCTP/tx/RoundRobinSendQueue.cpp

@@ -423,7 +423,7 @@ namespace RTC
 				Item& item       = this->items.front();
 				Message& message = item.message;
 
-				// Allocate Message ID and SSN when the first fragment is sent.
+				// Allocate message ID and SSN when the first fragment is sent.
 				if (!item.mid.has_value())
 				{
 					// This entire message has already expired. Try the next one.

package/worker/src/RTC/SvcConsumer.cpp

@@ -48,15 +48,19 @@ namespace RTC
 		// Set preferredLayers (if given).
 		if (flatbuffers::IsFieldPresent(data, FBS::Transport::ConsumeRequest::VT_PREFERREDLAYERS))
 		{
-			this->preferredLayers.spatial = data->preferredLayers()->spatialLayer();
+			const auto* preferredLayers = data->preferredLayers();
+
+			this->preferredLayers.spatial = preferredLayers->spatialLayer();
 
 			if (this->preferredLayers.spatial > encoding.spatialLayers - 1)
 			{
 				this->preferredLayers.spatial = static_cast<int16_t>(encoding.spatialLayers - 1);
 			}
 
-			if (flatbuffers::IsFieldPresent(data->preferredLayers(), FBS::Consumer::ConsumerLayers::VT_TEMPORALLAYER))
+			if (auto preferredTemporalLayer = preferredLayers->temporalLayer(); preferredTemporalLayer.has_value())
 			{
+				this->preferredLayers.temporal = preferredTemporalLayer.value();
+
 				if (this->preferredLayers.temporal > encoding.temporalLayers - 1)
 				{
 					this->preferredLayers.temporal = static_cast<int16_t>(encoding.temporalLayers - 1);

package/worker/src/RTC/TcpServer.cpp

@@ -36,16 +36,16 @@ namespace RTC
 	  uint16_t minPort,
 	  uint16_t maxPort,
 	  RTC::Transport::SocketFlags& flags,
-	  uint64_t& portRangeHash)
+	  RTC::PortManager::PortRangeKey& portRangeKey)
 	  : // This may throw.
 	    ::TcpServerHandle::TcpServerHandle(
-	      RTC::PortManager::BindTcp(ip, minPort, maxPort, flags, portRangeHash)),
+	      RTC::PortManager::BindTcp(ip, minPort, maxPort, flags, portRangeKey)),
 	    listener(listener),
 	    connListener(connListener)
 	{
 		MS_TRACE();
 
-		this->portRangeHash = portRangeHash;
+		this->portRangeKey = portRangeKey;
 	}
 
 	TcpServer::~TcpServer()
@@ -54,7 +54,7 @@ namespace RTC
 
 		if (!this->fixedPort)
 		{
-			RTC::PortManager::Unbind(this->portRangeHash, this->localPort);
+			RTC::PortManager::Unbind(this->portRangeKey, this->localPort);
 		}
 	}
 

package/worker/src/RTC/Transport.cpp

@@ -145,7 +145,7 @@ namespace RTC
 
 		// NOTE: We don't close `this->sctpAssociation` here since the
 		// `SetDestroying()` method has already been called by the Transport
-		// subclass and it closed the SCTP Association.
+		// subclass and it closed the SCTP association.
 		//
 		// NOTE: We cannot do it here in the destructor because here we are no longer
 		// the Transport subclass but Transport parent (this is how the destruction
@@ -1483,7 +1483,7 @@ namespace RTC
 
 		if (this->sctpAssociation)
 		{
-			// NOTE: We don't invoke `Shutdown()` but `Close()` in the SCTP Association
+			// NOTE: We don't invoke `Shutdown()` but `Close()` in the SCTP association
 			// because at this point we are closing everything and we won't have any
 			// chance to complete the SCTP SHUTDOWN + SHUTDOWN_ACK + SHUTDOWN_COMPLETE
 			// dance, so we invoke `Close()` which just sends a SCTP ABORT.
@@ -1999,7 +1999,7 @@ namespace RTC
 						{
 							MS_DEBUG_TAG(
 							  rtcp,
-							  "no Consumer found for received PLI Feedback packet "
+							  "no Consumer found for received PLI feedback packet "
 							  "[sender ssrc:%" PRIu32 ", media ssrc:%" PRIu32 "]",
 							  feedback->GetSenderSsrc(),
 							  feedback->GetMediaSsrc());
@@ -2038,7 +2038,7 @@ namespace RTC
 							{
 								MS_DEBUG_TAG(
 								  rtcp,
-								  "no Consumer found for received FIR Feedback packet "
+								  "no Consumer found for received FIR feedback packet "
 								  "[sender ssrc:%" PRIu32 ", media ssrc:%" PRIu32 ", item ssrc:%" PRIu32 "]",
 								  feedback->GetSenderSsrc(),
 								  feedback->GetMediaSsrc(),
@@ -2082,7 +2082,7 @@ namespace RTC
 						{
 							MS_DEBUG_TAG(
 							  rtcp,
-							  "ignoring unsupported %s Feedback PS AFB packet "
+							  "ignoring unsupported %s feedback PS AFB packet "
 							  "[sender ssrc:%" PRIu32 ", media ssrc:%" PRIu32 "]",
 							  RTC::RTCP::FeedbackPsPacket::MessageTypeToString(feedback->GetMessageType()).c_str(),
 							  feedback->GetSenderSsrc(),
@@ -2096,7 +2096,7 @@ namespace RTC
 					{
 						MS_DEBUG_TAG(
 						  rtcp,
-						  "ignoring unsupported %s Feedback packet "
+						  "ignoring unsupported %s feedback packet "
 						  "[sender ssrc:%" PRIu32 ", media ssrc:%" PRIu32 "]",
 						  RTC::RTCP::FeedbackPsPacket::MessageTypeToString(feedback->GetMessageType()).c_str(),
 						  feedback->GetSenderSsrc(),
@@ -2121,7 +2121,7 @@ namespace RTC
 				{
 					MS_DEBUG_TAG(
 					  rtcp,
-					  "no Consumer found for received Feedback packet "
+					  "no Consumer found for received feedback packet "
 					  "[sender ssrc:%" PRIu32 ", media ssrc:%" PRIu32 "]",
 					  feedback->GetSenderSsrc(),
 					  feedback->GetMediaSsrc());
@@ -2137,7 +2137,7 @@ namespace RTC
 						{
 							MS_DEBUG_TAG(
 							  rtcp,
-							  "no Consumer found for received NACK Feedback packet "
+							  "no Consumer found for received NACK feedback packet "
 							  "[sender ssrc:%" PRIu32 ", media ssrc:%" PRIu32 "]",
 							  feedback->GetSenderSsrc(),
 							  feedback->GetMediaSsrc());
@@ -2176,7 +2176,7 @@ namespace RTC
 					{
 						MS_DEBUG_TAG(
 						  rtcp,
-						  "ignoring unsupported %s Feedback packet "
+						  "ignoring unsupported %s feedback packet "
 						  "[sender ssrc:%" PRIu32 ", media ssrc:%" PRIu32 "]",
 						  RTC::RTCP::FeedbackRtpPacket::MessageTypeToString(feedback->GetMessageType()).c_str(),
 						  feedback->GetSenderSsrc(),
@@ -3058,13 +3058,26 @@ namespace RTC
 
 		const auto errorKindStringView = RTC::SCTP::Types::ErrorKindToString(errorKind);
 
-		MS_WARN_TAG(
-		  sctp,
-		  "SCTP association failed [errorKind:%.*s, message:%.*s]",
-		  static_cast<int>(errorKindStringView.size()),
-		  errorKindStringView.data(),
-		  static_cast<int>(errorMessage.size()),
-		  errorMessage.data());
+		if (errorKind == RTC::SCTP::Types::ErrorKind::SUCCESS || errorKind == RTC::SCTP::Types::ErrorKind::PEER_REPORTED)
+		{
+			MS_DEBUG_TAG(
+			  sctp,
+			  "SCTP association failed [errorKind:%.*s, message:%.*s]",
+			  static_cast<int>(errorKindStringView.size()),
+			  errorKindStringView.data(),
+			  static_cast<int>(errorMessage.size()),
+			  errorMessage.data());
+		}
+		else
+		{
+			MS_WARN_TAG(
+			  sctp,
+			  "SCTP association failed [errorKind:%.*s, message:%.*s]",
+			  static_cast<int>(errorKindStringView.size()),
+			  errorKindStringView.data(),
+			  static_cast<int>(errorMessage.size()),
+			  errorMessage.data());
+		}
 
 		// Tell all DataConsumers.
 		for (auto& kv : this->mapDataConsumers)
@@ -3093,10 +3106,20 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		if (errorKind != RTC::SCTP::Types::ErrorKind::SUCCESS)
-		{
-			const auto errorKindStringView = RTC::SCTP::Types::ErrorKindToString(errorKind);
+		const auto errorKindStringView = RTC::SCTP::Types::ErrorKindToString(errorKind);
 
+		if (errorKind == RTC::SCTP::Types::ErrorKind::SUCCESS || errorKind == RTC::SCTP::Types::ErrorKind::PEER_REPORTED)
+		{
+			MS_DEBUG_TAG(
+			  sctp,
+			  "SCTP association closed [errorKind:%.*s, message:%.*s]",
+			  static_cast<int>(errorKindStringView.size()),
+			  errorKindStringView.data(),
+			  static_cast<int>(errorMessage.size()),
+			  errorMessage.data());
+		}
+		else
+		{
 			MS_WARN_TAG(
 			  sctp,
 			  "SCTP association closed [errorKind:%.*s, message:%.*s]",

package/worker/src/RTC/UdpSocket.cpp

@@ -26,15 +26,15 @@ namespace RTC
 	  uint16_t minPort,
 	  uint16_t maxPort,
 	  RTC::Transport::SocketFlags& flags,
-	  uint64_t& portRangeHash)
+	  RTC::PortManager::PortRangeKey& portRangeKey)
 	  : // This may throw.
 	    ::UdpSocketHandle::UdpSocketHandle(
-	      RTC::PortManager::BindUdp(ip, minPort, maxPort, flags, portRangeHash)),
+	      RTC::PortManager::BindUdp(ip, minPort, maxPort, flags, portRangeKey)),
 	    listener(listener)
 	{
 		MS_TRACE();
 
-		this->portRangeHash = portRangeHash;
+		this->portRangeKey = portRangeKey;
 	}
 
 	UdpSocket::~UdpSocket()
@@ -43,7 +43,7 @@ namespace RTC
 
 		if (!this->fixedPort)
 		{
-			RTC::PortManager::Unbind(this->portRangeHash, this->localPort);
+			RTC::PortManager::Unbind(this->portRangeKey, this->localPort);
 		}
 	}
 

package/worker/src/RTC/WebRtcServer.cpp

@@ -96,7 +96,7 @@ namespace RTC
 
 					if (listenInfo->portRange()->min() != 0 && listenInfo->portRange()->max() != 0)
 					{
-						uint64_t portRangeHash{ 0u };
+						RTC::PortManager::PortRangeKey portRangeKey{};
 
 						udpSocket = new RTC::UdpSocket(
 						  this,
@@ -104,7 +104,7 @@ namespace RTC
 						  listenInfo->portRange()->min(),
 						  listenInfo->portRange()->max(),
 						  flags,
-						  portRangeHash);
+						  portRangeKey);
 					}
 					else if (listenInfo->port() != 0)
 					{
@@ -115,7 +115,7 @@ namespace RTC
 					// required.
 					else
 					{
-						uint64_t portRangeHash{ 0u };
+						RTC::PortManager::PortRangeKey portRangeKey{};
 
 						udpSocket = new RTC::UdpSocket(
 						  this,
@@ -123,7 +123,7 @@ namespace RTC
 						  Settings::configuration.rtcMinPort,
 						  Settings::configuration.rtcMaxPort,
 						  flags,
-						  portRangeHash);
+						  portRangeKey);
 					}
 
 					this->udpSocketOrTcpServers.emplace_back(
@@ -152,7 +152,7 @@ namespace RTC
 
 					if (listenInfo->portRange()->min() != 0 && listenInfo->portRange()->max() != 0)
 					{
-						uint64_t portRangeHash{ 0u };
+						RTC::PortManager::PortRangeKey portRangeKey{};
 
 						tcpServer = new RTC::TcpServer(
 						  this,
@@ -161,7 +161,7 @@ namespace RTC
 						  listenInfo->portRange()->min(),
 						  listenInfo->portRange()->max(),
 						  flags,
-						  portRangeHash);
+						  portRangeKey);
 					}
 					else if (listenInfo->port() != 0)
 					{
@@ -172,7 +172,7 @@ namespace RTC
 					// required.
 					else
 					{
-						uint64_t portRangeHash{ 0u };
+						RTC::PortManager::PortRangeKey portRangeKey{};
 
 						tcpServer = new RTC::TcpServer(
 						  this,
@@ -181,7 +181,7 @@ namespace RTC
 						  Settings::configuration.rtcMinPort,
 						  Settings::configuration.rtcMaxPort,
 						  flags,
-						  portRangeHash);
+						  portRangeKey);
 					}
 
 					this->udpSocketOrTcpServers.emplace_back(