cosmetic

Author: ibc

worker/include/RTC/SCTP/Packet.hpp

@@ -66,7 +66,7 @@ namespace RTC
 			 * @remarks
 			 * - `length` must be the exact length of the Packet.
 			 */
-			static Packet* Parse(const uint8_t* buffer, size_t length);
+			static Packet* Parse(const uint8_t* buffer, size_t bufferLength);
 
 			static Packet* Factory(uint8_t* buffer, size_t bufferLength);
 

worker/src/RTC/SCTP/Packet.cpp

@@ -27,7 +27,7 @@
 // 			);
 // 		}
 
-// 		Packet* Packet::Parse(const uint8_t* buffer, size_t length)
+// 		Packet* Packet::Parse(const uint8_t* buffer, size_t bufferLength)
 // 		{
 // 			MS_TRACE();
 

worker/test/include/RTC/TestSerializable/FooPacket.hpp

@@ -74,7 +74,7 @@ class FooPacket : public Serializable
 	 * @remarks
 	 * - `length` must be the exact length of the Packet.
 	 */
-	static FooPacket* Parse(const uint8_t* buffer, size_t length);
+	static FooPacket* Parse(const uint8_t* buffer, size_t bufferLength);
 
 	static FooPacket* Factory(uint8_t* buffer, size_t bufferLength, uint8_t type);
 

worker/test/src/RTC/TestSerializable/FooPacket.cpp

@@ -1,5 +1,5 @@
 #define MS_CLASS "RTC::TestSerializable:FooPacket"
-// #define MS_LOG_DEV_LEVEL 3
+#define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/TestSerializable/FooPacket.hpp"
 #include "Logger.hpp"
@@ -42,21 +42,18 @@ bool FooPacket::IsFooPacket(const uint8_t* buffer, size_t bufferLength)
 	return true;
 }
 
-FooPacket* FooPacket::Parse(const uint8_t* buffer, size_t length)
+FooPacket* FooPacket::Parse(const uint8_t* buffer, size_t bufferLength)
 {
 	MS_TRACE();
 
-	if (!FooPacket::IsFooPacket(buffer, length))
+	if (!FooPacket::IsFooPacket(buffer, bufferLength))
 	{
 		MS_WARN_DEV("not a FooPacket");
 
 		return nullptr;
 	}
 
-	// NOTE: Here we are passing `length` as `bufferLength`. However we know
-	// that, due to FooPacket nature, a FooPacket Packet must occupy the whole
-	// given buffer.
-	auto* packet = new FooPacket(buffer, length);
+	auto* packet = new FooPacket(buffer, bufferLength);
 
 	// Pointer that starts at the beginning of the buffer and it's incremented
 	// to point to different parts of the Packet.
@@ -67,22 +64,21 @@ FooPacket* FooPacket::Parse(const uint8_t* buffer, size_t length)
 
 	while (ptr < buffer + packet->GetLengthField())
 	{
-		// Here we must anticipate the id of each item to use its appropriate.
-		if (ptr + FooItem::ItemHeaderLength > packet->GetPaddingPointer())
+		// The remaining length in the buffer (excluding padding in the packet)
+		// is the potential buffer length of the item.
+		size_t itemBufferLength = packet->GetPaddingPointer() - ptr;
+
+		FooItem::ItemId itemId;
+		uint8_t valueLength;
+
+		if (!FooItem::IsFooItem(ptr, itemBufferLength, itemId, valueLength))
 		{
-			MS_WARN_DEV("no space for item header");
+			MS_WARN_DEV("not a FooItem");
 
 			delete packet;
 			return nullptr;
 		}
 
-		const auto* itemHeader = reinterpret_cast<const FooItem::ItemHeader*>(ptr);
-		auto itemId            = itemHeader->id;
-
-		// The remaining length in the buffer (excluding padding in the packet)
-		// is the potential buffer length of the item.
-		size_t itemBufferLength = packet->GetPaddingPointer() - ptr;
-
 		FooItem* item{ nullptr };
 
 		MS_DEBUG_DEV("parsing FooItem [ptr:%zu, id:%" PRIu8 "]", ptr - buffer, itemId);
@@ -154,9 +150,9 @@ FooPacket* FooPacket::Parse(const uint8_t* buffer, size_t length)
 
 	const size_t computedLength = Utils::Byte::PadTo4Bytes(static_cast<size_t>(ptr - buffer));
 
-	// Ensure computed length (padded to 4 bytes) matches the total given
+	// Ensure computed length (padded to 4 bytes) matches the total given buffer
 	// length.
-	if (computedLength != length)
+	if (computedLength != bufferLength)
 	{
 		MS_WARN_DEV("computed padded length != buffer length");