mediasoup 3.19.21 → 3.20.0

package/worker/include/RTC/SCTP/packet/chunks/AnyForwardTsnChunk.hpp

@@ -20,12 +20,12 @@ namespace RTC
 			struct SkippedStream
 			{
 				SkippedStream(uint16_t streamId, uint16_t ssn)
-				  : streamId(streamId), ssn(ssn), unordered(false), mid(0)
+				  : streamId(streamId), ssn(ssn), mid(0), unordered(false)
 				{
 				}
 
-				SkippedStream(uint16_t streamId, bool unordered, uint32_t mid)
-				  : streamId(streamId), ssn(0), unordered(unordered), mid(mid)
+				SkippedStream(bool unordered, uint16_t streamId, uint32_t mid)
+				  : streamId(streamId), ssn(0), mid(mid), unordered(unordered)
 				{
 				}
 
@@ -39,17 +39,17 @@ namespace RTC
 				/**
 				 * Only set for I_FORWARD_TSN.
 				 */
-				bool unordered;
+				uint32_t mid;
 
 				/**
 				 * Only set for I_FORWARD_TSN.
 				 */
-				uint32_t mid;
+				bool unordered;
 
 				bool operator==(const SkippedStream& other) const
 				{
-					return streamId == other.streamId && ssn == other.ssn && unordered == other.unordered &&
-					       mid == other.mid;
+					return streamId == other.streamId && ssn == other.ssn && mid == other.mid &&
+					       unordered == other.unordered;
 				}
 			};
 
@@ -71,8 +71,8 @@ namespace RTC
 		 */
 		inline std::ostream& operator<<(std::ostream& os, const AnyForwardTsnChunk::SkippedStream& s)
 		{
-			return os << "{streamId:" << s.streamId << ", ssn:" << s.ssn << ", unordered:" << s.unordered
-			          << ", mid:" << s.mid << "}";
+			return os << "{streamId:" << s.streamId << ", ssn:" << s.ssn << ", mid:" << s.mid
+			          << ", unordered:" << s.unordered << "}";
 		}
 	} // namespace SCTP
 } // namespace RTC

package/worker/include/RTC/SCTP/packet/chunks/AnyInitChunk.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_ANY_INIT_CHUNK_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Chunk.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/chunks/DataChunk.hpp

@@ -2,9 +2,9 @@
 #define MS_RTC_SCTP_DATA_CHUNK_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/UserData.hpp"
 #include "RTC/SCTP/packet/chunks/AnyDataChunk.hpp"
+#include "Utils.hpp"
 #include <vector>
 
 namespace RTC
@@ -218,7 +218,7 @@ namespace RTC
 
 			void SetUserDataPayload(const uint8_t* userDataPayload, uint16_t userDataPayloadLength);
 
-			UserData GetUserData() const final
+			UserData MakeUserData() const final
 			{
 				const auto* userData       = GetUserDataPayload();
 				const uint16_t userDataLen = GetUserDataPayloadLength();
@@ -237,6 +237,8 @@ namespace RTC
 				  GetU());
 			}
 
+			void SetUserData(UserData userData);
+
 		protected:
 			DataChunk* SoftClone(const uint8_t* buffer) const final;
 

package/worker/include/RTC/SCTP/packet/chunks/ForwardTsnChunk.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_FORWARD_TSN_CHUNK_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/chunks/AnyForwardTsnChunk.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {
@@ -114,7 +114,7 @@ namespace RTC
 
 			std::vector<AnyForwardTsnChunk::SkippedStream> GetSkippedStreams() const final;
 
-			void AddStream(uint16_t stream, uint16_t streamSequence);
+			void AddSkippedStream(const AnyForwardTsnChunk::SkippedStream& skippedStream);
 
 		protected:
 			ForwardTsnChunk* SoftClone(const uint8_t* buffer) const final;
@@ -129,7 +129,7 @@ namespace RTC
 			}
 
 		private:
-			uint16_t GetStreamIdAt(uint16_t idx) const
+			uint16_t GetSkippedStreamIdAt(uint16_t idx) const
 			{
 				return Utils::Byte::Get2Bytes(GetVariableLengthValuePointer(), (idx * 4));
 			}

package/worker/include/RTC/SCTP/packet/chunks/IDataChunk.hpp

@@ -2,9 +2,9 @@
 #define MS_RTC_SCTP_I_DATA_CHUNK_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/UserData.hpp"
 #include "RTC/SCTP/packet/chunks/AnyDataChunk.hpp"
+#include "Utils.hpp"
 #include <vector>
 
 namespace RTC
@@ -234,7 +234,7 @@ namespace RTC
 
 			void SetUserDataPayload(const uint8_t* userDataPayload, uint16_t userDataPayloadLength);
 
-			UserData GetUserData() const final
+			UserData MakeUserData() const final
 			{
 				const auto* userData       = GetUserDataPayload();
 				const uint16_t userDataLen = GetUserDataPayloadLength();
@@ -253,6 +253,8 @@ namespace RTC
 				  GetU());
 			}
 
+			void SetUserData(UserData userData);
+
 		protected:
 			IDataChunk* SoftClone(const uint8_t* buffer) const final;
 

package/worker/include/RTC/SCTP/packet/chunks/IForwardTsnChunk.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_I_FORWARD_TSN_CHUNK_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/chunks/AnyForwardTsnChunk.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {
@@ -126,7 +126,7 @@ namespace RTC
 
 			std::vector<AnyForwardTsnChunk::SkippedStream> GetSkippedStreams() const final;
 
-			void AddStream(uint16_t stream, bool uFlag, uint32_t messageIdentifier);
+			void AddSkippedStream(const AnyForwardTsnChunk::SkippedStream& skippedStream);
 
 		protected:
 			IForwardTsnChunk* SoftClone(const uint8_t* buffer) const final;
@@ -141,7 +141,7 @@ namespace RTC
 			}
 
 		private:
-			uint16_t GetStreamIdAt(uint16_t idx) const
+			uint16_t GetSkippedStreamIdAt(uint16_t idx) const
 			{
 				return Utils::Byte::Get2Bytes(GetVariableLengthValuePointer(), (idx * 8));
 			}

package/worker/include/RTC/SCTP/packet/chunks/InitAckChunk.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_INIT_ACK_CHUNK_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/chunks/AnyInitChunk.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/chunks/InitChunk.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_INIT_CHUNK_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/chunks/AnyInitChunk.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/chunks/SackChunk.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_SACK_CHUNK_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Chunk.hpp"
+#include "Utils.hpp"
 #include <ostream>
 #include <vector>
 
@@ -154,14 +154,16 @@ namespace RTC
 				return Utils::Byte::Get4Bytes(GetBuffer(), 4);
 			}
 
-			void SetCumulativeTsnAck(uint32_t value);
+			void SetCumulativeTsnAck(uint32_t tsn);
 
 			uint32_t GetAdvertisedReceiverWindowCredit() const
 			{
 				return Utils::Byte::Get4Bytes(GetBuffer(), 8);
 			}
 
-			void SetAdvertisedReceiverWindowCredit(uint32_t value);
+			void SetAdvertisedReceiverWindowCredit(uint32_t aRwnd);
+
+			std::vector<SackChunk::GapAckBlock> GetGapAckBlocks() const;
 
 			std::vector<GapAckBlock> GetValidatedGapAckBlocks() const;
 
@@ -169,6 +171,11 @@ namespace RTC
 
 			void AddAckBlock(uint16_t start, uint16_t end);
 
+			void AddAckBlock(GapAckBlock gapAckBlock)
+			{
+				AddAckBlock(gapAckBlock.start, gapAckBlock.end);
+			}
+
 			void AddDuplicateTsn(uint32_t tsn);
 
 		protected:

package/worker/include/RTC/SCTP/packet/chunks/ShutdownChunk.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_SHUTDOWN_CHUNK_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Chunk.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/errorCauses/InvalidStreamIdentifierErrorCause.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_INVALID_STREAM_IDENTIFIER_ERROR_CAUSE_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/ErrorCause.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/errorCauses/MissingMandatoryParameterErrorCause.hpp

@@ -2,9 +2,9 @@
 #define MS_RTC_SCTP_MISSING_MANDATORY_PARAMETER_ERROR_CAUSE_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/ErrorCause.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/errorCauses/NoUserDataErrorCause.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_NO_USER_DATA_ERROR_CAUSE_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/ErrorCause.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/errorCauses/StaleCookieErrorCause.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_STALE_COOKIE_ERROR_CAUSE_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/ErrorCause.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/parameters/AddIncomingStreamsRequestParameter.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_ADD_INCOMING_STREAMS_REQUEST_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/parameters/AddOutgoingStreamsRequestParameter.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_ADD_OUTGOING_STREAMS_REQUEST_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/parameters/CookiePreservativeParameter.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_COOKIE_PRESERVATIVE_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/parameters/IncomingSsnResetRequestParameter.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_INCOMING_SSN_RESET_REQUEST_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 #include <vector>
 
 namespace RTC

package/worker/include/RTC/SCTP/packet/parameters/OutgoingSsnResetRequestParameter.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_OUTGOING_SSN_RESET_REQUEST_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 #include <vector>
 
 namespace RTC

package/worker/include/RTC/SCTP/packet/parameters/ReconfigurationResponseParameter.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_RECONFIGURATION_RESPONSE_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 #include <string>
 #include <unordered_map>
 

package/worker/include/RTC/SCTP/packet/parameters/SsnTsnResetRequestParameter.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_SSN_TSN_RESET_REQUEST_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/parameters/SupportedAddressTypesParameter.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_SUPPORTED_ADDRESS_TYPES_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/parameters/SupportedExtensionsParameter.hpp

@@ -2,9 +2,9 @@
 #define MS_RTC_SCTP_SUPPORTED_EXTENSIONS_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Chunk.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/include/RTC/SCTP/packet/parameters/ZeroChecksumAcceptableParameter.hpp

@@ -2,8 +2,8 @@
 #define MS_RTC_SCTP_ZERO_CHECKSUM_ACCEPTABLE_PARAMETER_HPP
 
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/SCTP/packet/Parameter.hpp"
+#include "Utils.hpp"
 #include <string>
 #include <unordered_map>
 

package/worker/include/RTC/SCTP/public/AssociationInterface.hpp

@@ -72,7 +72,7 @@ namespace RTC
 			 * Retrieves the latest metrics. If the Association is not fully connected,
 			 * `std::nullopt` will be returned.
 			 */
-			virtual std::optional<AssociationMetrics> GetMetrics() const = 0;
+			virtual std::optional<AssociationMetrics> MakeMetrics() const = 0;
 
 			/**
 			 * Returns the currently set priority for an outgoing stream. The initial
@@ -92,6 +92,12 @@ namespace RTC
 			 */
 			virtual void SetMaxSendMessageSize(size_t maxMessageSize) = 0;
 
+			/**
+			 * Returns the number of bytes of data currently queued to be sent in
+			 * total.
+			 */
+			virtual size_t GetTotalBufferedAmount() const = 0;
+
 			/**
 			 * Returns the number of bytes of data currently queued to be sent on a
 			 * given stream.
@@ -109,7 +115,7 @@ namespace RTC
 			 * considered "low" for a given stream, which will trigger
 			 * `OnAssociationStreamBufferedAmountLow()` event. The default value is 0.
 			 */
-			virtual void SetBufferedAmountLowThreshold(uint16_t streamId, size_t bytes) = 0;
+			virtual void SetStreamBufferedAmountLowThreshold(uint16_t streamId, size_t bytes) = 0;
 
 			/**
 			 * Resetting streams is an asynchronous operation and the results will be
@@ -171,6 +177,20 @@ namespace RTC
 			 * Receives SCTP data (hopefully an SCTP Packet) from the remote peer.
 			 */
 			virtual void ReceiveSctpData(const uint8_t* data, size_t len) = 0;
+
+			/**
+			 * Get negotiated max outbound streams. Returns 0 if the association is
+			 * not yet connected.
+			 */
+			virtual uint16_t GetNegotiatedMaxOutboundStreams() const = 0;
+
+			/**
+			 * Get negotiated max inbound streams. Returns 0 if the association is
+			 * not yet connected.
+			 */
+			virtual uint16_t GetNegotiatedMaxInboundStreams() const = 0;
+
+			virtual bool IsDataChannel() const = 0;
 		};
 	} // namespace SCTP
 } // namespace RTC

package/worker/include/RTC/SCTP/public/{AssociationListener.hpp → AssociationListenerInterface.hpp}

@@ -1,5 +1,5 @@
-#ifndef MS_RTC_SCTP_ASSOCIATION_LISTENER_HPP
-#define MS_RTC_SCTP_ASSOCIATION_LISTENER_HPP
+#ifndef MS_RTC_SCTP_ASSOCIATION_LISTENER_INTERFACE_HPP
+#define MS_RTC_SCTP_ASSOCIATION_LISTENER_INTERFACE_HPP
 
 #include "common.hpp"
 #include "RTC/SCTP/public/Message.hpp"
@@ -11,10 +11,10 @@ namespace RTC
 {
 	namespace SCTP
 	{
-		class AssociationListener
+		class AssociationListenerInterface
 		{
 		public:
-			virtual ~AssociationListener() = default;
+			virtual ~AssociationListenerInterface() = default;
 
 		public:
 			/**
@@ -136,7 +136,7 @@ namespace RTC
 			/**
 			 * Called when the total amount of data buffered (in the entire send
 			 * buffer, for all streams) falls to or below the threshold specified in
-			 * SctpOptions::totalBufferedAmountLowThreshold`.
+			 * `SctpOptions::totalBufferedAmountLowThreshold`.
 			 *
 			 * @remarks
 			 * - It is allowed to call methods in Association within this callback.

package/worker/include/RTC/SCTP/public/Message.hpp

@@ -2,6 +2,7 @@
 #define MS_RTC_SCTP_MESSAGE_HPP
 
 #include "common.hpp"
+#include <span>
 #include <vector>
 
 namespace RTC
@@ -18,18 +19,26 @@ namespace RTC
 		public:
 			Message(uint16_t streamId, uint32_t ppid, std::vector<uint8_t> payload);
 
-			// Move constructor. No need to do anything special since std::vector
-			// already implements move.
+			/**
+			 * Move constructor. No need to do anything special since std::vector
+			 * already implements move.
+			 */
 			Message(Message&& other) = default;
 
-			// Move assignment. No need to do anything special since std::vector
-			// already implements move.
+			/**
+			 * Move assignment. No need to do anything special since std::vector
+			 * already implements move.
+			 */
 			Message& operator=(Message&& other) = default;
 
-			// Disable copy constructor.
+			/**
+			 * Copy constructor disabled.
+			 */
 			Message(const Message&) = delete;
 
-			// Disable copy assignment.
+			/**
+			 * Copy assignment disabled.
+			 */
 			Message& operator=(const Message&) = delete;
 
 			~Message();
@@ -42,14 +51,16 @@ namespace RTC
 				return this->streamId;
 			}
 
+			void SetStreamId(uint16_t streamId);
+
 			uint32_t GetPayloadProtocolId() const
 			{
 				return this->ppid;
 			}
 
-			const uint8_t* GetPayload() const
+			std::span<const uint8_t> GetPayload() const
 			{
-				return this->payload.data();
+				return this->payload;
 			}
 
 			size_t GetPayloadLength() const
@@ -75,9 +86,14 @@ namespace RTC
 				return std::move(this->payload);
 			}
 
+			Message Clone() const
+			{
+				return Message(this->streamId, this->ppid, this->payload);
+			}
+
 		private:
-			uint16_t streamId{ 0 };
-			uint32_t ppid{ 0 };
+			uint16_t streamId;
+			uint32_t ppid;
 			std::vector<uint8_t> payload;
 		};
 	} // namespace SCTP

package/worker/include/RTC/SCTP/public/SctpOptions.hpp

@@ -55,11 +55,22 @@ namespace RTC
 			size_t maxSendMessageSize{ 256 * 1024 };
 
 			/**
-			 * The default stream priority, if not overridden by
-			 * `Association::SetStreamPriority()`. The default value is selected to be
-			 * compatible with https://www.w3.org/TR/webrtc-priority/, section 4.2-4.3.
+			 * Send queue total size limit. It will not be possible to queue more data
+			 * if the queue size is larger than this number.
 			 */
-			uint16_t defaultStreamPriority{ 256 };
+			size_t maxSendBufferSize{ 2000000 };
+
+			/**
+			 * Per stream send queue size limit. Similar to `maxSendBufferSize`, but
+			 * limiting the size of individual streams.
+			 */
+			size_t perStreamSendQueueLimit{ 2000000 };
+
+			/**
+			 * The largest allowed message payload to be received. This value should
+			 * be smaller than `maxReceiverWindowBufferSize`.
+			 */
+			size_t maxReceiveMessageSize{ 256 * 1024 };
 
 			/**
 			 * Maximum received window buffer size. This should be a bit larger than
@@ -72,24 +83,19 @@ namespace RTC
 			 */
 			size_t maxReceiverWindowBufferSize{ 5 * 1024 * 1024 };
 
-			/**
-			 * Send queue total size limit. It will not be possible to queue more data
-			 * if the queue size is larger than this number.
-			 */
-			size_t maxSendBufferSize{ 2000000 };
-
-			/**
-			 * Per stream send queue size limit. Similar to `maxSendBufferSize`, but
-			 * limiting the size of individual streams.
-			 */
-			size_t perStreamSendQueueLimit{ 2000000 };
-
 			/**
 			 * A threshold that, when the amount of data in the send buffer goes below
 			 * this value, will trigger `Association::OnAssociationTotalBufferedAmountLow()`.
 			 */
 			size_t totalBufferedAmountLowThreshold{ 1800000 };
 
+			/**
+			 * The default stream priority, if not overridden by
+			 * `Association::SetStreamPriority()`. The default value is selected to be
+			 * compatible with https://www.w3.org/TR/webrtc-priority/, section 4.2-4.3.
+			 */
+			uint16_t defaultStreamPriority{ 256 };
+
 			/**
 			 * Max allowed RTT value. When the RTT is measured and it's found to be
 			 * larger than this value, it will be discarded and not used for e.g. any
@@ -217,7 +223,7 @@ namespace RTC
 			 * Maximum data retransmit attempts (for DATA, I_DATA and other Chunks).
 			 * Set to std::nullopt for no limit.
 			 */
-			std::optional<size_t> maxRetransmissions{ 10 };
+			std::optional<uint16_t> maxRetransmissions{ 10 };
 
 			/**
 			 * Max.Init.Retransmits. Set to std::nullopt for no limit.
@@ -228,6 +234,7 @@ namespace RTC
 
 			/**
 			 * Enable Partial Reliability Extension.
+			 *
 			 * @see RFC 3758.
 			 */
 			bool enablePartialReliability{ true };
@@ -256,6 +263,8 @@ namespace RTC
 			ZeroChecksumAcceptableParameter::AlternateErrorDetectionMethod zeroChecksumAlternateErrorDetectionMethod{
 				ZeroChecksumAcceptableParameter::AlternateErrorDetectionMethod::NONE
 			};
+
+			void Dump(int indentation = 0) const;
 		};
 
 		/**
@@ -273,13 +282,13 @@ namespace RTC
 			 * received before the lifetime has expired. This is only available if
 			 * the peer supports Partial Reliability Extension (RFC 3758).
 			 */
-			std::optional<uint64_t> lifetime{ std::nullopt };
+			std::optional<uint64_t> lifetimeMs{ std::nullopt };
 
 			/**
 			 * If set, limits the number of retransmissions. This is only available
 			 * if the peer supports Partial Reliability Extension (RFC 3758).
 			 */
-			std::optional<size_t> maxRetransmissions{ std::nullopt };
+			std::optional<uint16_t> maxRetransmissions{ std::nullopt };
 
 			/**
 			 * If set, will generate lifecycle events for this message. See e.g.