mediasoup 3.20.1 → 3.20.3

package/worker/src/RTC/SCTP/association/TransmissionControlBlock.cpp

@@ -21,7 +21,7 @@ namespace RTC
 		/* Instance methods. */
 
 		TransmissionControlBlock::TransmissionControlBlock(
-		  AssociationListenerInterface& associationListener,
+		  AssociationListenerDeferrer& associationListenerDeferrer,
 		  const SctpOptions& sctpOptions,
 		  SharedInterface* shared,
 		  SendQueueInterface& sendQueue,
@@ -35,7 +35,7 @@ namespace RTC
 		  const NegotiatedCapabilities& negotiatedCapabilities,
 		  size_t maxPacketLength,
 		  std::function<bool()> isAssociationEstablished)
-		  : associationListener(associationListener),
+		  : associationListenerDeferrer(associationListenerDeferrer),
 		    sctpOptions(sctpOptions),
 		    shared(shared),
 		    packetSender(packetSender),
@@ -71,7 +71,7 @@ namespace RTC
 		      sctpOptions.maxReceiverWindowBufferSize, negotiatedCapabilities.messageInterleaving),
 		    retransmissionQueue(
 		      this,
-		      this->associationListener,
+		      this->associationListenerDeferrer,
 		      localInitialTsn,
 		      remoteAdvertisedReceiverWindowCredit,
 		      sendQueue,
@@ -80,13 +80,13 @@ namespace RTC
 		      negotiatedCapabilities.partialReliability,
 		      negotiatedCapabilities.messageInterleaving),
 		    streamResetHandler(
-		      this->associationListener,
+		      this->associationListenerDeferrer,
 		      this->shared,
 		      this,
 		      std::addressof(this->dataTracker),
 		      std::addressof(this->reassemblyQueue),
 		      std::addressof(this->retransmissionQueue)),
-		    heartbeatHandler(this->associationListener, sctpOptions, this->shared, this)
+		    heartbeatHandler(this->associationListenerDeferrer, sctpOptions, this->shared, this)
 		{
 			MS_TRACE();
 
@@ -411,6 +411,11 @@ namespace RTC
 		{
 			MS_TRACE();
 
+			// This is a top-level timer entry point (invoked by libuv outside any other
+			// SCTP API call), so it must establish the deferrer scope itself, just like
+			// Association does in its own timer handlers.
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->associationListenerDeferrer);
+
 			// In the COOKIE-ECHO state, let the T1-COOKIE timer trigger
 			// retransmissions, to avoid having two timers doing that.
 			if (this->remoteStateCookie.has_value())
@@ -434,6 +439,11 @@ namespace RTC
 		{
 			MS_TRACE();
 
+			// This is a top-level timer entry point (invoked by libuv outside any other
+			// SCTP API call), so it must establish the deferrer scope itself, just like
+			// Association does in its own timer handlers.
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->associationListenerDeferrer);
+
 			this->dataTracker.HandleDelayedAckTimerExpiry();
 
 			MaySendSackChunk();

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

@@ -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(

package/worker/src/RTC/WebRtcTransport.cpp

@@ -5,6 +5,7 @@
 #include "FBS/webRtcTransport.h"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
+#include "RTC/PortManager.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
 #include <cmath> // std::pow()
@@ -81,7 +82,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,
@@ -89,7 +90,7 @@ namespace RTC
 						  listenInfo->portRange()->min(),
 						  listenInfo->portRange()->max(),
 						  flags,
-						  portRangeHash);
+						  portRangeKey);
 					}
 					else if (listenInfo->port() != 0)
 					{
@@ -100,7 +101,7 @@ namespace RTC
 					// required.
 					else
 					{
-						uint64_t portRangeHash{ 0u };
+						RTC::PortManager::PortRangeKey portRangeKey;
 
 						udpSocket = new RTC::UdpSocket(
 						  this,
@@ -108,7 +109,7 @@ namespace RTC
 						  Settings::configuration.rtcMinPort,
 						  Settings::configuration.rtcMaxPort,
 						  flags,
-						  portRangeHash);
+						  portRangeKey);
 					}
 
 					this->udpSockets[udpSocket] = announcedAddress;
@@ -151,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,
@@ -160,7 +161,7 @@ namespace RTC
 						  listenInfo->portRange()->min(),
 						  listenInfo->portRange()->max(),
 						  flags,
-						  portRangeHash);
+						  portRangeKey);
 					}
 					else if (listenInfo->port() != 0)
 					{
@@ -171,7 +172,7 @@ namespace RTC
 					// required.
 					else
 					{
-						uint64_t portRangeHash{ 0u };
+						RTC::PortManager::PortRangeKey portRangeKey{};
 
 						tcpServer = new RTC::TcpServer(
 						  this,
@@ -180,7 +181,7 @@ namespace RTC
 						  Settings::configuration.rtcMinPort,
 						  Settings::configuration.rtcMaxPort,
 						  flags,
-						  portRangeHash);
+						  portRangeKey);
 					}
 
 					this->tcpServers[tcpServer] = announcedAddress;