mediasoup 3.20.4 → 3.20.5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mediasoup",
-	"version": "3.20.4",
+	"version": "3.20.5",
 	"description": "Cutting Edge WebRTC Video Conferencing",
 	"contributors": [
 		"Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",

package/worker/include/RTC/SeqManager.hpp

@@ -3,7 +3,7 @@
 
 #include "common.hpp"
 #include <limits> // std::numeric_limits
-#include <set>
+#include <vector>
 
 namespace RTC
 {
@@ -53,7 +53,7 @@ namespace RTC
 		T maxInput{ 0 };
 		T maxDropped{ 0 };
 		T maxForwarded{ 0 };
-		std::set<T, SeqLowerThan> dropped;
+		std::vector<T> dropped;
 	};
 } // namespace RTC
 

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

@@ -1462,7 +1462,9 @@ namespace RTC
 
 				case State::CLOSED:
 				{
-					MS_WARN_TAG(sctp, "ignoring INIT chunk received in CLOSED state)");
+					MS_WARN_TAG(sctp, "ignoring INIT chunk received in CLOSED state");
+
+					return;
 				}
 
 				// https://datatracker.ietf.org/doc/html/rfc9260#section-5.2.1
@@ -1812,7 +1814,7 @@ namespace RTC
 			else if (
 			  receivedPacket->GetVerificationTag() != this->tcb->GetLocalVerificationTag() &&
 			  cookie->GetRemoteVerificationTag() == this->tcb->GetRemoteVerificationTag() &&
-			  cookie->GetTieTag() == this->tcb->GetTieTag())
+			  cookie->GetTieTag() == 0)
 			{
 				MS_DEBUG_DEV("received COOKIE-ECHO indicating a late COOKIE-ECHO, discarding");
 

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

@@ -376,6 +376,10 @@ namespace RTC
 				  ReconfigurationResponseParameter::Result::SUCCESS_NOTHING_TO_DO);
 
 				reconfigurationResponseParameter->Consolidate();
+
+				this->lastProcessedReqSeqNbr = requestSn;
+				this->lastProcessedReqResult =
+				  ReconfigurationResponseParameter::Result::SUCCESS_NOTHING_TO_DO;
 			}
 			else
 			{

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

@@ -268,7 +268,9 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			UpdateAckState(AckState::IMMEDIATE, "force immediate SACK");
+			// NOTE: Assign directly instead of going through UpdateAckState() to avoid
+			// its side effect of stopping the delayed-ack timer.
+			this->ackState = AckState::IMMEDIATE;
 		}
 
 		bool DataTracker::WillIncreaseCumAckTsn(uint32_t tsn) const
@@ -359,6 +361,7 @@ namespace RTC
 				{
 					this->delayedAckTimer->Start();
 				}
+
 				this->ackState = newAckState;
 			}
 		}

package/worker/src/RTC/SeqManager.cpp

@@ -63,9 +63,15 @@ namespace RTC
 		{
 			this->maxInput   = input;
 			this->maxDropped = input;
-			// Insert input in the last position.
-			// Explicitly insert at the end, which is more performant.
-			this->dropped.insert(this->dropped.end(), input);
+			// Insert input in sorted order, if not present.
+			const SeqLowerThan seqLowerThan;
+			const auto it =
+			  std::lower_bound(this->dropped.begin(), this->dropped.end(), input, seqLowerThan);
+
+			if (it == this->dropped.end() || *it != input)
+			{
+				this->dropped.insert(it, input);
+			}
 
 			ClearDropped();
 		}
@@ -74,7 +80,15 @@ namespace RTC
 		// Allows for properly accounting for out of order drops until an input is forwarded.
 		else if (this->maxInput == this->maxDropped && SeqManager<T, N>::IsSeqHigherThan(input, this->maxForwarded))
 		{
-			this->dropped.insert(input);
+			// Insert input in sorted order, if not present.
+			const SeqLowerThan seqLowerThan;
+			const auto it =
+			  std::lower_bound(this->dropped.begin(), this->dropped.end(), input, seqLowerThan);
+
+			if (it == this->dropped.end() || *it != input)
+			{
+				this->dropped.insert(it, input);
+			}
 
 			ClearDropped();
 		}
@@ -112,22 +126,24 @@ namespace RTC
 		{
 			goto done;
 		}
-		// This input was dropped.
-		else if (this->dropped.find(input) != this->dropped.end())
-		{
-			MS_DEBUG_DEV("trying to send a dropped input");
-
-			return false;
-		}
-		// There are dropped inputs, calculate 'base' for this input.
 		else
 		{
-			auto droppedCount = this->dropped.size();
+			const SeqLowerThan seqLowerThan;
+			const auto it =
+			  std::lower_bound(this->dropped.begin(), this->dropped.end(), input, seqLowerThan);
 
-			// Get the first dropped input which is higher than or equal 'input'.
-			auto it = this->dropped.lower_bound(input);
+			if (it != this->dropped.end() && *it == input)
+			{
+				MS_DEBUG_DEV("trying to send a dropped input");
+
+				return false;
+			}
+
+			// There are dropped inputs, calculate 'base' for this input.
+			auto droppedCount = std::distance(
+			  this->dropped.begin(),
+			  std::lower_bound(this->dropped.begin(), this->dropped.end(), input, SeqLowerThan()));
 
-			droppedCount -= std::distance(it, this->dropped.end());
 			base = (this->base - droppedCount) & SeqManager::MaxValue;
 		}
 
@@ -191,19 +207,16 @@ namespace RTC
 
 		const size_t previousDroppedSize = this->dropped.size();
 
-		for (auto it = this->dropped.begin(); it != this->dropped.end();)
-		{
-			auto value = *it;
-
-			if (SeqManager<T, N>::IsSeqHigherThan(value, this->maxInput))
-			{
-				it = this->dropped.erase(it);
-			}
-			else
-			{
-				break;
-			}
-		}
+		// Cleanup dropped values.
+		this->dropped.erase(
+		  this->dropped.begin(),
+		  std::find_if(
+		    this->dropped.begin(),
+		    this->dropped.end(),
+		    [this](T value)
+		    {
+			    return !SeqManager<T, N>::IsSeqHigherThan(value, this->maxInput);
+		    }));
 
 		// Adapt base.
 		this->base = (this->base - (previousDroppedSize - this->dropped.size())) & SeqManager::MaxValue;