declare packets + commands

include/td/common/DataBuffer.h

@@ -11,6 +11,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
+#include <td/common/VarInt.h>
 
 namespace td {
 
@@ -65,19 +66,24 @@ class DataBuffer {
 	 * \warning Don't use it for binary data !
 	 * \param str The string to append
 	 */
-	DataBuffer& operator<<(const std::string& str) {
-		std::size_t strlen = str.length() + 1;	// including null character
-		Resize(GetSize() + strlen);
-		std::memcpy(m_Buffer.data() + GetSize() - strlen, str.data(), strlen);
-		return *this;
-	}
+	DataBuffer& operator<<(const std::string& str);
 
 	/**
 	 * \brief Append data to the buffer from another const buffer
 	 * \param data The buffer to append
 	 */
-	DataBuffer& operator<<(const DataBuffer& data) {
-		m_Buffer.insert(m_Buffer.end(), data.begin(), data.end());
+	DataBuffer& operator<<(const DataBuffer& data);
+
+	/**
+	 * \brief Append a vector to the buffer by first writing the size
+	 * \param data The buffer to append
+	 */
+	template <typename T>
+	DataBuffer& operator<<(const std::vector<T>& data) {
+		*this << VarInt {data.size()};
+		for (const auto& element : data) {
+			*this << element;
+		}
 		return *this;
 	}
 
@@ -96,25 +102,28 @@ class DataBuffer {
 	 * \brief Read some data from the buffer and assign to the new buffer
 	 * \param data The buffer to assign
 	 */
-	DataBuffer& operator>>(DataBuffer& data) {
-		data.Resize(GetSize() - m_ReadOffset);
-		std::copy(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), m_Buffer.end(), data.begin());
-		m_ReadOffset = m_Buffer.size();
-		return *this;
-	}
+	DataBuffer& operator>>(DataBuffer& data);
 
 	/**
 	 * \brief Read a string from the buffer
 	 * \param str The string to assign in the new buffer
 	 * \warning Don't use it for binary data !
 	 */
-	DataBuffer& operator>>(std::string& str) {
-		std::size_t stringSize =
-			strlen(reinterpret_cast<const char*>(m_Buffer.data()) + m_ReadOffset) + 1;	// including null character
-		str.resize(stringSize);
-		std::copy(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset),
-			m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset + stringSize), str.begin());
-		m_ReadOffset += stringSize;
+	DataBuffer& operator>>(std::string& str);
+
+	/**
+	 * \brief Read a vector (size + data) from the buffer 
+	 * \pre The vector is assumed to be empty
+	 */
+	template <typename T>
+	DataBuffer& operator>>(std::vector<T>& data) {
+		VarInt arraySize;
+		*this >> arraySize;
+		for (std::size_t i = 0; i < arraySize.GetValue(); i++) {
+			T newElement;
+			*this >> newElement;
+			data.push_back(newElement);
+		}
 		return *this;
 	}
 
@@ -123,56 +132,35 @@ class DataBuffer {
 	 * \param buffer The buffer to write
 	 * \param amount The amount of data to write
 	 */
-	void WriteSome(const char* buffer, std::size_t amount) {
-		std::size_t end_pos = m_Buffer.size();
-		m_Buffer.resize(m_Buffer.size() + amount);
-		std::memcpy(m_Buffer.data() + end_pos, buffer, amount);
-	}
+	void WriteSome(const char* buffer, std::size_t amount);
 
 	/**
 	 * \brief Write some data to the buffer
 	 * \param buffer The buffer to write
 	 * \param amount The amount of data to write
 	 */
-	void WriteSome(const std::uint8_t* buffer, std::size_t amount) {
-		std::size_t end_pos = m_Buffer.size();
-		m_Buffer.resize(m_Buffer.size() + amount);
-		std::memcpy(m_Buffer.data() + end_pos, buffer, amount);
-	}
+	void WriteSome(const std::uint8_t* buffer, std::size_t amount);
 
 	/**
 	 * \brief Read some data from the buffer
 	 * \param buffer The buffer to Read
 	 * \param amount The amount of data from the buffer
 	 */
-	void ReadSome(char* buffer, std::size_t amount) {
-		assert(m_ReadOffset + amount <= GetSize());
-		std::copy_n(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), amount, buffer);
-		m_ReadOffset += amount;
-	}
+	void ReadSome(char* buffer, std::size_t amount);
 
 	/**
 	 * \brief Read some data from the buffer
 	 * \param buffer The buffer to Read
 	 * \param amount The amount of data from the buffer
 	 */
-	void ReadSome(std::uint8_t* buffer, std::size_t amount) {
-		assert(m_ReadOffset + amount <= GetSize());
-		std::copy_n(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), amount, buffer);
-		m_ReadOffset += amount;
-	}
+	void ReadSome(std::uint8_t* buffer, std::size_t amount);
 
 	/**
 	 * \brief Read some data from the buffer
 	 * \param buffer The buffer to Read
 	 * \param amount The amount of data from the buffer
 	 */
-	void ReadSome(DataBuffer& buffer, std::size_t amount) {
-		assert(m_ReadOffset + amount <= GetSize());
-		buffer.Resize(amount);
-		std::copy_n(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), amount, buffer.begin());
-		m_ReadOffset += amount;
-	}
+	void ReadSome(DataBuffer& buffer, std::size_t amount);
 
 	/**
 	 * \brief Resize the buffer