diff --git a/server/src/sock/pool.cpp b/server/src/sock/pool.cpp new file mode 100644 index 0000000..423f999 --- /dev/null +++ b/server/src/sock/pool.cpp @@ -0,0 +1,2 @@ +#include "pool.hpp" + diff --git a/server/src/sock/pool.hpp b/server/src/sock/pool.hpp new file mode 100644 index 0000000..3907898 --- /dev/null +++ b/server/src/sock/pool.hpp @@ -0,0 +1,14 @@ +#ifndef SOSC_POOL_H +#define SOSC_POOL_H + +namespace sosc { +template +class Pool { +public: + +private: + +}; +} + +#endif diff --git a/server/src/sock/scapesock.cpp b/server/src/sock/scapesock.cpp index c8ee5e0..dee073d 100644 --- a/server/src/sock/scapesock.cpp +++ b/server/src/sock/scapesock.cpp @@ -91,13 +91,13 @@ int sosc::ScapeConnection::Receive(Packet* packet, bool block) { } // TODO optimize - this->multiframe_buffer += frame.GetBody(); + // TODO determine if packet->Parse should write back to pck_frames on o/f + this->pck_frames += frame.GetBody(); if(frame.IsFinal()) { - if(packet->Parse(this->multiframe_buffer) == PCK_OK) + if(packet->Parse(this->pck_frames, &this->pck_frames) == PCK_OK) return PCK_OK; else return PCK_ERR; - } else return PCK_MORE; } diff --git a/server/src/sock/scapesock.hpp b/server/src/sock/scapesock.hpp index efc1785..b8f65f5 100644 --- a/server/src/sock/scapesock.hpp +++ b/server/src/sock/scapesock.hpp @@ -41,7 +41,7 @@ private: TcpClient client; std::string buffer; - std::string multiframe_buffer; + std::string pck_frames; friend class ScapeServer; };