[SCTP] Socket (part 2)

worker/fuzzer/src/FuzzerUtils.cpp

@@ -59,7 +59,7 @@ void Fuzzer::Utils::Fuzz(const uint8_t* data, size_t len)
 
 	/* Crypto class. */
 
-	::Utils::Crypto::GetRandomUInt(static_cast<uint32_t>(len), static_cast<uint32_t>(len + 1000000));
+	::Utils::Crypto::GetRandomUInt32(static_cast<uint32_t>(len), static_cast<uint32_t>(len + 1000000));
 	::Utils::Crypto::GetRandomString(len);
 	::Utils::Crypto::GetCRC32(data2.get(), len);
 

worker/fuzzer/src/RTC/FuzzerDtlsTransport.cpp

@@ -47,11 +47,11 @@ void Fuzzer::RTC::DtlsTransport::Fuzz(const uint8_t* data, size_t len)
 		// Remote DTLS fingerprint random generation.
 		// NOTE: Use a random integer in range 1..5 since FingerprintAlgorithm enum
 		// has 5 possible values starting with value 1.
-		dtlsRemoteFingerprint.algorithm =
-		  static_cast<::RTC::DtlsTransport::FingerprintAlgorithm>(::Utils::Crypto::GetRandomUInt(1u, 5u));
+		dtlsRemoteFingerprint.algorithm = static_cast<::RTC::DtlsTransport::FingerprintAlgorithm>(
+		  ::Utils::Crypto::GetRandomUInt32(1u, 5u));
 
 		dtlsRemoteFingerprint.value =
-		  ::Utils::Crypto::GetRandomString(::Utils::Crypto::GetRandomUInt(3u, 20u));
+		  ::Utils::Crypto::GetRandomString(::Utils::Crypto::GetRandomUInt32(3u, 20u));
 
 		dtlsTransportSingleton->Run(localRole);
 		dtlsTransportSingleton->SetRemoteFingerprint(dtlsRemoteFingerprint);

worker/fuzzer/src/RTC/FuzzerRateCalculator.cpp

@@ -26,9 +26,9 @@ void Fuzzer::RTC::RateCalculator::Fuzz(const uint8_t* data, size_t len)
 	}
 
 	auto size = static_cast<size_t>(
-	  Utils::Crypto::GetRandomUInt(0u, static_cast<uint32_t>(::RTC::Consts::MtuSize)));
+	  Utils::Crypto::GetRandomUInt32(0u, static_cast<uint32_t>(::RTC::Consts::MtuSize)));
 
-	nowMs += Utils::Crypto::GetRandomUInt(0u, 1000u);
+	nowMs += Utils::Crypto::GetRandomUInt32(0u, 1000u);
 
 	rateCalculator.Update(size, nowMs);
 

worker/fuzzer/src/RTC/SCTP/association/FuzzerStateCookie.cpp

@@ -17,13 +17,16 @@ void Fuzzer::RTC::SCTP::StateCookie::Fuzz(const uint8_t* data, size_t len)
 	// data matches it.
 	if (len > ::RTC::SCTP::StateCookie::StateCookieLength)
 	{
-		len = ::Utils::Crypto::GetRandomUInt(
+		len = ::Utils::Crypto::GetRandomUInt32(
 		  ::RTC::SCTP::StateCookie::StateCookieLength, ::RTC::SCTP::StateCookie::StateCookieLength + 10);
 
 		if (len < ::RTC::SCTP::StateCookie::StateCookieLength + 5)
 		{
-			::Utils::Byte::Set4Bytes(clonedData, 0, ::RTC::SCTP::StateCookie::MagicValue1);
-			::Utils::Byte::Set2Bytes(clonedData, 34, ::RTC::SCTP::StateCookie::MagicValue2);
+			::Utils::Byte::Set8Bytes(clonedData, 0, ::RTC::SCTP::StateCookie::Magic1);
+			::Utils::Byte::Set2Bytes(
+			  clonedData,
+			  ::RTC::SCTP::StateCookie::NegotiatedCapabilitiesOffset,
+			  ::RTC::SCTP::StateCookie::Magic2);
 		}
 	}
 
@@ -36,33 +39,33 @@ void Fuzzer::RTC::SCTP::StateCookie::Fuzz(const uint8_t* data, size_t len)
 		return;
 	}
 
-	stateCookie->GetMyVerificationTag();
-	stateCookie->GetPeerVerificationTag();
-	stateCookie->GetMyInitialTsn();
-	stateCookie->GetPeerInitialTsn();
-	stateCookie->GetMyAdvertisedReceiverWindowCredit();
+	stateCookie->GetLocalVerificationTag();
+	stateCookie->GetRemoteVerificationTag();
+	stateCookie->GetLocalInitialTsn();
+	stateCookie->GetRemoteInitialTsn();
+	stateCookie->GetRemoteAdvertisedReceiverWindowCredit();
 	stateCookie->GetTieTag();
 	stateCookie->GetNegotiatedCapabilities();
 
 	stateCookie->Serialize(StateCookieSerializeBuffer, len);
 
-	stateCookie->GetMyVerificationTag();
-	stateCookie->GetPeerVerificationTag();
-	stateCookie->GetMyInitialTsn();
-	stateCookie->GetPeerInitialTsn();
-	stateCookie->GetMyAdvertisedReceiverWindowCredit();
+	stateCookie->GetLocalVerificationTag();
+	stateCookie->GetRemoteVerificationTag();
+	stateCookie->GetLocalInitialTsn();
+	stateCookie->GetRemoteInitialTsn();
+	stateCookie->GetRemoteAdvertisedReceiverWindowCredit();
 	stateCookie->GetTieTag();
 	stateCookie->GetNegotiatedCapabilities();
 
 	auto* clonedStateCookie = stateCookie->Clone(StateCookieCloneBuffer, len);
 
 	delete stateCookie;
 
-	clonedStateCookie->GetMyVerificationTag();
-	clonedStateCookie->GetPeerVerificationTag();
-	clonedStateCookie->GetMyInitialTsn();
-	clonedStateCookie->GetPeerInitialTsn();
-	clonedStateCookie->GetMyAdvertisedReceiverWindowCredit();
+	clonedStateCookie->GetLocalVerificationTag();
+	clonedStateCookie->GetRemoteVerificationTag();
+	clonedStateCookie->GetLocalInitialTsn();
+	clonedStateCookie->GetRemoteInitialTsn();
+	clonedStateCookie->GetRemoteAdvertisedReceiverWindowCredit();
 	clonedStateCookie->GetTieTag();
 	clonedStateCookie->GetNegotiatedCapabilities();
 

worker/fuzzer/src/RTC/SCTP/packet/FuzzerPacket.cpp

@@ -36,7 +36,7 @@ void Fuzzer::RTC::SCTP::Packet::Fuzz(const uint8_t* data, size_t len)
 	packet->GetChecksum();
 	packet->ValidateCRC32cChecksum();
 	packet->SetChecksum(999999);
-	packet->SetCRC32cChecksum();
+	packet->WriteCRC32cChecksum();
 	packet->ValidateCRC32cChecksum();
 	packet->HasChunks();
 	packet->GetChunksCount();
@@ -58,7 +58,7 @@ void Fuzzer::RTC::SCTP::Packet::Fuzz(const uint8_t* data, size_t len)
 	clonedPacket->GetChecksum();
 	clonedPacket->ValidateCRC32cChecksum();
 	clonedPacket->SetChecksum(999999);
-	clonedPacket->SetCRC32cChecksum();
+	clonedPacket->WriteCRC32cChecksum();
 	clonedPacket->ValidateCRC32cChecksum();
 	clonedPacket->HasChunks();
 	clonedPacket->GetChunksCount();

worker/include/RTC/SCTP/TODO_SCTP.md

@@ -12,9 +12,3 @@ Here some notes about our future SCTP implementation.
 However, in step 4 `WebRtcTransport::OnDtlsTransportApplicationDataReceived()` should instead call `RTC::SCTP::Packet::parse()` and `Transport::ReceiveSctpPacket()` with a `SCTP::Packet` instance instead than `data` and `len`. In fact it should be named `Transport::ReceiveSctpPacket()` instead of the current `Transport::ReceiveSctpData()`.
 
 Same in `PipeTransport` and `PlainTransport`.
-
-## TODO
-
-- Try to remove all `friend class`.
-
-- In `HeartbeatChunk` the `HeartbeatInfoParameter` should be mandatory when parsing. Or should we add some `Validate()` method?

worker/include/RTC/SCTP/association/NegotiatedCapabilities.hpp

@@ -2,6 +2,10 @@
 #define MS_RTC_SCTP_NEGOTIATED_CAPABILITIES_HPP
 
 #include "common.hpp"
+#include "RTC/SCTP/association/SocketOptions.hpp"
+#include "RTC/SCTP/packet/chunks/InitAckChunk.hpp"
+#include "RTC/SCTP/packet/chunks/InitChunk.hpp"
+#include <variant> // std::variant, std::visit()
 
 namespace RTC
 {
@@ -14,6 +18,19 @@ namespace RTC
 		 */
 		struct NegotiatedCapabilities
 		{
+			using InitOrInitAckChunkVariant = std::variant<const InitChunk*, const InitAckChunk*>;
+
+			/**
+			 * Create a NegotiatedCapabilities struct. Intended to be used during
+			 * the SCTP association handshake flow.
+			 *
+			 * @remarks
+			 * Given `remoteChunk` must be an INIT or an INIT_ACK Chunk. Otherwise
+			 * it will fail in compilation time.
+			 */
+			static NegotiatedCapabilities Factory(
+			  SocketOptions socketOptions, InitOrInitAckChunkVariant remoteChunk);
+
 			/**
 			 * Negotiated maximum number of outbound streams (OS).
 			 */