mediasoup 3.20.0 → 3.20.2

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

@@ -186,7 +186,7 @@ namespace RTC
 			// SCTP state will no longer be "NEW".
 			if (this->state != State::NEW)
 			{
-				MS_DEBUG_DEV("internal Association state is not NEW, ignoring");
+				MS_DEBUG_DEV("internal association state is not NEW, ignoring");
 
 				return;
 			}
@@ -210,7 +210,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			// NOTE: We only accept NEW state here so once the Association is 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)
 			{
@@ -218,7 +218,7 @@ namespace RTC
 
 				MS_WARN_TAG(
 				  sctp,
-				  "cannot initiate the Association since internal state is not NEW but %.*s",
+				  "cannot initiate the association since internal state is not NEW but %.*s",
 				  static_cast<int>(stateStringView.size()),
 				  stateStringView.data());
 
@@ -264,7 +264,7 @@ namespace RTC
 			if (this->tcb)
 			{
 				// TODO: dcsctp: Remove this check, as it just hides the problem that the
-				// Association can transition from ShutdownSent to ShutdownPending, or
+				// association can transition from ShutdownSent to ShutdownPending, or
 				// from ShutdownAckSent to ShutdownPending, which is illegal.
 				//
 				// @see https://issues.webrtc.org/issues/42222897
@@ -282,7 +282,7 @@ namespace RTC
 			}
 			// Association closed before even starting to connect, or during the
 			// initial connection phase. There is no outstanding data, so the
-			// Association can just be closed (stopping any timers, if any), as this
+			// association can just be closed (stopping any timers, if any), as this
 			// is the application's intention when calling Shutdown().
 			else
 			{
@@ -311,7 +311,7 @@ namespace RTC
 				auto* abortAssociationChunk = packet->BuildChunkInPlace<AbortAssociationChunk>();
 
 				// NOTE: Don't set bit T in the ABORT chunk since TCB knows the
-				// Verification Tag expected by the remote.
+				// verification tag expected by the remote.
 
 				auto* userInitiatedAbortErrorCause =
 				  abortAssociationChunk->BuildErrorCauseInPlace<UserInitiatedAbortErrorCause>();
@@ -565,7 +565,7 @@ namespace RTC
 
 			if (!ValidateReceivedPacket(receivedPacket.get()))
 			{
-				MS_WARN_TAG(sctp, "Packet verification failed, discarded");
+				MS_WARN_TAG(sctp, "packet verification failed, discarded");
 
 				return;
 			}
@@ -670,7 +670,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()),
@@ -683,7 +683,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()),
@@ -804,7 +804,7 @@ namespace RTC
 
 			auto packet = CreatePacket();
 
-			// Insert an INIT Chunk in the Packet.
+			// Insert an INIT chunk in the packet.
 			auto* initChunk = packet->BuildChunkInPlace<InitChunk>();
 
 			initChunk->SetInitiateTag(this->preTcb.localVerificationTag);
@@ -813,7 +813,7 @@ namespace RTC
 			initChunk->SetNumberOfInboundStreams(this->sctpOptions.announcedMaxInboundStreams);
 			initChunk->SetInitialTsn(this->preTcb.localInitialTsn);
 
-			// Insert capabilities related Parameters in the INIT Chunk.
+			// Insert capabilities related parameters in the INIT chunk.
 			AddCapabilitiesParametersToInitOrInitAckChunk(initChunk);
 
 			initChunk->Consolidate();
@@ -1065,11 +1065,11 @@ namespace RTC
 				{
 					MS_WARN_TAG(
 					  sctp,
-					  "Packet with Verification Tag 0 must have a single Chunk and it must be an INIT Chunk, packet discarded");
+					  "packet with verification tag 0 must have a single chunk and it must be an INIT chunk, packet discarded");
 
 					this->associationListenerDeferrer.OnAssociationError(
 					  Types::ErrorKind::PARSE_FAILED,
-					  "packet with Verification Tag 0 must have a single chunk and it must be an INIT chunk");
+					  "packet with verification tag 0 must have a single chunk and it must be an INIT chunk");
 
 					return false;
 				}
@@ -1087,7 +1087,7 @@ namespace RTC
 				const auto* abortAssociationChunk =
 				  static_cast<const AbortAssociationChunk*>(receivedPacket->GetChunkAt(0));
 
-				// We cannot verify the Verification Tag so assume it's okey.
+				// We cannot verify the verification tag so assume it's okey.
 				if (abortAssociationChunk->GetT() && !this->tcb)
 				{
 					return true;
@@ -1104,11 +1104,12 @@ namespace RTC
 				{
 					MS_WARN_TAG(
 					  sctp,
-					  "ABORT Chunk Verification Tag %" PRIu32 " is wrong, packet discarded",
+					  "receievd ABORT chunk has invalid verification tag %" PRIu32 ", packet discarded",
 					  receivedPacket->GetVerificationTag());
 
 					this->associationListenerDeferrer.OnAssociationError(
-					  Types::ErrorKind::PARSE_FAILED, "packet with ABORT chunk has invalid Verification Tag");
+					  Types::ErrorKind::PARSE_FAILED,
+					  "received packet with ABORT chunk has invalid verification tag");
 
 					return false;
 				}
@@ -1124,13 +1125,14 @@ namespace RTC
 				{
 					MS_WARN_TAG(
 					  sctp,
-					  "INIT_ACK Chunk Verification Tag %" PRIu32 " (should be %" PRIu32 ")",
+					  "received INIT-ACK chunk has invalid verification tag %" PRIu32 " (should be %" PRIu32
+					  "), packet discarded",
 					  receivedPacket->GetVerificationTag(),
 					  this->preTcb.localVerificationTag);
 
 					this->associationListenerDeferrer.OnAssociationError(
 					  Types::ErrorKind::PARSE_FAILED,
-					  "packet with INIT_ACK chunk has invalid Verification Tag");
+					  "received packet with INIT-ACK chunk has invalid verification tag");
 
 					return false;
 				}
@@ -1156,7 +1158,7 @@ namespace RTC
 				const auto* shutdownCompleteChunk =
 				  static_cast<const ShutdownCompleteChunk*>(receivedPacket->GetChunkAt(0));
 
-				// We cannot verify the Verification Tag so assume it's okey.
+				// We cannot verify the verification tag so assume it's okey.
 				if (shutdownCompleteChunk->GetT() && !this->tcb)
 				{
 					return true;
@@ -1173,12 +1175,13 @@ namespace RTC
 				{
 					MS_WARN_TAG(
 					  sctp,
-					  "SHUTDOWN_COMPLETE Chunk Verification Tag %" PRIu32 " is wrong, packet discarded",
+					  "received SHUTDOWN-COMPLETE chunk has invalid verification tag %" PRIu32
+					  ", packet discarded",
 					  receivedPacket->GetVerificationTag());
 
 					this->associationListenerDeferrer.OnAssociationError(
 					  Types::ErrorKind::PARSE_FAILED,
-					  "packet with SHUTDOWN_COMPLETE chunk has invalid Verification Tag");
+					  "received packet with SHUTDOWN-COMPLETE chunk has invalid verification tag");
 
 					return false;
 				}
@@ -1200,12 +1203,13 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "invalid Verification Tag %" PRIu32 " (should be %" PRIu32 ")",
+				  "received packet has invalid verification tag %" PRIu32 " (should be %" PRIu32
+				  "), packet discarded",
 				  receivedPacket->GetVerificationTag(),
 				  localVerificationTag);
 
 				this->associationListenerDeferrer.OnAssociationError(
-				  Types::ErrorKind::PARSE_FAILED, "packet has invalid Verification Tag");
+				  Types::ErrorKind::PARSE_FAILED, "packet has invalid verification tag");
 
 				return false;
 			}
@@ -1369,7 +1373,7 @@ namespace RTC
 			// be 0, the receiver MUST silently discard the packet."
 			if (receivedInitChunk->GetInitiateTag() == 0)
 			{
-				MS_WARN_TAG(sctp, "invalid value 0 in Initiate Tagin received INIT Chunk, discarded");
+				MS_WARN_TAG(sctp, "invalid value 0 in Initiate Tag in received INIT chunk, packet discarded");
 
 				return;
 			}
@@ -1388,12 +1392,12 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "invalidNumber of Outbound Streams or Number of Inbound Streams in received INIT Chunk, aborting Association");
+				  "invalid number of outbound streams or number of inbound streams in received INIT chunk, aborting association");
 
 				auto packet                 = CreatePacketWithVerificationTag(0);
 				auto* abortAssociationChunk = packet->BuildChunkInPlace<AbortAssociationChunk>();
 
-				// NOTE: We are not setting the Verification Tag expected by the peer
+				// NOTE: We are not setting the verification tag expected by the peer
 				// so must set be T to 1.
 				abortAssociationChunk->SetT(true);
 
@@ -1401,7 +1405,7 @@ namespace RTC
 				  abortAssociationChunk->BuildErrorCauseInPlace<ProtocolViolationErrorCause>();
 
 				protocolViolationErrorCause->SetAdditionalInformation(
-				  "invalid value 0 in Number of Outbound Streams or Number of Inbound Streams in received INIT chunk");
+				  "invalid value 0 in number of outbound streams or number of inbound streams in received INIT chunk");
 
 				protocolViolationErrorCause->Consolidate();
 				abortAssociationChunk->Consolidate();
@@ -1423,7 +1427,7 @@ namespace RTC
 			if (this->state == State::SHUTDOWN_ACK_SENT)
 			{
 				MS_DEBUG_TAG(
-				  sctp, "INIT Chunk received in SHUTDOWN_ACK_SENT state, retransmitting SHUTDOWN_ACK Chunk");
+				  sctp, "INIT chunk received in SHUTDOWN_ACK_SENT state, retransmitting SHUTDOWN-ACK chunk");
 
 				SendShutdownAckChunk();
 
@@ -1438,7 +1442,7 @@ namespace RTC
 			{
 				case State::NEW:
 				{
-					MS_DEBUG_TAG(sctp, "INIT Chunk received in NEW state (normal scenario)");
+					MS_DEBUG_TAG(sctp, "INIT chunk received in NEW state (normal scenario)");
 
 					localVerificationTag =
 					  Utils::Crypto::GetRandomUInt<uint32_t>(MinVerificationTag, MaxVerificationTag);
@@ -1449,7 +1453,7 @@ 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)");
 				}
 
 				// https://datatracker.ietf.org/doc/html/rfc9260#section-5.2.1
@@ -1463,7 +1467,7 @@ namespace RTC
 				case State::COOKIE_WAIT:
 				case State::COOKIE_ECHOED:
 				{
-					MS_DEBUG_TAG(sctp, "INIT Chunk received after sending INIT Chunk (collision, no problem)");
+					MS_DEBUG_TAG(sctp, "INIT chunk received after sending INIT chunk (collision, no problem)");
 
 					localVerificationTag = this->preTcb.localVerificationTag;
 					localInitialTsn      = this->preTcb.localInitialTsn;
@@ -1484,7 +1488,7 @@ namespace RTC
 				{
 					AssertHasTcb();
 
-					MS_DEBUG_TAG(sctp, "INIT Chunk received (probably peer restarted)");
+					MS_DEBUG_TAG(sctp, "INIT chunk received (probably peer restarted)");
 
 					localVerificationTag =
 					  Utils::Crypto::GetRandomUInt<uint32_t>(MinVerificationTag, MaxVerificationTag);
@@ -1496,18 +1500,18 @@ namespace RTC
 
 			MS_DEBUG_TAG(
 			  sctp,
-			  "initiating Association [localVerificationTag:%" PRIu32 ", localInitialTsn:%" PRIu32
+			  "initiating association [localVerificationTag:%" PRIu32 ", localInitialTsn:%" PRIu32
 			  ", remoteVerificationTag:%" PRIu32 ", remoteInitialTsn:%" PRIu32 "]",
 			  localVerificationTag,
 			  localInitialTsn,
 			  receivedInitChunk->GetInitiateTag(),
 			  receivedInitChunk->GetInitialTsn());
 
-			/* Send a Packet with an INIT_ACK Chunk. */
+			/* Send a packet with an INIT-ACK chunk. */
 
 			auto packet = CreatePacketWithVerificationTag(receivedInitChunk->GetInitiateTag());
 
-			// Insert an INIT_ACK Chunk in the Packet.
+			// Insert an INIT-ACK chunk in the packet.
 			auto* initAckChunk = packet->BuildChunkInPlace<InitAckChunk>();
 
 			initAckChunk->SetInitiateTag(localVerificationTag);
@@ -1516,13 +1520,13 @@ namespace RTC
 			initAckChunk->SetNumberOfInboundStreams(this->sctpOptions.announcedMaxInboundStreams);
 			initAckChunk->SetInitialTsn(localInitialTsn);
 
-			// Insert a StateCookieParameter in the INIT_ACK Chunk.
+			// Insert a StateCookieParameter in the INIT-ACK chunk.
 			auto* stateCookieParameter = initAckChunk->BuildParameterInPlace<StateCookieParameter>();
 
 			const auto negotiatedCapabilities =
 			  NegotiatedCapabilities::Factory(this->sctpOptions, receivedInitChunk);
 
-			// Write the StateCookie in place in the Parameter.
+			// Write the StateCookie in place in the parameter.
 			stateCookieParameter->WriteStateCookieInPlace(
 			  localVerificationTag,
 			  receivedInitChunk->GetInitiateTag(),
@@ -1534,7 +1538,7 @@ namespace RTC
 
 			stateCookieParameter->Consolidate();
 
-			// Insert capabilities related Parameters in the INIT_ACK Chunk.
+			// Insert capabilities related parameters in the INIT-ACK chunk.
 			AddCapabilitiesParametersToInitOrInitAckChunk(initAckChunk);
 
 			initAckChunk->Consolidate();
@@ -1557,7 +1561,7 @@ namespace RTC
 			// INIT ACK chunk."
 			if (this->state != State::COOKIE_WAIT)
 			{
-				MS_DEBUG_TAG(sctp, "ignoring received INIT_ACK Chunk when not in COOKIE_WAIT state");
+				MS_DEBUG_TAG(sctp, "ignoring INIT-ACK chunk when not in COOKIE_WAIT state");
 
 				return;
 			}
@@ -1567,13 +1571,12 @@ namespace RTC
 
 			if (!stateCookieParameter || !stateCookieParameter->GetCookie())
 			{
-				MS_WARN_TAG(
-				  sctp, "ignoring received INIT_ACK Chunk without StateCookieParameter or without Cookie");
+				MS_WARN_TAG(sctp, "ignoring INIT-ACK chunk without StateCookieParameter or without cookie");
 
 				auto packet = CreatePacketWithVerificationTag(this->preTcb.localVerificationTag);
 				auto* abortAssociationChunk = packet->BuildChunkInPlace<AbortAssociationChunk>();
 
-				// NOTE: We are not setting the Verification Tag expected by the peer
+				// NOTE: We are not setting the verification tag expected by the peer
 				// so must set be T to 1.
 				abortAssociationChunk->SetT(true);
 
@@ -1581,7 +1584,7 @@ namespace RTC
 				  abortAssociationChunk->BuildErrorCauseInPlace<ProtocolViolationErrorCause>();
 
 				protocolViolationErrorCause->SetAdditionalInformation(
-				  "INIT_ACK without State Cookie Parameter or without Cookie");
+				  "INIT-ACK without State Cookie parameter or without cookie");
 
 				protocolViolationErrorCause->Consolidate();
 				abortAssociationChunk->Consolidate();
@@ -1589,7 +1592,7 @@ namespace RTC
 				this->packetSender.SendPacket(packet.get());
 
 				InternalClose(
-				  Types::ErrorKind::PROTOCOL_VIOLATION, "received INIT_ACK chunk doesn't contain a Cookie");
+				  Types::ErrorKind::PROTOCOL_VIOLATION, "received INIT-ACK chunk doesn't contain a cookie");
 
 				return;
 			}
@@ -1602,10 +1605,10 @@ namespace RTC
 			const auto negotiatedCapabilities =
 			  NegotiatedCapabilities::Factory(this->sctpOptions, receivedInitAckChunk);
 
-			// If the Association is re-established (peer restarted, but re-used old
-			// Association), make sure that all message identifiers are reset and any
+			// If the association is re-established (peer restarted, but re-used old
+			// association), make sure that all message identifiers are reset and any
 			// 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
+			// association is closed and later re-opened, which never happens in
 			// WebRTC, but is a valid operation on the SCTP level.
 			this->sendQueue.Reset();
 
@@ -1618,9 +1621,9 @@ namespace RTC
 			  /*tieTag*/ Utils::Crypto::GetRandomUInt<uint64_t>(0, MaxTieTag),
 			  negotiatedCapabilities);
 
-			SetState(State::COOKIE_ECHOED, "INIT_ACK received");
+			SetState(State::COOKIE_ECHOED, "INIT-ACK received");
 
-			// The Association isn't fully established just yet. Store the stat
+			// The association isn't fully established just yet. Store the stat
 			// cookie in the TCB.
 			std::vector<uint8_t> remoteStateCookie(
 			  stateCookieParameter->GetCookie(),
@@ -1643,10 +1646,10 @@ namespace RTC
 
 			if (!receivedCookieEchoChunk->HasCookie())
 			{
-				MS_WARN_TAG(sctp, "ignoring received COOKIE_ECHO Chunk without Cookie");
+				MS_WARN_TAG(sctp, "ignoring invalid COOKIE-ECHO chunk without cookie");
 
 				this->associationListenerDeferrer.OnAssociationError(
-				  Types::ErrorKind::PARSE_FAILED, "received COOKIE_ECHO Chunk without Cookie");
+				  Types::ErrorKind::PARSE_FAILED, "received COOKIE-ECHO chunk has no cookie");
 
 				return;
 			}
@@ -1656,10 +1659,10 @@ namespace RTC
 
 			if (!cookie)
 			{
-				MS_WARN_TAG(sctp, "failed to parse Cookie in received COOKIE_ECHO Chunk");
+				MS_WARN_TAG(sctp, "failed to parse cookie in received COOKIE-ECHO chunk");
 
 				this->associationListenerDeferrer.OnAssociationError(
-				  Types::ErrorKind::PARSE_FAILED, "received COOKIE_ECHO Chunk with invalid Cookie");
+				  Types::ErrorKind::PARSE_FAILED, "received COOKIE-ECHO chunk with invalid cookie");
 
 				return;
 			}
@@ -1675,11 +1678,11 @@ namespace RTC
 			{
 				if (receivedPacket->GetVerificationTag() != cookie->GetLocalVerificationTag())
 				{
-					MS_WARN_TAG(sctp, "received COOKIE_ECHO Chunk with invalid Verification Tag");
+					MS_WARN_TAG(sctp, "received COOKIE-ECHO chunk with invalid verification tag");
 
 					this->associationListenerDeferrer.OnAssociationError(
 					  Types::ErrorKind::PARSE_FAILED,
-					  "received COOKIE_ECHO Chunk with invalid Verification Tag");
+					  "received COOKIE-ECHO chunk with invalid verification tag");
 
 					return;
 				}
@@ -1695,17 +1698,17 @@ namespace RTC
 					this->tcb->ClearRemoteStateCookie();
 				}
 
-				SetState(State::ESTABLISHED, "COOKIE_ECHO received");
+				SetState(State::ESTABLISHED, "COOKIE-ECHO received");
 
 				this->associationListenerDeferrer.OnAssociationConnected();
 			}
 
 			if (!this->tcb)
 			{
-				// If the Association is re-established (peer restarted, but re-used old
-				// Association), make sure that all message identifiers are reset and any
+				// If the association is re-established (peer restarted, but re-used old
+				// association), make sure that all message identifiers are reset and any
 				// 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
+				// association is closed and later re-opened, which never happens in
 				// WebRTC, but is a valid operation on the SCTP level.
 				this->sendQueue.Reset();
 
@@ -1734,7 +1737,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			MS_DEBUG_DEV("handling COOKIE_ECHO with TCB");
+			MS_DEBUG_DEV("handling COOKIE-ECHO with TCB");
 
 			AssertHasTcb();
 
@@ -1769,12 +1772,12 @@ namespace RTC
 
 					this->packetSender.SendPacket(packet.get());
 					this->associationListenerDeferrer.OnAssociationError(
-					  Types::ErrorKind::WRONG_SEQUENCE, "received COOKIE_ECHO while shutting down");
+					  Types::ErrorKind::WRONG_SEQUENCE, "received COOKIE-ECHO while shutting down");
 
 					return false;
 				}
 
-				MS_DEBUG_DEV("received COOKIE_ECHO indicating a restarted peer");
+				MS_DEBUG_DEV("received COOKIE-ECHO indicating a restarted peer");
 
 				this->tcb = nullptr;
 				this->associationListenerDeferrer.OnAssociationRestarted();
@@ -1786,9 +1789,9 @@ namespace RTC
 			  receivedPacket->GetVerificationTag() == this->tcb->GetLocalVerificationTag() &&
 			  cookie->GetRemoteVerificationTag() != this->tcb->GetRemoteVerificationTag())
 			{
-				// TODO: dcsctp: 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");
+				MS_DEBUG_DEV("received COOKIE-ECHO indicating simultaneous associations");
 
 				this->tcb = nullptr;
 			}
@@ -1802,7 +1805,7 @@ namespace RTC
 			  cookie->GetRemoteVerificationTag() == this->tcb->GetRemoteVerificationTag() &&
 			  cookie->GetTieTag() == this->tcb->GetTieTag())
 			{
-				MS_DEBUG_DEV("received COOKIE_ECHO indicating a late COOKIE_ECHO, discarding");
+				MS_DEBUG_DEV("received COOKIE-ECHO indicating a late COOKIE-ECHO, discarding");
 
 				return false;
 			}
@@ -1814,7 +1817,7 @@ namespace RTC
 			  cookie->GetRemoteVerificationTag() == this->tcb->GetRemoteVerificationTag())
 			{
 				MS_DEBUG_DEV(
-				  "received duplicate COOKIE_ECHO, probably because of peer not receiving COOKIE_ACK and retransmitting COOKIE_ECHO");
+				  "received duplicate COOKIE-ECHO, probably because of peer not receiving COOKIE-ACK and retransmitting COOKIE-ECHO");
 			}
 
 			return true;
@@ -1831,7 +1834,7 @@ namespace RTC
 			// discard a received COOKIE ACK chunk."
 			if (this->state != State::COOKIE_ECHOED)
 			{
-				MS_DEBUG_DEV("received COOKIE_ACK not in COOKIE_ECHOED state, discarding");
+				MS_DEBUG_DEV("received COOKIE-ACK not in COOKIE_ECHOED state, discarding");
 
 				return;
 			}
@@ -1841,7 +1844,7 @@ namespace RTC
 			this->t1CookieTimer->Stop();
 			this->tcb->ClearRemoteStateCookie();
 
-			SetState(State::ESTABLISHED, "COOKIE_ACK received");
+			SetState(State::ESTABLISHED, "COOKIE-ACK received");
 
 			const uint64_t nowMs = this->shared->GetTimeMs();
 
@@ -1910,7 +1913,7 @@ namespace RTC
 				//   SHUTDOWN chunk sender."
 				default:
 				{
-					MS_DEBUG_DEV("received SHUTDOWN, shutting down the Association");
+					MS_DEBUG_DEV("received SHUTDOWN, shutting down the association");
 
 					SetState(State::SHUTDOWN_RECEIVED, "SHUTDOWN received");
 					MaySendShutdownOrShutdownAckChunk();
@@ -1937,8 +1940,8 @@ namespace RTC
 					auto packet                       = this->tcb->CreatePacket();
 					const auto* shutdownCompleteChunk = packet->BuildChunkInPlace<ShutdownCompleteChunk>();
 
-					// NOTE: Don't set bit T in the SHUTDOWN_COMPLETE chunk since TCB
-					// knows the Verification Tag expected by the remote.
+					// NOTE: Don't set bit T in the SHUTDOWN-COMPLETE chunk since TCB
+					// knows the verification tag expected by the remote.
 
 					shutdownCompleteChunk->Consolidate();
 
@@ -2024,13 +2027,13 @@ namespace RTC
 			{
 				MS_DEBUG_TAG(
 				  sctp,
-				  "received OPERATION_ERROR Chunk on a Association with no TCB, ignoring: %s",
+				  "received OPERATION-ERROR chunk on a association with no TCB, ignoring: %s",
 				  errorCausesStr.c_str());
 
 				return;
 			}
 
-			MS_WARN_TAG(sctp, "received OPERATION_ERROR Chunk: %s", errorCausesStr.c_str());
+			MS_WARN_TAG(sctp, "received OPERATION-ERROR chunk: %s", errorCausesStr.c_str());
 
 			this->associationListenerDeferrer.OnAssociationError(
 			  Types::ErrorKind::PEER_REPORTED, errorCausesStr);
@@ -2063,13 +2066,13 @@ namespace RTC
 			{
 				MS_DEBUG_TAG(
 				  sctp,
-				  "received ABORT Chunk on a Association with no TCB, ignoring: %s",
+				  "received ABORT chunk on a association with no TCB, ignoring: %s",
 				  errorCausesStr.c_str());
 
 				return;
 			}
 
-			MS_WARN_TAG(sctp, "received ABORT Chunk, closing Association: %s", errorCausesStr.c_str());
+			MS_WARN_TAG(sctp, "received ABORT chunk, closing association: %s", errorCausesStr.c_str());
 
 			InternalClose(Types::ErrorKind::PEER_REPORTED, errorCausesStr);
 		}
@@ -2120,7 +2123,7 @@ namespace RTC
 			MaySendResetStreamsRequest();
 
 			// If a response was processed, pending to-be-reset streams may now have
-			// become unpaused. Try to send more DATA/I_DATA chunks.
+			// become unpaused. Try to send more DATA/I-DATA chunks.
 			const uint64_t nowMs = this->shared->GetTimeMs();
 
 			this->tcb->SendBufferedPackets(nowMs);
@@ -2162,7 +2165,7 @@ namespace RTC
 				auto* abortAssociationChunk = packet->BuildChunkInPlace<AbortAssociationChunk>();
 
 				// NOTE: Don't set bit T in the ABORT chunk since TCB knows the
-				// Verification Tag expected by the remote.
+				// verification tag expected by the remote.
 
 				auto* protocolViolationErrorCause =
 				  abortAssociationChunk->BuildErrorCauseInPlace<ProtocolViolationErrorCause>();
@@ -2263,7 +2266,7 @@ namespace RTC
 				// If the reassembly queue is full and there's no messages waiting,
 				// there is nothing that can be done. The specification only allows
 				// dropping gap-ack-blocks, and that's not likely to help as the
-				// Association has been trying to fill gaps since the watermark was
+				// association has been trying to fill gaps since the watermark was
 				// reached.
 				else
 				{
@@ -2271,7 +2274,7 @@ namespace RTC
 					auto* abortAssociationChunk = packet->BuildChunkInPlace<AbortAssociationChunk>();
 
 					// NOTE: Don't set bit T in the ABORT chunk since TCB knows the
-					// Verification Tag expected by the remote.
+					// verification tag expected by the remote.
 
 					auto* outOfResourceErrorCause =
 					  abortAssociationChunk->BuildErrorCauseInPlace<OutOfResourceErrorCause>();
@@ -2338,7 +2341,7 @@ namespace RTC
 			{
 				MaySendShutdownOrShutdownAckChunk();
 
-				// Receiving an ACK may make the Association go into fast recovery mode.
+				// Receiving an ACK may make the association go into fast recovery mode.
 				//
 				// https://datatracker.ietf.org/doc/html/rfc9260#section-7.2.4
 				//
@@ -2379,15 +2382,15 @@ namespace RTC
 			{
 				MS_WARN_TAG(
 				  sctp,
-				  "Chunk with unknown type %" PRIu8
-				  " received, skipping further processing of Chunks in the Packet",
+				  "chunk with unknown type %" PRIu8
+				  " received, skipping further processing of chunks in the packet",
 				  static_cast<uint8_t>(receivedUnknownChunk->GetType()));
 			}
 			else
 			{
 				MS_DEBUG_TAG(
 				  sctp,
-				  "ignoring received Chunk with unknown type %" PRIu8,
+				  "ignoring received chunk with unknown type %" PRIu8,
 				  static_cast<uint8_t>(receivedUnknownChunk->GetType()));
 			}
 
@@ -2397,7 +2400,7 @@ namespace RTC
 				  Types::ErrorKind::PARSE_FAILED, "unknown chunk with type indicating it should be reported");
 
 				// If there is TCB (we need correct remote verification tag) send an
-				// OPERATION_ERROR Chunk with a Unrecognized Chunk Type Error Cause.
+				// OPERATION-ERROR chunk with a Unrecognized Chunk type error cause.
 				if (this->tcb)
 				{
 					auto packet               = this->tcb->CreatePacket();
@@ -2432,7 +2435,7 @@ namespace RTC
 			}
 			else
 			{
-				InternalClose(Types::ErrorKind::TOO_MANY_RETRIES, "no INIT_ACK chunk received");
+				InternalClose(Types::ErrorKind::TOO_MANY_RETRIES, "no INIT-ACK chunk received");
 			}
 
 			AssertIsConsistent();
@@ -2454,7 +2457,7 @@ namespace RTC
 			}
 			else
 			{
-				InternalClose(Types::ErrorKind::TOO_MANY_RETRIES, "no COOKIE_ACK chunk received");
+				InternalClose(Types::ErrorKind::TOO_MANY_RETRIES, "no COOKIE-ACK chunk received");
 			}
 
 			AssertIsConsistent();
@@ -2482,7 +2485,7 @@ namespace RTC
 				auto* abortAssociationChunk = packet->BuildChunkInPlace<AbortAssociationChunk>();
 
 				// NOTE: Don't set bit T in the ABORT chunk since TCB knows the
-				// Verification Tag expected by the remote.
+				// verification tag expected by the remote.
 
 				auto* userInitiatedAbortErrorCause =
 				  abortAssociationChunk->BuildErrorCauseInPlace<UserInitiatedAbortErrorCause>();
@@ -2495,7 +2498,7 @@ namespace RTC
 
 				this->packetSender.SendPacket(packet.get());
 
-				InternalClose(Types::ErrorKind::TOO_MANY_RETRIES, "no SHUTDOWN_ACK chunk received");
+				InternalClose(Types::ErrorKind::TOO_MANY_RETRIES, "no SHUTDOWN-ACK chunk received");
 
 				AssertIsConsistent();
 
@@ -2640,7 +2643,7 @@ namespace RTC
 					  !this->t1InitTimer->IsRunning(), "internal state is NEW but T1 Init timer is running");
 					MS_ASSERT(
 					  !this->t1CookieTimer->IsRunning(),
-					  "internal state is NEW but T1 Cookie timer is running");
+					  "internal state is NEW but T1 cookie timer is running");
 					MS_ASSERT(
 					  !this->t2ShutdownTimer->IsRunning(),
 					  "internal state is NEW but T2 Shutdown timer is running");
@@ -2655,7 +2658,7 @@ namespace RTC
 					  !this->t1InitTimer->IsRunning(), "internal state is CLOSED but T1 Init timer is running");
 					MS_ASSERT(
 					  !this->t1CookieTimer->IsRunning(),
-					  "internal state is CLOSED but T1 Cookie timer is running");
+					  "internal state is CLOSED but T1 cookie timer is running");
 					MS_ASSERT(
 					  !this->t2ShutdownTimer->IsRunning(),
 					  "internal state is CLOSED but T2 Shutdown timer is running");
@@ -2671,7 +2674,7 @@ namespace RTC
 					  "internal state is COOKIE_WAIT but T1 Init timer is not running");
 					MS_ASSERT(
 					  !this->t1CookieTimer->IsRunning(),
-					  "internal state is COOKIE_WAIT but T1 Cookie timer is running");
+					  "internal state is COOKIE_WAIT but T1 cookie timer is running");
 					MS_ASSERT(
 					  !this->t2ShutdownTimer->IsRunning(),
 					  "internal state is COOKIE_WAIT but T2 Shutdown timer is running");
@@ -2687,7 +2690,7 @@ namespace RTC
 					  "internal state is COOKIE_ECHOED but T1 Init timer is not running");
 					MS_ASSERT(
 					  this->t1CookieTimer->IsRunning(),
-					  "internal state is COOKIE_ECHOED but T1 Cookie timer is not running");
+					  "internal state is COOKIE_ECHOED but T1 cookie timer is not running");
 					MS_ASSERT(
 					  !this->t2ShutdownTimer->IsRunning(),
 					  "internal state is COOKIE_ECHOED but T2 Shutdown timer is running");
@@ -2706,7 +2709,7 @@ namespace RTC
 					  "internal state is ESTABLISHED but T1 Init timer is running");
 					MS_ASSERT(
 					  !this->t1CookieTimer->IsRunning(),
-					  "internal state is ESTABLISHED but T1 Cookie timer is running");
+					  "internal state is ESTABLISHED but T1 cookie timer is running");
 					MS_ASSERT(
 					  !this->t2ShutdownTimer->IsRunning(),
 					  "internal state is ESTABLISHED but T2 Shutdown timer is running");
@@ -2722,7 +2725,7 @@ namespace RTC
 					  "internal state is SHUTDOWN_PENDING but T1 Init timer is running");
 					MS_ASSERT(
 					  !this->t1CookieTimer->IsRunning(),
-					  "internal state is SHUTDOWN_PENDING but T1 Cookie timer is running");
+					  "internal state is SHUTDOWN_PENDING but T1 cookie timer is running");
 					MS_ASSERT(
 					  !this->t2ShutdownTimer->IsRunning(),
 					  "internal state is SHUTDOWN_PENDING but T2 Shutdown timer is running");
@@ -2738,7 +2741,7 @@ namespace RTC
 					  "internal state is SHUTDOWN_SENT but T1 Init timer is running");
 					MS_ASSERT(
 					  !this->t1CookieTimer->IsRunning(),
-					  "internal state is SHUTDOWN_SENT but T1 Cookie timer is running");
+					  "internal state is SHUTDOWN_SENT but T1 cookie timer is running");
 					MS_ASSERT(
 					  this->t2ShutdownTimer->IsRunning(),
 					  "internal state is SHUTDOWN_SENT but T2 Shutdown timer is not running");
@@ -2754,7 +2757,7 @@ namespace RTC
 					  "internal state is SHUTDOWN_RECEIVED but T1 Init timer is running");
 					MS_ASSERT(
 					  !this->t1CookieTimer->IsRunning(),
-					  "internal state is SHUTDOWN_RECEIVED but T1 Cookie timer is running");
+					  "internal state is SHUTDOWN_RECEIVED but T1 cookie timer is running");
 					MS_ASSERT(
 					  !this->t2ShutdownTimer->IsRunning(),
 					  "internal state is SHUTDOWN_RECEIVED but T2 Shutdown timer is running");
@@ -2770,7 +2773,7 @@ namespace RTC
 					  "internal state is SHUTDOWN_ACK_SENT but T1 Init timer is running");
 					MS_ASSERT(
 					  !this->t1CookieTimer->IsRunning(),
-					  "internal state is SHUTDOWN_ACK_SENT but T1 Cookie timer is running");
+					  "internal state is SHUTDOWN_ACK_SENT but T1 cookie timer is running");
 					MS_ASSERT(
 					  this->t2ShutdownTimer->IsRunning(),
 					  "internal state is SHUTDOWN_ACK_SENT but T2 Shutdown timer is not running");