mediasoup 3.19.19 → 3.19.21

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

@@ -41,11 +41,10 @@ namespace RTC
 
 		Association::Association(const SctpOptions& sctpOptions, AssociationListener* listener)
 		  : sctpOptions(sctpOptions),
-		    // Our `listener` member is a `AssociationDeferredListener` which takes
+		    // Our `listener` member is a `AssociationListenerDeferrer` which takes
 		    // `AssociationListener` as constructor argument.
 		    listener(listener),
-		    // Create the `packetSender` member.
-		    packetSender(*this, this->listener),
+		    packetSender(this, this->listener),
 		    t1InitTimer(
 		      std::make_unique<BackoffTimerHandle>(
 		        /*listener*/ this,
@@ -67,7 +66,6 @@ namespace RTC
 		        /*backoffAlgorithm*/ BackoffTimerHandle::BackoffAlgorithm::EXPONENTIAL,
 		        /*maxBackoffTimeoutMs*/ sctpOptions.timerMaxBackoffTimeoutMs,
 		        /*maxRestarts*/ sctpOptions.maxRetransmissions))
-		// TODO: Set RRSendQueue this->sendQueue.
 		{
 			MS_TRACE();
 		}
@@ -121,11 +119,11 @@ namespace RTC
 			  // Add OS.
 			  // TODO: SCTP: We should put here current value which may be different after
 			  // negotiation with peer and reconfig.
-			  this->sctpOptions.maxOutboundStreams,
+			  this->sctpOptions.announcedMaxOutboundStreams,
 			  // Add MIS.
 			  // TODO: SCTP: We should put here current value which may be different after
 			  // negotiation with peer and reconfig.
-			  this->sctpOptions.maxInboundStreams,
+			  this->sctpOptions.announcedMaxInboundStreams,
 			  // Add maxMessageSize.
 			  this->sctpOptions.maxSendMessageSize,
 			  // Add sendBufferSize.
@@ -134,6 +132,7 @@ namespace RTC
 			  this->sctpOptions.totalBufferedAmountLowThreshold,
 			  // Add isDataChannel.
 			  // TODO: SCTP: Have a member for this.
+			  // TODO: SCTP: So remove this hardcoded `true`.
 			  /*isDataChannel*/ true);
 		}
 
@@ -176,26 +175,55 @@ namespace RTC
 			}
 		}
 
+		void Association::MayConnect()
+		{
+			MS_TRACE();
+
+			// Just run the SCTP stack if our state is 'new'.
+			// Notice that once MayConnect() is called (and the code below is executed),
+			// SCTP state will no longer be "NEW".
+			if (this->state != State::NEW)
+			{
+				MS_DEBUG_DEV("internal Association state is not NEW, ignoring");
+
+				return;
+			}
+
+			// If we haven't received any SCTP packet yet and the transport is not
+			// ready for SCTP traffic, don't do anything.
+			if (this->privateMetrics.rxPacketsCount == 0 && !this->listener.OnAssociationIsTransportReadyForSctp())
+			{
+				MS_DEBUG_DEV(
+				  "no SCTP data has been received yet and transport is not ready for SCTP traffic, ignoring");
+
+				return;
+			}
+
+			MS_DEBUG_DEV("invoking Connect()");
+
+			Connect();
+		}
+
 		void Association::Connect()
 		{
 			MS_TRACE();
 
-			// NOTE: We could only accept NEW state here so once closed the Association
-			// cannot be reused. However there is no real technical reason for it.
-			if (this->state != State::NEW && this->state != State::CLOSED)
+			// NOTE: We only accept NEW state here so once the Association is closed
+			// it cannot be reused. However there is no real technical reason for it.
+			if (this->state != State::NEW)
 			{
 				const auto stateStringView = Association::StateToString(this->state);
 
 				MS_WARN_TAG(
 				  sctp,
-				  "cannot initiate the Association since internal state is not NEW or CLOSED but %.*s",
+				  "cannot initiate the Association since internal state is not NEW but %.*s",
 				  static_cast<int>(stateStringView.size()),
 				  stateStringView.data());
 
 				return;
 			}
 
-			const AssociationDeferredListener::ScopedDeferred deferrer(this->listener);
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
 
 			this->preTcb.localVerificationTag =
 			  Utils::Crypto::GetRandomUInt<uint32_t>(MinVerificationTag, MaxVerificationTag);
@@ -224,7 +252,7 @@ namespace RTC
 				return;
 			}
 
-			const AssociationDeferredListener::ScopedDeferred deferrer(this->listener);
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
 
 			// https://datatracker.ietf.org/doc/html/rfc9260#section-9.2
 			//
@@ -233,12 +261,14 @@ namespace RTC
 			// outstanding data has been acknowledged by its peer."
 			if (this->tcb)
 			{
-				// TODO: Remove this check, as it just hides the problem that the
+				// TODO: dcsctp: Remove this check, as it just hides the problem that the
 				// Association can transition from ShutdownSent to ShutdownPending, or
 				// from ShutdownAckSent to ShutdownPending, which is illegal.
 				//
 				// @see https://issues.webrtc.org/issues/42222897
-				if (this->state != State::SHUTDOWN_SENT && this->state != State::SHUTDOWN_ACK_SENT)
+				if (
+				  this->state != State::SHUTDOWN_SENT && this->state != State::SHUTDOWN_ACK_SENT &&
+				  this->state != State::SHUTDOWN_RECEIVED && this->state != State::SHUTDOWN_PENDING)
 				{
 					this->t1InitTimer->Stop();
 					this->t1CookieTimer->Stop();
@@ -271,7 +301,7 @@ namespace RTC
 				return;
 			}
 
-			const AssociationDeferredListener::ScopedDeferred deferrer(this->listener);
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
 
 			if (this->tcb)
 			{
@@ -306,7 +336,7 @@ namespace RTC
 			// const size_t packetPayloadLength =
 			//   this->sctpOptions.mtu - Packet::CommonHeaderLength - DataChunk::DataChunkHeaderLength;
 
-			// TODO: Implement missing fields.
+			// TODO: SCTP: Implement missing fields.
 			AssociationMetrics metrics{
 				.txPacketsCount  = this->privateMetrics.txPacketsCount,
 				.txMessagesCount = this->privateMetrics.txMessagesCount,
@@ -337,10 +367,10 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// return this->sendQueue.GetStreamPriority(streamId);
 
-			// TODO: Remove.
+			// TODO: SCTP: Remove.
 			return 0;
 		}
 
@@ -348,7 +378,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// this->sendQueue.SetStreamPriority(streamId, priority);
 		}
 
@@ -363,10 +393,10 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// return this->sendQueue.GetStreamBufferedAmount(streamId);
 
-			// TODO: Remove.
+			// TODO: SCTP: Remove.
 			return 0;
 		}
 
@@ -374,10 +404,10 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// return this->sendQueue.GetStreamBufferedAmountLowThreshold(streamId);
 
-			// TODO: Remove.
+			// TODO: SCTP: Remove.
 			return 0;
 		}
 
@@ -385,7 +415,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// this->sendQueue.SetBufferedAmountLowThreshold(streamId, bytes);
 		}
 
@@ -393,13 +423,13 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			const AssociationDeferredListener::ScopedDeferred deferrer(this->listener);
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
 
 			if (!this->tcb)
 			{
 				this->listener.OnAssociationError(
 				  Types::ErrorKind::WRONG_SEQUENCE,
-				  "cannot reset outbound streams as the Association is not connected");
+				  "cannot reset outbound streams as the association is not connected");
 
 				return Types::ResetStreamsStatus::NOT_CONNECTED;
 			}
@@ -413,7 +443,7 @@ namespace RTC
 				return Types::ResetStreamsStatus::NOT_SUPPORTED;
 			}
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// this->tcb->GetStreamResetHandler().ResetStreams(outboundStreamIds);
 
 			MaySendResetStreamsRequest();
@@ -427,7 +457,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			const AssociationDeferredListener::ScopedDeferred deferrer(this->listener);
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
 
 			const auto status = InternalSendMessage(message, sendMessageOptions);
 
@@ -436,17 +466,17 @@ namespace RTC
 				return status;
 			}
 
-			// TODO: Uncomment.
+			// TODO: SCTP: Uncomment.
 			// const uint64_t now = DepLibUV::GetTimeMs();
 
 			this->privateMetrics.txMessagesCount++;
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// this->sendQueue.AddMessage(now, std::move(message), sendMessageOptions);
 
 			if (this->tcb)
 			{
-				// TODO: Implement it.
+				// TODO: SCTP: Implement it.
 				// this->tcb->SendBufferedPackets(now);
 			}
 
@@ -460,9 +490,9 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			const AssociationDeferredListener::ScopedDeferred deferrer(this->listener);
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
 
-			// TODO: Uncomment.
+			// TODO: SCTP: Uncomment.
 			// const uint64_t now = DepLibUV::GetTimeMs();
 			std::vector<Types::SendMessageStatus> statuses;
 
@@ -481,13 +511,13 @@ namespace RTC
 
 				this->privateMetrics.txMessagesCount++;
 
-				// TODO: Implement it.
+				// TODO: SCTP: Implement it.
 				// this->sendQueue.AddMessage(now, std::move(message), sendMessageOptions);
 			}
 
 			if (this->tcb)
 			{
-				// TODO: Implement it.
+				// TODO: SCTP: Implement it.
 				// this->tcb->SendBufferedPackets(now);
 			}
 
@@ -518,10 +548,17 @@ namespace RTC
 				}
 			}
 
-			const AssociationDeferredListener::ScopedDeferred deferrer(this->listener);
-
 			this->privateMetrics.rxPacketsCount++;
 
+			// If we are received SCTP data from the remote peer it means that we may
+			// initiate the SCTP association (if not already connected).
+			MayConnect();
+
+			// NOTE: It's important to create the deferrer here, otherwise it may
+			// happen that MayConnect() ends calling to Connect() so we end with two
+			// nested deferreds (and hence an assertion).
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
+
 			std::unique_ptr<Packet> receivedPacket{ Packet::Parse(data, len) };
 
 			if (!receivedPacket)
@@ -549,7 +586,7 @@ namespace RTC
 			{
 				const auto* receivedChunk = *it;
 
-				if (!ProcessReceivedChunk(receivedPacket.get(), receivedChunk))
+				if (!HandleReceivedChunk(receivedPacket.get(), receivedChunk))
 				{
 					break;
 				}
@@ -557,7 +594,7 @@ namespace RTC
 
 			if (this->tcb)
 			{
-				// TODO: Implement it.
+				// TODO: SCTP: Implement it.
 				// this->tcb->GetDadaTracker().ObservePacketEnd();
 				this->tcb->MaySendSackChunk();
 			}
@@ -608,7 +645,7 @@ namespace RTC
 			if (state == this->state)
 			{
 				MS_WARN_DEV(
-				  "SCTP Association internal state is already %.*s (message: %.*s)",
+				  "SCTP Association internal state is already %.*s (message:\"%.*s\")",
 				  static_cast<int>(stateStringView.size()),
 				  stateStringView.data(),
 				  static_cast<int>(message.size()),
@@ -621,7 +658,7 @@ namespace RTC
 
 			MS_DEBUG_TAG(
 			  sctp,
-			  "SCTP Association internal state changed from %.*s to %.*s (message: %.*s)",
+			  "SCTP Association internal state changed from %.*s to %.*s (message:\"%.*s\")",
 			  static_cast<int>(previousStateStringView.size()),
 			  previousStateStringView.data(),
 			  static_cast<int>(stateStringView.size()),
@@ -696,11 +733,17 @@ namespace RTC
 			  remoteInitialTsn,
 			  remoteAdvertisedReceiverWindowCredit,
 			  tieTag,
-			  negotiatedCapabilities);
-
-			this->privateMetrics.negotiatedMaxOutboundStreams = negotiatedCapabilities.maxOutboundStreams;
-			this->privateMetrics.negotiatedMaxInboundStreams  = negotiatedCapabilities.maxInboundStreams;
-			this->privateMetrics.usesPartialReliability       = negotiatedCapabilities.partialReliability;
+			  negotiatedCapabilities,
+			  [this]()
+			  {
+				  return this->state == State::ESTABLISHED;
+			  });
+
+			this->privateMetrics.negotiatedMaxOutboundStreams =
+			  negotiatedCapabilities.negotiatedMaxOutboundStreams;
+			this->privateMetrics.negotiatedMaxInboundStreams =
+			  negotiatedCapabilities.negotiatedMaxInboundStreams;
+			this->privateMetrics.usesPartialReliability  = negotiatedCapabilities.partialReliability;
 			this->privateMetrics.usesMessageInterleaving = negotiatedCapabilities.messageInterleaving;
 			this->privateMetrics.usesReConfig            = negotiatedCapabilities.reConfig;
 			this->privateMetrics.usesZeroChecksum        = negotiatedCapabilities.zeroChecksum;
@@ -738,8 +781,8 @@ namespace RTC
 
 			initChunk->SetInitiateTag(this->preTcb.localVerificationTag);
 			initChunk->SetAdvertisedReceiverWindowCredit(this->sctpOptions.maxReceiverWindowBufferSize);
-			initChunk->SetNumberOfOutboundStreams(this->sctpOptions.maxOutboundStreams);
-			initChunk->SetNumberOfInboundStreams(this->sctpOptions.maxInboundStreams);
+			initChunk->SetNumberOfOutboundStreams(this->sctpOptions.announcedMaxOutboundStreams);
+			initChunk->SetNumberOfInboundStreams(this->sctpOptions.announcedMaxInboundStreams);
 			initChunk->SetInitialTsn(this->preTcb.localInitialTsn);
 
 			// Insert capabilities related Parameters in the INIT Chunk.
@@ -763,7 +806,7 @@ namespace RTC
 			auto packet               = this->tcb->CreatePacket();
 			const auto* shutdownChunk = packet->BuildChunkInPlace<ShutdownChunk>();
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// shutdownChunk->SetCumulativeTsnAck(this->tcb->GetDataTracker().GetLastCumulativeAckedTsn());
 			shutdownChunk->Consolidate();
 
@@ -793,7 +836,7 @@ namespace RTC
 
 			AssertHasTcb();
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// if (this->tcb->GetRetransmissionQueue().GetUnackedItems() != 0) {
 			//   return;
 			// }
@@ -870,7 +913,7 @@ namespace RTC
 
 			AssertHasTcb();
 
-			// TODO: I don't like this. I don't want to use Packet::AddChunk() (which
+			// TODO: SCTP: I don't like this. I don't want to use Packet::AddChunk() (which
 			// clones the given Chunk). I want to use Packet::BuildChunkInPlace() so
 			// we need that `tcb->GetStreamResetHandler().MakeStreamResetRequest()`
 			// doesn't return a `ReConfigChunk` but something different such as the
@@ -909,7 +952,7 @@ namespace RTC
 
 			AssertHasTcb();
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// while (std::optional<Message> message = this->tcb->GetReassemblyQueue().GetNextMessage())
 			// {
 			// 	this->privateMetrics.rxMessagesCount++;
@@ -964,11 +1007,11 @@ namespace RTC
 
 				this->listener.OnAssociationError(
 				  Types::ErrorKind::WRONG_SEQUENCE,
-				  "cannot send message as the Association is shutting down");
+				  "cannot send message as the association is shutting down");
 
 				return Types::SendMessageStatus::ERROR_SHUTTING_DOWN;
 			}
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// else if (
 			//   this->sendQueue.GetTotalBufferedAmount() >= this->sctpOptions.maxSendBufferSize ||
 			//   this->sendQueue.GetStreamBufferedAmount(message.GetStreamId()) >=
@@ -1082,7 +1125,7 @@ namespace RTC
 
 			// https://datatracker.ietf.org/doc/html/rfc9260#section-5.2.4
 			//
-			// This is handled in ProcessReceivedCookieEchoChunk().
+			// This is handled in HandleReceivedCookieEchoChunk().
 			if (receivedPacket->GetChunksCount() >= 1 && receivedPacket->GetChunkAt(0)->GetType() == Chunk::ChunkType::COOKIE_ECHO)
 			{
 				return true;
@@ -1155,7 +1198,7 @@ namespace RTC
 			}
 		}
 
-		bool Association::ProcessReceivedChunk(const Packet* receivedPacket, const Chunk* receivedChunk)
+		bool Association::HandleReceivedChunk(const Packet* receivedPacket, const Chunk* receivedChunk)
 		{
 			MS_TRACE();
 
@@ -1163,21 +1206,21 @@ namespace RTC
 			{
 				case Chunk::ChunkType::INIT:
 				{
-					ProcessReceivedInitChunk(receivedPacket, static_cast<const InitChunk*>(receivedChunk));
+					HandleReceivedInitChunk(receivedPacket, static_cast<const InitChunk*>(receivedChunk));
 
 					break;
 				}
 
 				case Chunk::ChunkType::INIT_ACK:
 				{
-					ProcessReceivedInitAckChunk(receivedPacket, static_cast<const InitAckChunk*>(receivedChunk));
+					HandleReceivedInitAckChunk(receivedPacket, static_cast<const InitAckChunk*>(receivedChunk));
 
 					break;
 				}
 
 				case Chunk::ChunkType::COOKIE_ECHO:
 				{
-					ProcessReceivedCookieEchoChunk(
+					HandleReceivedCookieEchoChunk(
 					  receivedPacket, static_cast<const CookieEchoChunk*>(receivedChunk));
 
 					break;
@@ -1185,7 +1228,7 @@ namespace RTC
 
 				case Chunk::ChunkType::COOKIE_ACK:
 				{
-					ProcessReceivedCookieAckChunk(
+					HandleReceivedCookieAckChunk(
 					  receivedPacket, static_cast<const CookieAckChunk*>(receivedChunk));
 
 					break;
@@ -1193,7 +1236,7 @@ namespace RTC
 
 				case Chunk::ChunkType::SHUTDOWN:
 				{
-					ProcessReceivedShutdownChunk(
+					HandleReceivedShutdownChunk(
 					  receivedPacket, static_cast<const ShutdownChunk*>(receivedChunk));
 
 					break;
@@ -1201,7 +1244,7 @@ namespace RTC
 
 				case Chunk::ChunkType::SHUTDOWN_ACK:
 				{
-					ProcessReceivedShutdownAckChunk(
+					HandleReceivedShutdownAckChunk(
 					  receivedPacket, static_cast<const ShutdownAckChunk*>(receivedChunk));
 
 					break;
@@ -1209,7 +1252,7 @@ namespace RTC
 
 				case Chunk::ChunkType::SHUTDOWN_COMPLETE:
 				{
-					ProcessReceivedShutdownCompleteChunk(
+					HandleReceivedShutdownCompleteChunk(
 					  receivedPacket, static_cast<const ShutdownCompleteChunk*>(receivedChunk));
 
 					break;
@@ -1217,7 +1260,7 @@ namespace RTC
 
 				case Chunk::ChunkType::OPERATION_ERROR:
 				{
-					ProcessReceivedOperationErrorChunk(
+					HandleReceivedOperationErrorChunk(
 					  receivedPacket, static_cast<const OperationErrorChunk*>(receivedChunk));
 
 					break;
@@ -1225,7 +1268,7 @@ namespace RTC
 
 				case Chunk::ChunkType::ABORT:
 				{
-					ProcessReceivedAbortAssociationChunk(
+					HandleReceivedAbortAssociationChunk(
 					  receivedPacket, static_cast<const AbortAssociationChunk*>(receivedChunk));
 
 					break;
@@ -1233,7 +1276,7 @@ namespace RTC
 
 				case Chunk::ChunkType::HEARTBEAT_REQUEST:
 				{
-					ProcessReceivedHeartbeatRequestChunk(
+					HandleReceivedHeartbeatRequestChunk(
 					  receivedPacket, static_cast<const HeartbeatRequestChunk*>(receivedChunk));
 
 					break;
@@ -1241,7 +1284,7 @@ namespace RTC
 
 				case Chunk::ChunkType::HEARTBEAT_ACK:
 				{
-					ProcessReceivedHeartbeatAckChunk(
+					HandleReceivedHeartbeatAckChunk(
 					  receivedPacket, static_cast<const HeartbeatAckChunk*>(receivedChunk));
 
 					break;
@@ -1249,7 +1292,7 @@ namespace RTC
 
 				case Chunk::ChunkType::RE_CONFIG:
 				{
-					ProcessReceivedReConfigChunk(
+					HandleReceivedReConfigChunk(
 					  receivedPacket, static_cast<const ReConfigChunk*>(receivedChunk));
 
 					break;
@@ -1257,7 +1300,7 @@ namespace RTC
 
 				case Chunk::ChunkType::FORWARD_TSN:
 				{
-					ProcessReceivedForwardTsnChunk(
+					HandleReceivedForwardTsnChunk(
 					  receivedPacket, static_cast<const ForwardTsnChunk*>(receivedChunk));
 
 					break;
@@ -1265,7 +1308,7 @@ namespace RTC
 
 				case Chunk::ChunkType::I_FORWARD_TSN:
 				{
-					ProcessReceivedIForwardTsnChunk(
+					HandleReceivedIForwardTsnChunk(
 					  receivedPacket, static_cast<const IForwardTsnChunk*>(receivedChunk));
 
 					break;
@@ -1273,28 +1316,28 @@ namespace RTC
 
 				case Chunk::ChunkType::DATA:
 				{
-					ProcessReceivedDataChunk(receivedPacket, static_cast<const DataChunk*>(receivedChunk));
+					HandleReceivedDataChunk(receivedPacket, static_cast<const DataChunk*>(receivedChunk));
 
 					break;
 				}
 
 				case Chunk::ChunkType::I_DATA:
 				{
-					ProcessReceivedIDataChunk(receivedPacket, static_cast<const IDataChunk*>(receivedChunk));
+					HandleReceivedIDataChunk(receivedPacket, static_cast<const IDataChunk*>(receivedChunk));
 
 					break;
 				}
 
 				case Chunk::ChunkType::SACK:
 				{
-					ProcessReceivedSackChunk(receivedPacket, static_cast<const SackChunk*>(receivedChunk));
+					HandleReceivedSackChunk(receivedPacket, static_cast<const SackChunk*>(receivedChunk));
 
 					break;
 				}
 
 				default:
 				{
-					return ProcessReceivedUnknownChunk(
+					return HandleReceivedUnknownChunk(
 					  receivedPacket, static_cast<const UnknownChunk*>(receivedChunk));
 				}
 			}
@@ -1302,7 +1345,7 @@ namespace RTC
 			return true;
 		}
 
-		void Association::ProcessReceivedInitChunk(
+		void Association::HandleReceivedInitChunk(
 		  const Packet* /*receivedPacket*/, const InitChunk* receivedInitChunk)
 		{
 			MS_TRACE();
@@ -1381,9 +1424,8 @@ namespace RTC
 			switch (this->state)
 			{
 				case State::NEW:
-				case State::CLOSED:
 				{
-					MS_DEBUG_TAG(sctp, "INIT Chunk received in NEW or CLOSED state (normal scenario)");
+					MS_DEBUG_TAG(sctp, "INIT Chunk received in NEW state (normal scenario)");
 
 					localVerificationTag =
 					  Utils::Crypto::GetRandomUInt<uint32_t>(MinVerificationTag, MaxVerificationTag);
@@ -1392,6 +1434,11 @@ namespace RTC
 					break;
 				}
 
+				case State::CLOSED:
+				{
+					MS_WARN_TAG(sctp, "ignoring INIT Chunk received in CLOSED state)");
+				}
+
 				// https://datatracker.ietf.org/doc/html/rfc9260#section-5.2.1
 				//
 				// "This usually indicates an initialization collision, i.e., each
@@ -1452,8 +1499,8 @@ namespace RTC
 
 			initAckChunk->SetInitiateTag(localVerificationTag);
 			initAckChunk->SetAdvertisedReceiverWindowCredit(this->sctpOptions.maxReceiverWindowBufferSize);
-			initAckChunk->SetNumberOfOutboundStreams(this->sctpOptions.maxOutboundStreams);
-			initAckChunk->SetNumberOfInboundStreams(this->sctpOptions.maxInboundStreams);
+			initAckChunk->SetNumberOfOutboundStreams(this->sctpOptions.announcedMaxOutboundStreams);
+			initAckChunk->SetNumberOfInboundStreams(this->sctpOptions.announcedMaxInboundStreams);
 			initAckChunk->SetInitialTsn(localInitialTsn);
 
 			// Insert a StateCookieParameter in the INIT_ACK Chunk.
@@ -1485,7 +1532,7 @@ namespace RTC
 			  packet.get(), /*writeChecksum*/ !negotiatedCapabilities.zeroChecksum);
 		}
 
-		void Association::ProcessReceivedInitAckChunk(
+		void Association::HandleReceivedInitAckChunk(
 		  const Packet* /*receivedPacket*/, const InitAckChunk* receivedInitAckChunk)
 		{
 			MS_TRACE();
@@ -1547,7 +1594,7 @@ namespace RTC
 			// partly sent message is re-sent in full. The same is true when the
 			// Association is closed and later re-opened, which never happens in
 			// WebRTC, but is a valid operation on the SCTP level.
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// this->sendQueue.Reset();
 
 			CreateTransmissionControlBlock(
@@ -1569,14 +1616,17 @@ namespace RTC
 
 			this->tcb->SetRemoteStateCookie(std::move(remoteStateCookie));
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
+			// TODO: SCTP: tcb->SendBufferedPackets() must check that the remote state cookie
+			// is set in TCB and must send a COOKIE_ECHO Chunk before potentially
+			// buffered messages.
 			// this->tcb->SendBufferedPackets(callbacks_.Now());
 
 			this->t1CookieTimer->Start();
 			this->listener.OnAssociationConnecting();
 		}
 
-		void Association::ProcessReceivedCookieEchoChunk(
+		void Association::HandleReceivedCookieEchoChunk(
 		  const Packet* receivedPacket, const CookieEchoChunk* receivedCookieEchoChunk)
 		{
 			MS_TRACE();
@@ -1606,7 +1656,7 @@ namespace RTC
 
 			if (this->tcb)
 			{
-				if (!ProcessReceivedCookieEchoChunkWithTcb(receivedPacket, cookie.get()))
+				if (!HandleReceivedCookieEchoChunkWithTcb(receivedPacket, cookie.get()))
 				{
 					return;
 				}
@@ -1647,7 +1697,7 @@ namespace RTC
 				// partly sent message is re-sent in full. The same is true when the
 				// Association is closed and later re-opened, which never happens in
 				// WebRTC, but is a valid operation on the SCTP level.
-				// TODO: Implement it.
+				// TODO: SCTP: Implement it.
 				// this->sendQueue.Reset();
 
 				CreateTransmissionControlBlock(
@@ -1670,7 +1720,7 @@ namespace RTC
 			// "A COOKIE ACK chunk MAY be bundled with any pending DATA chunks (and/or
 			// SACK chunks), but the COOKIE ACK chunk MUST be the first chunk in the
 			// packet."
-			// TODO: Implement it. Note that we pass Packet as argument!
+			// TODO: SCTP: Implement it. Note that we pass Packet as argument!
 			// this->tcb->SendBufferedPackets(packet.get(), callbacks_.Now());
 
 			// TODO: SCTP: Remove this since COOKIE_ACK must be sent by
@@ -1679,7 +1729,7 @@ namespace RTC
 			this->packetSender.SendPacket(packet.get());
 		}
 
-		bool Association::ProcessReceivedCookieEchoChunkWithTcb(
+		bool Association::HandleReceivedCookieEchoChunkWithTcb(
 		  const Packet* receivedPacket, const StateCookie* cookie)
 		{
 			MS_TRACE();
@@ -1737,7 +1787,7 @@ namespace RTC
 			  receivedPacket->GetVerificationTag() == this->tcb->GetLocalVerificationTag() &&
 			  cookie->GetRemoteVerificationTag() != this->tcb->GetRemoteVerificationTag())
 			{
-				// TODO: Handle the case in which remote Verification Tag is 0?
+				// TODO: dcsctp: Handle the case in which remote Verification Tag is 0?
 
 				MS_DEBUG_DEV("received COOKIE_ECHO indicating simultaneous associations");
 
@@ -1771,7 +1821,7 @@ namespace RTC
 			return true;
 		}
 
-		void Association::ProcessReceivedCookieAckChunk(
+		void Association::HandleReceivedCookieAckChunk(
 		  const Packet* /*receivedPacket*/, const CookieAckChunk* /*receivedCookieAckChunk*/)
 		{
 			MS_TRACE();
@@ -1794,13 +1844,13 @@ namespace RTC
 
 			SetState(State::ESTABLISHED, "COOKIE_ACK received");
 
-			// TODO: Implement this.
+			// TODO: SCTP: Implement this.
 			// this->tcb->SendBufferedPackets(callbacks_.Now());
 
 			this->listener.OnAssociationConnected();
 		}
 
-		void Association::ProcessReceivedShutdownChunk(
+		void Association::HandleReceivedShutdownChunk(
 		  const Packet* /*receivedPacket*/, const ShutdownChunk* /*receivedShutdownChunk*/)
 		{
 			MS_TRACE();
@@ -1831,18 +1881,16 @@ namespace RTC
 				// state, restarting its T2-shutdown timer.
 				case State::SHUTDOWN_SENT:
 				{
-					SetState(State::SHUTDOWN_ACK_SENT, "SHUTDOWN received");
 					SendShutdownAckChunk();
+					SetState(State::SHUTDOWN_ACK_SENT, "SHUTDOWN received");
 
 					break;
 				}
 
-				// TODO: This case block should be removed and handled by the `default`
-				// case block.
-				//
-				// @see https://issues.webrtc.org/issues/42222897
 				case State::SHUTDOWN_ACK_SENT:
 				{
+					SendShutdownAckChunk();
+
 					break;
 				}
 
@@ -1870,7 +1918,7 @@ namespace RTC
 			}
 		}
 
-		void Association::ProcessReceivedShutdownAckChunk(
+		void Association::HandleReceivedShutdownAckChunk(
 		  const Packet* receivedPacket, const ShutdownAckChunk* /*receivedShutdownAckChunk*/)
 		{
 			MS_TRACE();
@@ -1929,7 +1977,7 @@ namespace RTC
 			}
 		}
 
-		void Association::ProcessReceivedShutdownCompleteChunk(
+		void Association::HandleReceivedShutdownCompleteChunk(
 		  const Packet* /*receivedPacket*/, const ShutdownCompleteChunk* /*receivedShutdownCompleteChunk*/)
 		{
 			MS_TRACE();
@@ -1949,7 +1997,7 @@ namespace RTC
 			InternalClose(Types::ErrorKind::SUCCESS, "");
 		}
 
-		void Association::ProcessReceivedOperationErrorChunk(
+		void Association::HandleReceivedOperationErrorChunk(
 		  const Packet* /*receivedPacket*/, const OperationErrorChunk* receivedOperationErrorChunk)
 		{
 			MS_TRACE();
@@ -1987,7 +2035,7 @@ namespace RTC
 			this->listener.OnAssociationError(Types::ErrorKind::PEER_REPORTED, errorCausesStr);
 		}
 
-		void Association::ProcessReceivedAbortAssociationChunk(
+		void Association::HandleReceivedAbortAssociationChunk(
 		  const Packet* /*receivedPacket*/, const AbortAssociationChunk* receivedAbortAssociationChunk)
 		{
 			MS_TRACE();
@@ -2025,8 +2073,8 @@ namespace RTC
 			InternalClose(Types::ErrorKind::PEER_REPORTED, errorCausesStr);
 		}
 
-		void Association::ProcessReceivedHeartbeatRequestChunk(
-		  const Packet* /*receivedPacket*/, const HeartbeatRequestChunk* /*receivedHeartbeatRequestChunk*/)
+		void Association::HandleReceivedHeartbeatRequestChunk(
+		  const Packet* /*receivedPacket*/, const HeartbeatRequestChunk* receivedHeartbeatRequestChunk)
 		{
 			MS_TRACE();
 
@@ -2035,12 +2083,12 @@ namespace RTC
 				return;
 			}
 
-			// TODO: Implement it.
-			// this->tcb->GetHearbeatHandler().HandleHeartbeatRequest(*std::move(receivedHeartbeatRequestChunk));
+			this->tcb->GetHeartbeatHandler().HandleReceivedHeartbeatRequestChunk(
+			  receivedHeartbeatRequestChunk);
 		}
 
-		void Association::ProcessReceivedHeartbeatAckChunk(
-		  const Packet* /*receivedPacket*/, const HeartbeatAckChunk* /*receivedHeartbeatAckChunk*/)
+		void Association::HandleReceivedHeartbeatAckChunk(
+		  const Packet* /*receivedPacket*/, const HeartbeatAckChunk* receivedHeartbeatAckChunk)
 		{
 			MS_TRACE();
 
@@ -2049,11 +2097,10 @@ namespace RTC
 				return;
 			}
 
-			// TODO: Implement it.
-			// this->tcb->GetHearbeatHandler().HandleHeartbeatAck(*std::move(receivedHeartbeatAckChunk));
+			this->tcb->GetHeartbeatHandler().HandleReceivedHeartbeatAckChunk(receivedHeartbeatAckChunk);
 		}
 
-		void Association::ProcessReceivedReConfigChunk(
+		void Association::HandleReceivedReConfigChunk(
 		  const Packet* /*receivedPacket*/, const ReConfigChunk* /*receivedReConfigChunk*/)
 		{
 			MS_TRACE();
@@ -2063,7 +2110,7 @@ namespace RTC
 				return;
 			}
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// this->tcb->GetStreamResetHandler().HandleReConfig(*std::move(receivedReConfigChunk));
 
 			// Handling this response may result in outgoing stream resets finishing
@@ -2074,7 +2121,7 @@ namespace RTC
 
 			// If a response was processed, pending to-be-reset streams may now have
 			// become unpaused. Try to send more DATA/I_DATA chunks.
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// this->tcb->SendBufferedPackets(callbacks_.Now());
 
 			// If it leaves "deferred reset processing", there may be chunks to
@@ -2082,23 +2129,23 @@ namespace RTC
 			MayDeliverMessages();
 		}
 
-		void Association::ProcessReceivedForwardTsnChunk(
+		void Association::HandleReceivedForwardTsnChunk(
 		  const Packet* receivedPacket, const ForwardTsnChunk* receivedForwardTsnChunk)
 		{
 			MS_TRACE();
 
-			ProcessReceivedAnyForwardTsnChunk(receivedPacket, receivedForwardTsnChunk);
+			HandleReceivedAnyForwardTsnChunk(receivedPacket, receivedForwardTsnChunk);
 		}
 
-		void Association::ProcessReceivedIForwardTsnChunk(
+		void Association::HandleReceivedIForwardTsnChunk(
 		  const Packet* receivedPacket, const IForwardTsnChunk* receivedIForwardTsnChunk)
 		{
 			MS_TRACE();
 
-			ProcessReceivedAnyForwardTsnChunk(receivedPacket, receivedIForwardTsnChunk);
+			HandleReceivedAnyForwardTsnChunk(receivedPacket, receivedIForwardTsnChunk);
 		}
 
-		void Association::ProcessReceivedAnyForwardTsnChunk(
+		void Association::HandleReceivedAnyForwardTsnChunk(
 		  const Packet* /*receivedPacket*/, const AnyForwardTsnChunk* /*receivedAnyForwardTsnChunk*/)
 		{
 			MS_TRACE();
@@ -2134,7 +2181,7 @@ namespace RTC
 				return;
 			}
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// if
 			// (this->tcb->GetDataTracker().HandleForwardTsn(receivedAnyForwardTsnChunk->GetNewCumulativeTsn()))
 			// {
@@ -2147,23 +2194,23 @@ namespace RTC
 			MayDeliverMessages();
 		}
 
-		void Association::ProcessReceivedDataChunk(
+		void Association::HandleReceivedDataChunk(
 		  const Packet* receivedPacket, const DataChunk* receivedDataChunk)
 		{
 			MS_TRACE();
 
-			ProcessReceivedAnyDataChunk(receivedPacket, receivedDataChunk);
+			HandleReceivedAnyDataChunk(receivedPacket, receivedDataChunk);
 		}
 
-		void Association::ProcessReceivedIDataChunk(
+		void Association::HandleReceivedIDataChunk(
 		  const Packet* receivedPacket, const IDataChunk* receivedIDataChunk)
 		{
 			MS_TRACE();
 
-			ProcessReceivedAnyDataChunk(receivedPacket, receivedIDataChunk);
+			HandleReceivedAnyDataChunk(receivedPacket, receivedIDataChunk);
 		}
 
-		void Association::ProcessReceivedAnyDataChunk(
+		void Association::HandleReceivedAnyDataChunk(
 		  const Packet* /*receivedPacket*/, const AnyDataChunk* receivedAnyDataChunk)
 		{
 			MS_TRACE();
@@ -2174,7 +2221,7 @@ namespace RTC
 			}
 
 			const uint32_t tsn = receivedAnyDataChunk->GetTsn();
-			// TODO: Uncomment.
+			// TODO: SCTP: Uncomment.
 			// const bool immediateAck = receivedAnyDataChunk->GetI();
 
 			if (receivedAnyDataChunk->GetUserDataPayloadLength() == 0)
@@ -2196,7 +2243,7 @@ namespace RTC
 				return;
 			}
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// MS_DEBUG_DEV("data received [data length:%" PRIu16 ", queue size:%zu, watermark:%zu,
 			// full:%s, above:%s]", 	receivedAnyDataChunk->GetUserDataLength(),
 			// 	this->tcb->GetReassemblyQueue()->GetQueuedBytes(),
@@ -2205,7 +2252,7 @@ namespace RTC
 			// 	this->tcb->GetReassemblyQueue()->IsAboveWatermark(),
 			// );
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// if (this->tcb->GetReassemblyQueue()->IsFull())
 			// {
 			// 	// If the reassembly queue is full but there are assembled messages
@@ -2247,7 +2294,7 @@ namespace RTC
 			// If the reassembly queue is above its high watermark, only accept data
 			// chunks that increase its cumulative ack tsn in an attempt to fill gaps
 			// to deliver messages.
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// if (this->tcb->GetReassemblyQueue()->IsAboveWatermark())
 			// {
 			// 	MS_WARN_TAG(sctp, "reassembly queue is above watermark");
@@ -2262,7 +2309,7 @@ namespace RTC
 			// 	}
 			// }
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// if (this->tcb->GetDataTracker()->IsTsnValid(tsn))
 			// {
 			// 	MS_WARN_TAG(sctp, "data rejected because of failing TSN validity");
@@ -2270,10 +2317,10 @@ namespace RTC
 			// 	return;
 			// }
 
-			// TODO: Implement it.
+			// TODO: SCTP: Implement it.
 			// if (this->tcb->GetDataTracker()->Observe(tsn, immediateAck))
 			// {
-			// 	// TODO: Here we should have a std::vector<uint8_t> holding the data so
+			// 	// TODO: SCTP: Here we should have a std::vector<uint8_t> holding the data so
 			// 	// we can move it.
 			// 	this->tcb->GetReassemblyQueue()->Add(tsn, std::move(data));
 
@@ -2281,7 +2328,7 @@ namespace RTC
 			// }
 		}
 
-		void Association::ProcessReceivedSackChunk(
+		void Association::HandleReceivedSackChunk(
 		  const Packet* /*receivedPacket*/, const SackChunk* /*receivedSackChunk*/)
 		{
 			MS_TRACE();
@@ -2291,8 +2338,8 @@ namespace RTC
 				return;
 			}
 
-			// TODO: Implement it.
-			// if (this->tcb->GetRetransmissionQueue()->ProcessSack(receivedSackChunk))
+			// TODO: SCTP: Implement it.
+			// if (this->tcb->GetRetransmissionQueue()->HandleReceivedSack(receivedSackChunk))
 			// {
 			// 	MaySendShutdownOrShutdownAckChunk();
 
@@ -2324,7 +2371,7 @@ namespace RTC
 			// }
 		}
 
-		bool Association::ProcessReceivedUnknownChunk(
+		bool Association::HandleReceivedUnknownChunk(
 		  const Packet* /*receivedPacket*/, const UnknownChunk* receivedUnknownChunk)
 		{
 			MS_TRACE();
@@ -2337,7 +2384,7 @@ namespace RTC
 
 			if (skipProcessing)
 			{
-				MS_DEBUG_TAG(
+				MS_WARN_TAG(
 				  sctp,
 				  "Chunk with unknown type %" PRIu8
 				  " received, skipping further processing of Chunks in the Packet",
@@ -2382,6 +2429,8 @@ namespace RTC
 		{
 			MS_TRACE();
 
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
+
 			const auto maxRestarts = this->t1InitTimer->GetMaxRestarts();
 
 			MS_DEBUG_TAG(
@@ -2408,6 +2457,8 @@ namespace RTC
 		{
 			MS_TRACE();
 
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
+
 			const auto maxRestarts = this->t1CookieTimer->GetMaxRestarts();
 
 			MS_DEBUG_TAG(
@@ -2420,7 +2471,7 @@ namespace RTC
 
 			if (this->t1CookieTimer->IsRunning())
 			{
-				// TODO: Implement it.
+				// TODO: SCTP: Implement it.
 				// this->tcb->SendBufferedPackets(now);
 			}
 			else
@@ -2431,10 +2482,15 @@ namespace RTC
 			AssertStateIsConsistent();
 		}
 
-		void Association::OnT2ShutdownTimer(uint64_t& /*baseTimeoutMs*/, bool& /*stop*/)
+		void Association::OnT2ShutdownTimer(uint64_t& baseTimeoutMs, bool& /*stop*/)
 		{
 			MS_TRACE();
 
+			AssertState(State::SHUTDOWN_SENT, State::SHUTDOWN_ACK_SENT);
+			AssertHasTcb();
+
+			const AssociationListenerDeferrer::ScopedDeferrer deferrer(this->listener);
+
 			const auto maxRestarts = this->t2ShutdownTimer->GetMaxRestarts();
 
 			MS_DEBUG_TAG(
@@ -2443,14 +2499,6 @@ namespace RTC
 			  this->t2ShutdownTimer->GetExpirationCount(),
 			  maxRestarts ? std::to_string(maxRestarts.value()).c_str() : "Infinite");
 
-			// https://datatracker.ietf.org/doc/html/rfc9260#section-9.2
-			//
-			// "If the timer expires, the endpoint MUST resend the SHUTDOWN chunk
-			// with the updated last sequential TSN received from its peer."
-			if (this->t2ShutdownTimer->IsRunning())
-			{
-				SendShutdownChunk();
-			}
 			// https://datatracker.ietf.org/doc/html/rfc9260#section-9.2
 			//
 			// "An endpoint SHOULD limit the number of retransmissions of the
@@ -2458,10 +2506,8 @@ namespace RTC
 			// this threshold is exceeded, the endpoint SHOULD destroy the TCB and
 			// SHOULD report the peer endpoint unreachable to the upper layer (and
 			// thus the association enters the CLOSED state)."
-			else
+			if (!this->t2ShutdownTimer->IsRunning())
 			{
-				AssertHasTcb();
-
 				auto packet                 = this->tcb->CreatePacket();
 				auto* abortAssociationChunk = packet->BuildChunkInPlace<AbortAssociationChunk>();
 
@@ -2480,9 +2526,33 @@ namespace RTC
 				this->packetSender.SendPacket(packet.get());
 
 				InternalClose(Types::ErrorKind::TOO_MANY_RETRIES, "no SHUTDOWN_ACK chunk received");
+				AssertStateIsConsistent();
+
+				return;
+			}
+
+			// https://datatracker.ietf.org/doc/html/rfc9260#section-9.2
+			//
+			// "the SHUTDOWN chunk receiver MUST send a SHUTDOWN ACK chunk and start
+			// a T2-shutdown timer of its own, entering the SHUTDOWN-ACK-SENT state.
+			// If the timer expires, the endpoint MUST resend the SHUTDOWN ACK chunk."
+			if (this->state == State::SHUTDOWN_ACK_SENT)
+			{
+				SendShutdownAckChunk();
+			}
+			// https://datatracker.ietf.org/doc/html/rfc9260#section-9.2
+			//
+			// "It SHOULD then start the T2-shutdown timer and enter the SHUTDOWN-SENT
+			// state. If the timer expires, the endpoint MUST resend the SHUTDOWN
+			// chunk with the updated last sequential TSN received from its peer."
+			else
+			{
+				SendShutdownChunk();
 			}
 
 			AssertStateIsConsistent();
+
+			baseTimeoutMs = this->tcb->GetCurrentRtoMs();
 		}
 
 		template<typename... States>
@@ -2558,7 +2628,7 @@ namespace RTC
 
 			this->listener.OnAssociationError(
 			  Types::ErrorKind::NOT_CONNECTED,
-			  "received unexpected commands on Association that is not connected");
+			  "received unexpected commands on association that is not connected");
 
 			return false;
 		}