X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FPacket.hh;h=00956126ea1185fb64b5e8eb7f2e5cd17edb38f0;hp=198212c352646984e3a3352a6705a73e0de9c600;hb=26095329ef78e94929ad7ab14480dc1a0edecff8;hpb=41f8dd670e963aad94527ce2be0486268993a477

diff --git a/src/Moof/Packet.hh b/src/Moof/Packet.hh
index 198212c..0095612 100644
--- a/src/Moof/Packet.hh
+++ b/src/Moof/Packet.hh
@@ -16,7 +16,10 @@
 #include <string>
 #include <vector>
 
-#include <boost/shared_array.hpp>
+
+#ifndef PAGE_SIZE
+#define PAGE_SIZE 4096
+#endif
 
 
 namespace Mf {
@@ -26,9 +29,11 @@ class Packet
 {
 public:
 
-	Packet(size_t size = 1024);
+	Packet(size_t size = PAGE_SIZE);
 	Packet(const char* data, size_t size);
 
+	~Packet();
+
 	Packet& operator<<(bool value);
 	Packet& operator<<(int8_t  value);
 	Packet& operator<<(int16_t value);
@@ -38,9 +43,8 @@ public:
 	Packet& operator<<(uint16_t value);
 	Packet& operator<<(uint32_t value);
 	Packet& operator<<(uint64_t value);
-	//Packet& operator<<(float value);
-	//Packet& operator<<(double value);
-	//Packet& operator<<(long double value);
+	Packet& operator<<(float value);
+	Packet& operator<<(double value);
 
 	size_t write(const void* bytes, size_t size);
 
@@ -53,13 +57,15 @@ public:
 	Packet& operator>>(uint16_t& value);
 	Packet& operator>>(uint32_t& value);
 	Packet& operator>>(uint64_t& value);
+	Packet& operator>>(float& value);
+	Packet& operator>>(double& value);
 
 	size_t read(void* bytes, size_t size);
 
 
 	const char* bytes() const
 	{
-		return &mBuffer.get()[mR];
+		return mBuffer + mR;
 	}
 
 	size_t size() const
@@ -70,38 +76,52 @@ public:
 
 private:
 
-	boost::shared_array<char>	mBuffer;
-	size_t						mSize;
+	char*	mBuffer;
+	size_t	mSize;
 
-	size_t						mR;
-	size_t						mW;
+	size_t	mR;
+	size_t	mW;
 
-	size_t						mBoolR;
-	size_t						mBoolW;
-	size_t						mBoolNumR;
-	size_t						mBoolNumW;
+	size_t	mBoolR;
+	size_t	mBoolW;
+	size_t	mBoolNumR;
+	size_t	mBoolNumW;
 };
 
 
 inline Packet& operator<<(Packet& packet, const char* value)
 {
-	uint8_t length = strnlen(value, 255);
+	uint16_t length = strlen(value);
 	packet << length;
 	packet.write(value, length);
 	return packet;
 }
 
-inline Packet& operator<<(Packet& packet, const std::string& value)
+template <class T>
+inline Packet& operator<<(Packet& packet, const std::basic_string<T>& value)
 {
-	packet << (uint8_t)value.length();
-	packet.write(value.c_str(), value.length());
+	packet << (uint16_t)value.length();
+	packet.write(value.data(), value.length() * sizeof(T));
 	return packet;
 }
 
+template <class T>
+inline Packet& operator>>(Packet& packet, std::basic_string<T>& value)
+{
+	uint16_t length = 0;
+	packet >> length;
+
+	T str[length];
+	size_t charsRead = packet.read(str, length * sizeof(T));
+	value.assign(str, charsRead);
+	return packet;
+}
+
+
 template <class T>
 inline Packet& operator<<(Packet& packet, const std::vector<T>& value)
 {
-	packet << (uint8_t)value.size();
+	packet << (uint16_t)value.size();
 	typename std::vector<T>::const_iterator it;
 	for (it = value.begin(); it != value.end(); ++it)
 	{
@@ -110,26 +130,14 @@ inline Packet& operator<<(Packet& packet, const std::vector<T>& value)
 	return packet;
 }
 
-
-inline Packet& operator>>(Packet& packet, std::string& value)
-{
-	uint8_t length = 0;
-	packet >> length;
-
-	char str[256];
-	size_t charsRead = packet.read(str, length);
-	value.assign(str, charsRead);
-	return packet;
-}
-
 template <class T>
 inline Packet& operator>>(Packet& packet, std::vector<T>& value)
 {
-	uint8_t size = 0;
+	uint16_t size = 0;
 	packet >> size;
 
 	value.clear();
-	for (uint8_t i = 0; i < size; ++i)
+	for (uint16_t i = 0; i < size; ++i)
 	{
 		T item;
 		packet >> item;
@@ -139,7 +147,6 @@ inline Packet& operator>>(Packet& packet, std::vector<T>& value)
 }
 
 
-
 } // namespace Mf
 
 #endif // _MOOF_PACKET_HH_