mediasoup 3.26.0 → 3.27.0

package/worker/src/RTC/WebRtcServer.cpp

@@ -100,6 +100,7 @@ namespace RTC
 
 						udpSocket = new RTC::UdpSocket(
 						  this,
+						  this->shared,
 						  ip,
 						  listenInfo->portRange()->min(),
 						  listenInfo->portRange()->max(),
@@ -108,7 +109,7 @@ namespace RTC
 					}
 					else if (listenInfo->port() != 0)
 					{
-						udpSocket = new RTC::UdpSocket(this, ip, listenInfo->port(), flags);
+						udpSocket = new RTC::UdpSocket(this, this->shared, ip, listenInfo->port(), flags);
 					}
 					// NOTE: This is temporal to allow deprecated usage of worker port range.
 					// In the future this should throw since |port| or |portRange| will be
@@ -119,6 +120,7 @@ namespace RTC
 
 						udpSocket = new RTC::UdpSocket(
 						  this,
+						  this->shared,
 						  ip,
 						  Settings::configuration.rtcMinPort,
 						  Settings::configuration.rtcMaxPort,
@@ -157,6 +159,7 @@ namespace RTC
 						tcpServer = new RTC::TcpServer(
 						  this,
 						  this,
+						  this->shared,
 						  ip,
 						  listenInfo->portRange()->min(),
 						  listenInfo->portRange()->max(),
@@ -165,7 +168,7 @@ namespace RTC
 					}
 					else if (listenInfo->port() != 0)
 					{
-						tcpServer = new RTC::TcpServer(this, this, ip, listenInfo->port(), flags);
+						tcpServer = new RTC::TcpServer(this, this, this->shared, ip, listenInfo->port(), flags);
 					}
 					// NOTE: This is temporal to allow deprecated usage of worker port range.
 					// In the future this should throw since |port| or |portRange| will be
@@ -177,6 +180,7 @@ namespace RTC
 						tcpServer = new RTC::TcpServer(
 						  this,
 						  this,
+						  this->shared,
 						  ip,
 						  Settings::configuration.rtcMinPort,
 						  Settings::configuration.rtcMaxPort,
@@ -409,21 +413,22 @@ namespace RTC
 	}
 
 	inline void WebRtcServer::OnPacketReceived(
-	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen)
+	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
 		if (RTC::ICE::StunPacket::IsStun(data, len))
 		{
-			OnStunDataReceived(tuple, data, len);
+			OnStunDataReceived(tuple, data, len, receivedAtUs);
 		}
 		else
 		{
-			OnNonStunDataReceived(tuple, data, len, bufferLen);
+			OnNonStunDataReceived(tuple, data, len, bufferLen, receivedAtUs);
 		}
 	}
 
-	inline void WebRtcServer::OnStunDataReceived(RTC::TransportTuple* tuple, const uint8_t* data, size_t len)
+	inline void WebRtcServer::OnStunDataReceived(
+	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
@@ -443,7 +448,7 @@ namespace RTC
 		{
 			auto* webRtcTransport = it1->second;
 
-			webRtcTransport->ProcessStunPacketFromWebRtcServer(tuple, packet);
+			webRtcTransport->ProcessStunPacketFromWebRtcServer(tuple, packet, receivedAtUs);
 
 			delete packet;
 
@@ -465,13 +470,13 @@ namespace RTC
 
 		auto* webRtcTransport = it2->second;
 
-		webRtcTransport->ProcessStunPacketFromWebRtcServer(tuple, packet);
+		webRtcTransport->ProcessStunPacketFromWebRtcServer(tuple, packet, receivedAtUs);
 
 		delete packet;
 	}
 
 	inline void WebRtcServer::OnNonStunDataReceived(
-	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen)
+	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
@@ -486,7 +491,7 @@ namespace RTC
 
 		auto* webRtcTransport = it->second;
 
-		webRtcTransport->ProcessNonStunPacketFromWebRtcServer(tuple, data, len, bufferLen);
+		webRtcTransport->ProcessNonStunPacketFromWebRtcServer(tuple, data, len, bufferLen, receivedAtUs);
 	}
 
 	inline void WebRtcServer::OnWebRtcTransportCreated(RTC::WebRtcTransport* webRtcTransport)
@@ -583,13 +588,14 @@ namespace RTC
 	  const uint8_t* data,
 	  size_t len,
 	  size_t bufferLen,
-	  const struct sockaddr* remoteAddr)
+	  const struct sockaddr* remoteAddr,
+	  int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
 		RTC::TransportTuple tuple(socket, remoteAddr);
 
-		OnPacketReceived(std::addressof(tuple), data, len, bufferLen);
+		OnPacketReceived(std::addressof(tuple), data, len, bufferLen, receivedAtUs);
 	}
 
 	inline void WebRtcServer::OnRtcTcpConnectionClosed(
@@ -616,12 +622,12 @@ namespace RTC
 	}
 
 	inline void WebRtcServer::OnTcpConnectionPacketReceived(
-	  RTC::TcpConnection* connection, const uint8_t* data, size_t len, size_t bufferLen)
+	  RTC::TcpConnection* connection, const uint8_t* data, size_t len, size_t bufferLen, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
 		RTC::TransportTuple tuple(connection);
 
-		OnPacketReceived(std::addressof(tuple), data, len, bufferLen);
+		OnPacketReceived(std::addressof(tuple), data, len, bufferLen, receivedAtUs);
 	}
 } // namespace RTC

package/worker/src/RTC/WebRtcTransport.cpp

@@ -89,6 +89,7 @@ namespace RTC
 
 						udpSocket = new RTC::UdpSocket(
 						  this,
+						  this->shared,
 						  ip,
 						  listenInfo->portRange()->min(),
 						  listenInfo->portRange()->max(),
@@ -97,7 +98,7 @@ namespace RTC
 					}
 					else if (listenInfo->port() != 0)
 					{
-						udpSocket = new RTC::UdpSocket(this, ip, listenInfo->port(), flags);
+						udpSocket = new RTC::UdpSocket(this, this->shared, ip, listenInfo->port(), flags);
 					}
 					// NOTE: This is temporal to allow deprecated usage of worker port range.
 					// In the future this should throw since |port| or |portRange| will be
@@ -108,6 +109,7 @@ namespace RTC
 
 						udpSocket = new RTC::UdpSocket(
 						  this,
+						  this->shared,
 						  ip,
 						  Settings::configuration.rtcMinPort,
 						  Settings::configuration.rtcMaxPort,
@@ -160,6 +162,7 @@ namespace RTC
 						tcpServer = new RTC::TcpServer(
 						  this,
 						  this,
+						  this->shared,
 						  ip,
 						  listenInfo->portRange()->min(),
 						  listenInfo->portRange()->max(),
@@ -168,7 +171,7 @@ namespace RTC
 					}
 					else if (listenInfo->port() != 0)
 					{
-						tcpServer = new RTC::TcpServer(this, this, ip, listenInfo->port(), flags);
+						tcpServer = new RTC::TcpServer(this, this, this->shared, ip, listenInfo->port(), flags);
 					}
 					// NOTE: This is temporal to allow deprecated usage of worker port range.
 					// In the future this should throw since |port| or |portRange| will be
@@ -180,6 +183,7 @@ namespace RTC
 						tcpServer = new RTC::TcpServer(
 						  this,
 						  this,
+						  this->shared,
 						  ip,
 						  Settings::configuration.rtcMinPort,
 						  Settings::configuration.rtcMaxPort,
@@ -226,7 +230,7 @@ namespace RTC
 				iceLocalPreferenceDecrement += 100;
 			}
 
-			auto iceConsentTimeout = options->iceConsentTimeout();
+			auto iceConsentTimeoutSec = options->iceConsentTimeout();
 
 			// Create a ICE server.
 			this->iceServer = new RTC::ICE::IceServer(
@@ -234,7 +238,7 @@ namespace RTC
 			  this->shared,
 			  Utils::Crypto::GetRandomString(32),
 			  Utils::Crypto::GetRandomString(32),
-			  iceConsentTimeout);
+			  iceConsentTimeoutSec);
 
 			// Create a DTLS transport.
 			this->dtlsTransport = new RTC::DtlsTransport(this, this->shared);
@@ -303,7 +307,7 @@ namespace RTC
 				MS_THROW_TYPE_ERROR("empty iceCandidates");
 			}
 
-			auto iceConsentTimeout = options->iceConsentTimeout();
+			auto iceConsentTimeoutSec = options->iceConsentTimeout();
 
 			// Create a ICE server.
 			this->iceServer = new RTC::ICE::IceServer(
@@ -311,7 +315,7 @@ namespace RTC
 			  this->shared,
 			  Utils::Crypto::GetRandomString(32),
 			  Utils::Crypto::GetRandomString(32),
-			  iceConsentTimeout);
+			  iceConsentTimeoutSec);
 
 			// Create a DTLS transport.
 			this->dtlsTransport = new RTC::DtlsTransport(this, this->shared);
@@ -621,7 +625,7 @@ namespace RTC
 	}
 
 	void WebRtcTransport::ProcessStunPacketFromWebRtcServer(
-	  RTC::TransportTuple* tuple, const RTC::ICE::StunPacket* packet)
+	  RTC::TransportTuple* tuple, const RTC::ICE::StunPacket* packet, int64_t /*receivedAtUs*/)
 	{
 		MS_TRACE();
 
@@ -630,7 +634,7 @@ namespace RTC
 	}
 
 	void WebRtcTransport::ProcessNonStunPacketFromWebRtcServer(
-	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen)
+	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
@@ -640,17 +644,17 @@ namespace RTC
 		// Check if it's RTCP.
 		if (RTC::RTCP::Packet::IsRtcp(data, len))
 		{
-			OnRtcpDataReceived(tuple, data, len);
+			OnRtcpDataReceived(tuple, data, len, receivedAtUs);
 		}
 		// Check if it's RTP.
 		else if (RTC::RTP::Packet::IsRtp(data, len))
 		{
-			OnRtpDataReceived(tuple, data, len, bufferLen);
+			OnRtpDataReceived(tuple, data, len, bufferLen, receivedAtUs);
 		}
 		// Check if it's DTLS.
 		else if (RTC::DtlsTransport::IsDtls(data, len))
 		{
-			OnDtlsDataReceived(tuple, data, len);
+			OnDtlsDataReceived(tuple, data, len, receivedAtUs);
 		}
 		else
 		{
@@ -671,7 +675,7 @@ namespace RTC
 
 		return (
 		  (this->iceServer->GetState() == RTC::ICE::IceServer::IceState::CONNECTED ||
-		   this->iceServer->GetState() == RTC::ICE::IceServer::IceState::COMPLETED) &&
+			 this->iceServer->GetState() == RTC::ICE::IceServer::IceState::COMPLETED) &&
 		  this->dtlsTransport->GetState() == RTC::DtlsTransport::DtlsState::CONNECTED);
 	}
 
@@ -909,7 +913,7 @@ namespace RTC
 	}
 
 	inline void WebRtcTransport::OnPacketReceived(
-	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen)
+	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
@@ -919,22 +923,22 @@ namespace RTC
 		// Check if it's STUN.
 		if (RTC::ICE::StunPacket::IsStun(data, len))
 		{
-			OnStunDataReceived(tuple, data, len);
+			OnStunDataReceived(tuple, data, len, receivedAtUs);
 		}
 		// Check if it's RTCP.
 		else if (RTC::RTCP::Packet::IsRtcp(data, len))
 		{
-			OnRtcpDataReceived(tuple, data, len);
+			OnRtcpDataReceived(tuple, data, len, receivedAtUs);
 		}
 		// Check if it's RTP.
 		else if (RTC::RTP::Packet::IsRtp(data, len))
 		{
-			OnRtpDataReceived(tuple, data, len, bufferLen);
+			OnRtpDataReceived(tuple, data, len, bufferLen, receivedAtUs);
 		}
 		// Check if it's DTLS.
 		else if (RTC::DtlsTransport::IsDtls(data, len))
 		{
-			OnDtlsDataReceived(tuple, data, len);
+			OnDtlsDataReceived(tuple, data, len, receivedAtUs);
 		}
 		else
 		{
@@ -943,7 +947,7 @@ namespace RTC
 	}
 
 	inline void WebRtcTransport::OnStunDataReceived(
-	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len)
+	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, int64_t /*receivedAtUs*/)
 	{
 		MS_TRACE();
 
@@ -963,7 +967,7 @@ namespace RTC
 	}
 
 	inline void WebRtcTransport::OnDtlsDataReceived(
-	  const RTC::TransportTuple* tuple, const uint8_t* data, size_t len)
+	  const RTC::TransportTuple* tuple, const uint8_t* data, size_t len, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
@@ -985,7 +989,7 @@ namespace RTC
 		{
 			MS_DEBUG_DEV("DTLS data received, passing it to the DTLS transport");
 
-			this->dtlsTransport->ProcessDtlsData(data, len);
+			this->dtlsTransport->ProcessDtlsData(data, len, receivedAtUs);
 		}
 		else
 		{
@@ -996,7 +1000,7 @@ namespace RTC
 	}
 
 	inline void WebRtcTransport::OnRtpDataReceived(
-	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen)
+	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
@@ -1061,11 +1065,11 @@ namespace RTC
 		this->iceServer->MayForceSelectedTuple(tuple);
 
 		// Pass the packet to the parent transport.
-		RTC::Transport::ReceiveRtpPacket(packet);
+		RTC::Transport::ReceiveRtpPacket(packet, receivedAtUs);
 	}
 
 	inline void WebRtcTransport::OnRtcpDataReceived(
-	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len)
+	  RTC::TransportTuple* tuple, const uint8_t* data, size_t len, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
@@ -1109,7 +1113,7 @@ namespace RTC
 		}
 
 		// Pass the packet to the parent transport.
-		RTC::Transport::ReceiveRtcpPacket(packet);
+		RTC::Transport::ReceiveRtcpPacket(packet, receivedAtUs);
 	}
 
 	inline void WebRtcTransport::OnUdpSocketPacketReceived(
@@ -1117,13 +1121,14 @@ namespace RTC
 	  const uint8_t* data,
 	  size_t len,
 	  size_t bufferLen,
-	  const struct sockaddr* remoteAddr)
+	  const struct sockaddr* remoteAddr,
+	  int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
 		RTC::TransportTuple tuple(socket, remoteAddr);
 
-		OnPacketReceived(&tuple, data, len, bufferLen);
+		OnPacketReceived(&tuple, data, len, bufferLen, receivedAtUs);
 	}
 
 	inline void WebRtcTransport::OnRtcTcpConnectionClosed(
@@ -1137,13 +1142,13 @@ namespace RTC
 	}
 
 	inline void WebRtcTransport::OnTcpConnectionPacketReceived(
-	  RTC::TcpConnection* connection, const uint8_t* data, size_t len, size_t bufferLen)
+	  RTC::TcpConnection* connection, const uint8_t* data, size_t len, size_t bufferLen, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
 		RTC::TransportTuple tuple(connection);
 
-		OnPacketReceived(&tuple, data, len, bufferLen);
+		OnPacketReceived(&tuple, data, len, bufferLen, receivedAtUs);
 	}
 
 	inline void WebRtcTransport::OnIceServerSendStunPacket(
@@ -1453,11 +1458,11 @@ namespace RTC
 	}
 
 	inline void WebRtcTransport::OnDtlsTransportApplicationDataReceived(
-	  const RTC::DtlsTransport* /*dtlsTransport*/, const uint8_t* data, size_t len)
+	  const RTC::DtlsTransport* /*dtlsTransport*/, const uint8_t* data, size_t len, int64_t receivedAtUs)
 	{
 		MS_TRACE();
 
 		// Pass it to the parent transport.
-		RTC::Transport::ReceiveSctpData(data, len);
+		RTC::Transport::ReceiveSctpData(data, len, receivedAtUs);
 	}
 } // namespace RTC

package/worker/src/Settings.cpp

@@ -58,6 +58,9 @@ void Settings::SetConfiguration(int argc, char* argv[])
 		{ .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' },
+		// NOTE: The libwebrtcFieldTrials option is still allowed until we only
+		// support the built-in BWE.
+		// TODO: Remove when we only support the built-in BWE.
 		{ .name="libwebrtcFieldTrials", .has_arg=optional_argument, .flag=nullptr, .val='W' },
 		{ .name=nullptr,                .has_arg=0,                 .flag=nullptr,  .val=0  }
 	};
@@ -144,6 +147,10 @@ void Settings::SetConfiguration(int argc, char* argv[])
 
 			case 'W':
 			{
+#ifdef MS_USE_BUILTIN_BWE
+				// TODO: Remove when we only support the built-in BWE.
+				MS_WARN_TAG(info, "ignoring libwebrtcFieldTrials since this worker uses the built-in BWE");
+#else
 				stringValue = std::string(optarg);
 
 				if (stringValue != Settings::configuration.libwebrtcFieldTrials)
@@ -154,6 +161,7 @@ void Settings::SetConfiguration(int argc, char* argv[])
 
 					Settings::configuration.libwebrtcFieldTrials = stringValue;
 				}
+#endif
 
 				break;
 			}
@@ -364,11 +372,13 @@ void Settings::PrintConfiguration()
 		  info, "  dtlsCertificateFile: %s", Settings::configuration.dtlsCertificateFile.c_str());
 		MS_DEBUG_TAG(info, "  dtlsPrivateKeyFile: %s", Settings::configuration.dtlsPrivateKeyFile.c_str());
 	}
+#ifndef MS_USE_BUILTIN_BWE
 	if (!Settings::configuration.libwebrtcFieldTrials.empty())
 	{
 		MS_DEBUG_TAG(
 		  info, "  libwebrtcFieldTrials: %s", Settings::configuration.libwebrtcFieldTrials.c_str());
 	}
+#endif
 
 	MS_DEBUG_TAG(info, "</configuration>");
 }

package/worker/src/Shared.cpp

@@ -19,11 +19,11 @@ Shared::~Shared()
 	MS_TRACE();
 }
 
-TimerHandleInterface* Shared::CreateTimer(TimerHandleInterface::Listener* listener)
+TimerHandleInterface* Shared::CreateTimer(TimerHandleInterface::Listener* listener, std::string label)
 {
 	MS_TRACE();
 
-	return new TimerHandle(listener);
+	return new TimerHandle(listener, std::move(label));
 }
 
 BackoffTimerHandleInterface* Shared::CreateBackoffTimer(

package/worker/src/Utils/Crypto.cpp

@@ -126,8 +126,8 @@ namespace Utils
 
 		char buffer[64];
 		static constexpr char Chars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b',
-			                                'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-			                                'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
+		                                  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		                                  'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
 
 		len = std::min<size_t>(len, 64);
 

package/worker/src/Worker.cpp

@@ -19,6 +19,10 @@ Worker::Worker(::Channel::ChannelSocket* channel, SharedInterface* shared)
 	// Set us as Channel's listener.
 	this->channel->SetListener(this);
 
+	// Give the Channel the Shared instance, which it needs to take the arrival
+	// time of received notifications.
+	this->channel->SetShared(this->shared);
+
 	// Set the SignalHandle.
 	this->signalHandle = new SignalHandle(this);
 
@@ -369,7 +373,7 @@ void Worker::HandleNotification(Channel::ChannelNotification* notification)
 
 	MS_DEBUG_DEV("Channel notification received [event:%s]", notification->eventCStr);
 
-	switch (notification->event)
+	switch (notification->data->event())
 	{
 		case Channel::ChannelNotification::Event::WORKER_CLOSE:
 		{

package/worker/src/handles/BackoffTimerHandle.cpp

@@ -4,7 +4,6 @@
 #include "handles/BackoffTimerHandle.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
-#include <algorithm> // std::min()
 
 /* Instance methods. */
 
@@ -20,7 +19,7 @@ BackoffTimerHandle::BackoffTimerHandle(BackoffTimerHandleOptions options)
 
 	if (!this->listener)
 	{
-		MS_THROW_TYPE_ERROR("options.listener must be given");
+		MS_THROW_TYPE_ERROR("[%s] options.listener must be given", this->label.c_str());
 	}
 
 	if (this->label.empty())
@@ -28,16 +27,24 @@ BackoffTimerHandle::BackoffTimerHandle(BackoffTimerHandleOptions options)
 		MS_THROW_TYPE_ERROR("options.label must be given");
 	}
 
+	if (this->baseTimeoutMs < 0)
+	{
+		MS_THROW_TYPE_ERROR(
+		  "[%s] options.baseTimeoutMs (%" PRIi64 " ms) cannot be negative",
+		  this->label.c_str(),
+		  this->baseTimeoutMs);
+	}
+
 	if (this->baseTimeoutMs > BackoffTimerHandleInterface::MaxTimeoutMs)
 	{
-		MS_THROW_ERROR(
-		  "[%s] base timeout (%" PRIu64 " ms) cannot be greater than %" PRIu64 " ms",
+		MS_THROW_TYPE_ERROR(
+		  "[%s] options.maxBackoffTimeoutMs (%" PRIi64 " ms) cannot be greater than %" PRIi64 " ms",
 		  this->label.c_str(),
 		  this->baseTimeoutMs,
 		  BackoffTimerHandleInterface::MaxTimeoutMs);
 	}
 
-	this->timer = new TimerHandle(this);
+	this->timer = new TimerHandle(this, this->label);
 }
 
 BackoffTimerHandle::~BackoffTimerHandle()
@@ -68,14 +75,20 @@ void BackoffTimerHandle::Stop()
 	this->expirationCount = 0;
 }
 
-void BackoffTimerHandle::SetBaseTimeoutMs(uint64_t baseTimeoutMs)
+void BackoffTimerHandle::SetBaseTimeoutMs(int64_t baseTimeoutMs)
 {
 	MS_TRACE();
 
+	if (baseTimeoutMs < 0)
+	{
+		MS_THROW_TYPE_ERROR(
+		  "[%s] baseTimeoutMs (%" PRIi64 " ms) cannot be negative", this->label.c_str(), baseTimeoutMs);
+	}
+
 	if (baseTimeoutMs > BackoffTimerHandleInterface::MaxTimeoutMs)
 	{
-		MS_THROW_ERROR(
-		  "[%s] base timeout (%" PRIu64 " ms) cannot be greater than %" PRIu64 " ms",
+		MS_THROW_TYPE_ERROR(
+		  "[%s] baseTimeoutMs (%" PRIi64 " ms) cannot be greater than %" PRIi64 " ms",
 		  this->label.c_str(),
 		  baseTimeoutMs,
 		  BackoffTimerHandleInterface::MaxTimeoutMs);
@@ -84,7 +97,7 @@ void BackoffTimerHandle::SetBaseTimeoutMs(uint64_t baseTimeoutMs)
 	this->baseTimeoutMs = baseTimeoutMs;
 }
 
-uint64_t BackoffTimerHandle::ComputeNextTimeoutMs() const
+int64_t BackoffTimerHandle::ComputeNextTimeoutMs() const
 {
 	MS_TRACE();
 
@@ -112,7 +125,7 @@ uint64_t BackoffTimerHandle::ComputeNextTimeoutMs() const
 				}
 			}
 
-			return std::min<uint64_t>(timeoutMs, BackoffTimerHandleInterface::MaxTimeoutMs);
+			return std::min<int64_t>(timeoutMs, BackoffTimerHandleInterface::MaxTimeoutMs);
 		}
 
 			NO_DEFAULT_GCC();
@@ -131,7 +144,7 @@ void BackoffTimerHandle::OnTimer(TimerHandleInterface* /*timer*/)
 	this->running =
 	  !this->maxRestarts.has_value() || this->expirationCount <= this->maxRestarts.value();
 
-	uint64_t baseTimeoutMs{ this->baseTimeoutMs };
+	int64_t baseTimeoutMs{ this->baseTimeoutMs };
 	bool stop{ false };
 
 	// Call the listener by passing base timeout as reference so the parent has