mediasoup 3.19.19 → 3.19.21

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

@@ -110,10 +110,10 @@ namespace RTC
 			  indentation,
 			  "  re-configuration request sequence number: %" PRIu32,
 			  GetReconfigurationRequestSequenceNumber());
-			MS_DUMP_CLEAN(indentation, "  number of streams: %" PRIu16, GetNumberOfStreams());
-			for (uint32_t idx{ 0 }; idx < GetNumberOfStreams(); ++idx)
+			MS_DUMP_CLEAN(indentation, "  stream ids:");
+			for (const uint16_t streamId : GetStreamIds())
 			{
-				MS_DUMP_CLEAN(indentation, "  - idx: %" PRIu16 ", stream: %" PRIu16, idx, GetStreamAt(idx));
+				MS_DUMP_CLEAN(indentation, "  - stream id: %" PRIu16, streamId);
 			}
 			MS_DUMP_CLEAN(indentation, "</SCTP::IncomingSsnResetRequestParameter>");
 		}
@@ -137,7 +137,24 @@ namespace RTC
 			Utils::Byte::Set4Bytes(const_cast<uint8_t*>(GetBuffer()), 4, value);
 		}
 
-		void IncomingSsnResetRequestParameter::AddStream(uint16_t stream)
+		std::vector<uint16_t> IncomingSsnResetRequestParameter::GetStreamIds() const
+		{
+			MS_TRACE();
+
+			const uint16_t numberOfStreams = GetNumberOfStreams();
+			std::vector<uint16_t> streamIds;
+
+			streamIds.reserve(numberOfStreams);
+
+			for (uint16_t idx{ 0 }; idx < numberOfStreams; ++idx)
+			{
+				streamIds.emplace_back(GetStreamAt(idx));
+			}
+
+			return streamIds;
+		}
+
+		void IncomingSsnResetRequestParameter::AddStreamId(uint16_t streamId)
 		{
 			MS_TRACE();
 
@@ -148,7 +165,7 @@ namespace RTC
 
 			// Add the new stream.
 			Utils::Byte::Set2Bytes(
-			  GetVariableLengthValuePointer(), previousVariableLengthValueLength, stream);
+			  GetVariableLengthValuePointer(), previousVariableLengthValueLength, streamId);
 		}
 
 		IncomingSsnResetRequestParameter* IncomingSsnResetRequestParameter::SoftClone(

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

@@ -117,10 +117,10 @@ namespace RTC
 			  "  re-configuration response sequence number: %" PRIu32,
 			  GetReconfigurationResponseSequenceNumber());
 			MS_DUMP_CLEAN(indentation, "  sender last assigned tsn: %" PRIu32, GetSenderLastAssignedTsn());
-			MS_DUMP_CLEAN(indentation, "  number of streams: %" PRIu16, GetNumberOfStreams());
-			for (uint32_t idx{ 0 }; idx < GetNumberOfStreams(); ++idx)
+			MS_DUMP_CLEAN(indentation, "  stream ids:");
+			for (const uint16_t streamId : GetStreamIds())
 			{
-				MS_DUMP_CLEAN(indentation, "  - idx: %" PRIu16 ", stream: %" PRIu16, idx, GetStreamAt(idx));
+				MS_DUMP_CLEAN(indentation, "  - stream id: %" PRIu16, streamId);
 			}
 			MS_DUMP_CLEAN(indentation, "</SCTP::OutgoingSsnResetRequestParameter>");
 		}
@@ -158,7 +158,24 @@ namespace RTC
 			Utils::Byte::Set4Bytes(const_cast<uint8_t*>(GetBuffer()), 12, value);
 		}
 
-		void OutgoingSsnResetRequestParameter::AddStream(uint16_t stream)
+		std::vector<uint16_t> OutgoingSsnResetRequestParameter::GetStreamIds() const
+		{
+			MS_TRACE();
+
+			const uint16_t numberOfStreams = GetNumberOfStreams();
+			std::vector<uint16_t> streamIds;
+
+			streamIds.reserve(numberOfStreams);
+
+			for (uint16_t idx{ 0 }; idx < numberOfStreams; ++idx)
+			{
+				streamIds.emplace_back(GetStreamAt(idx));
+			}
+
+			return streamIds;
+		}
+
+		void OutgoingSsnResetRequestParameter::AddStreamId(uint16_t streamId)
 		{
 			MS_TRACE();
 
@@ -169,7 +186,7 @@ namespace RTC
 
 			// Add the new stream.
 			Utils::Byte::Set2Bytes(
-			  GetVariableLengthValuePointer(), previousVariableLengthValueLength, stream);
+			  GetVariableLengthValuePointer(), previousVariableLengthValueLength, streamId);
 		}
 
 		OutgoingSsnResetRequestParameter* OutgoingSsnResetRequestParameter::SoftClone(

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

@@ -73,7 +73,7 @@ namespace RTC
 
 			if (this->counter > 0)
 			{
-				MS_DEBUG_DEV("recovered from counter=%zu");
+				MS_DEBUG_DEV("recovered from counter %zu", this->counter);
 
 				this->counter = 0;
 			}

package/worker/src/RTC/SctpAssociation.cpp

@@ -513,8 +513,7 @@ namespace RTC
 
 			return;
 		}
-		// If the transport is not connected and has never been connected, don't do
-		// anything.
+		// If the transport is not connected, don't do anything.
 		else if (!this->transportConnected)
 		{
 			MS_DEBUG_DEV("transport is not connected, ignoring");

package/worker/src/RTC/SeqManager.cpp

@@ -11,25 +11,25 @@ namespace RTC
 	template<typename T, uint8_t N>
 	bool SeqManager<T, N>::SeqLowerThan::operator()(T lhs, T rhs) const
 	{
-		return Utils::Number<T, N>::IsLowerThan(lhs, rhs);
+		return Utils::Number::IsLowerThan<T, N>(lhs, rhs);
 	}
 
 	template<typename T, uint8_t N>
 	bool SeqManager<T, N>::SeqHigherThan::operator()(T lhs, T rhs) const
 	{
-		return Utils::Number<T, N>::IsHigherThan(lhs, rhs);
+		return Utils::Number::IsHigherThan<T, N>(lhs, rhs);
 	}
 
 	template<typename T, uint8_t N>
 	bool SeqManager<T, N>::IsSeqHigherThan(T lhs, T rhs)
 	{
-		return Utils::Number<T, N>::IsHigherThan(lhs, rhs);
+		return Utils::Number::IsHigherThan<T, N>(lhs, rhs);
 	}
 
 	template<typename T, uint8_t N>
 	bool SeqManager<T, N>::IsSeqLowerThan(T lhs, T rhs)
 	{
-		return Utils::Number<T, N>::IsLowerThan(lhs, rhs);
+		return Utils::Number::IsLowerThan<T, N>(lhs, rhs);
 	}
 
 	template<typename T, uint8_t N>