more

Author: ibc

worker/include/RTC/Serializable.hpp

@@ -81,9 +81,12 @@ namespace RTC
 		 * Update the buffer length of the Serializable.
 		 **
 		 * @remarks
-		 * The child class must invoke this method after parsing completes in case
-		 * it couldn't anticipate its expected exact length. Specially useful when
-		 * parsing variable-length items within a packet.
+		 * - The child class must invoke this method after parsing completes in
+		 *   case it couldn't anticipate its expected exact length. Specially
+		 *   useful when parsing variable-length items within a packet.
+		 * - The application can also invoke this method on the Serializable if
+		 *   it has expanded or reduced the length of the buffer currently assigned
+		 *   to the Serializable.
 		 *
 		 * @throw MediaSoupError - If given `bufferLength` is lower than the
 		 * current exact length of the Serializable.
@@ -100,7 +103,8 @@ namespace RTC
 		 *
 		 * @remarks
 		 * - Subclasses must override this method if they hold pointers or allocated
-		 *   memory.
+		 *   memory. In that case, the subclass should manually invoke `SetBuffer()`
+		 *   and `SetBufferLenght()` methods.
 		 * - Anyway, if subclasses override this method they still need to invoke
 		 *   it in the parent too.
 		 *
@@ -109,14 +113,28 @@ namespace RTC
 		 */
 		virtual void Serialize(const uint8_t* buffer, size_t bufferLength);
 
+		/**
+		 * TODO
+		 */
+		// virtual std::unique_ptr<Serializable> Clone(const uint8_t* buffer, size_t bufferLength) const;
+
 		/**
 		 * Methods to be used by classes inheriting from Serializable.
 		 */
 	protected:
+		/**
+		 * Method to be called by the child class in case it overrides the
+		 * `Serialize()` method.
+		 */
+		virtual void SetBuffer(const uint8_t* buffer) final
+		{
+			this->buffer = const_cast<uint8_t*>(buffer);
+		}
+
 		/**
 		 * Method to be called by the child class to update the current exact
 		 * length of the Serializable.
-		 **
+		 *
 		 * @remarks
 		 * The child class must invoke this method after parsing completes and
 		 * after every change in the Serializable content that affects its current

worker/test/src/RTC/TestSerializable.cpp

@@ -525,19 +525,30 @@ class Foo : public Serializable
 
 	void Serialize(const uint8_t* buffer, size_t bufferLength) override
 	{
-		Serializable::Serialize(buffer, bufferLength);
+		size_t itemsOffset   = GetItemsPointer() - GetBuffer();
+		size_t paddingOffset = GetPaddingPointer() - GetBuffer();
+		size_t padding       = GetLength() - (GetPaddingPointer() - GetBuffer());
 
-		// Serialize each Item into the new buffer.
+		// Copy all bytes from beginning of the buffer until the position of the
+		// Items.
+		std::memcpy(const_cast<uint8_t*>(buffer), GetBuffer(), itemsOffset);
 
-		size_t itemsOffset = GetItemsPointer() - GetBuffer();
-		uint8_t* ptr       = const_cast<uint8_t*>(buffer) + itemsOffset;
+		// Serialize each Item into the new buffer.
+		uint8_t* ptr = const_cast<uint8_t*>(buffer) + itemsOffset;
 
 		for (auto& item : this->items)
 		{
 			item->Serialize(ptr, item->GetLength());
 
 			ptr += item->GetLength();
 		}
+
+		// Copy padding bytes.
+		std::memcpy(const_cast<uint8_t*>(buffer) + paddingOffset, GetPaddingPointer(), padding);
+
+		// Manually update buffer and buffer length.
+		SetBuffer(buffer);
+		SetBufferLength(bufferLength);
 	}
 
 	uint8_t GetType() const