Simple websocket client/server test.

2 files changed, 10 insertions, 9 deletions

diff --git a/zencore/include/zencore/stream.h b/zencore/include/zencore/stream.h
index 4c8047bb4..6d7e7d19f 100644
--- a/zencore/include/zencore/stream.h
+++ b/zencore/include/zencore/stream.h
@@ -54,13 +54,14 @@ MakeMemoryView(const BinaryWriter& Stream)
 
 class SimpleBinaryWriter
 {
-	static constexpr size_t DefaultBlockSize = 64;
+	static constexpr uint32_t DefaultBlockSize = 64;
 
 public:
-	SimpleBinaryWriter(uint64_t BlockSize = DefaultBlockSize) : m_BlockSize(BlockSize), m_Offset{0} {}
+	SimpleBinaryWriter(uint32_t BlockSize = DefaultBlockSize) : m_BlockSize(BlockSize), m_Offset{0} {}
 	~SimpleBinaryWriter() = default;
 
-	void Write(const void* Data, size_t Size);
+	void Write(MemoryView Memory);
+	void Write(const void* Data, size_t Size) { Write(MemoryView(Data, Size)); }
 	void Clear();
 
 	inline uint64_t CurrentOffset() const { return m_Offset; }
@@ -74,8 +75,8 @@ public:
 
 private:
 	std::vector<uint8_t> m_Buffer;
-	size_t				 m_BlockSize;
-	size_t				 m_Offset;
+	uint64_t			 m_Offset;
+	uint32_t			 m_BlockSize;
 };
 
 /**
diff --git a/zencore/stream.cpp b/zencore/stream.cpp
index 361858b66..36953363f 100644
--- a/zencore/stream.cpp
+++ b/zencore/stream.cpp
@@ -26,9 +26,9 @@ BinaryWriter::Write(const void* data, size_t ByteCount, uint64_t Offset)
 }
 
 void
-SimpleBinaryWriter::Write(const void* Data, size_t Size)
+SimpleBinaryWriter::Write(MemoryView Memory)
 {
-	const size_t NeededSize = m_Offset + Size;
+	const uint64_t NeededSize = m_Offset + Memory.GetSize();
 
 	if (NeededSize > m_Buffer.size())
 	{
@@ -37,9 +37,9 @@ SimpleBinaryWriter::Write(const void* Data, size_t Size)
 		m_Buffer.resize(NewCapacity);
 	}
 
-	memcpy(m_Buffer.data() + m_Offset, Data, Size);
+	memcpy(m_Buffer.data() + m_Offset, Memory.GetData(), Memory.GetSize());
 
-	m_Offset += Size;
+	m_Offset += Memory.GetSize();
 }
 
 void