X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FPacket.cc;h=8862f29bc9ba918ef23fb4608d539681fbb4f90a;hp=62da00b17f98141d307573232c2d23ca07444fa8;hb=19d555013569026c9e68784ea560cd2e5a21bc5e;hpb=61e441a6b4b7c4b2b14b12a1a2545a04155c719b diff --git a/src/Moof/Packet.cc b/src/Moof/Packet.cc index 62da00b..8862f29 100644 --- a/src/Moof/Packet.cc +++ b/src/Moof/Packet.cc @@ -15,6 +15,7 @@ #if HAVE_BYTESWAP_H #include #endif +#include #if HAVE_ARPA_INET_H #include @@ -95,6 +96,8 @@ namespace Mf { Packet::Packet(size_t size) : + mBuffer((char*)malloc(size)), + mSize(size), mR(0), mW(0), mBoolR(0), @@ -102,21 +105,25 @@ Packet::Packet(size_t size) : mBoolNumR(0), mBoolNumW(0) { - mBuffer = boost::shared_array(new char[size]); - mSize = size; } Packet::Packet(const char* data, size_t size) : + mBuffer((char*)malloc(size)), + mSize(size), mR(0), + mW(size), mBoolR(0), mBoolW(0), mBoolNumR(0), mBoolNumW(0) { - mBuffer = boost::shared_array(new char[size]); - mSize = size; - mW = size; - memcpy(mBuffer.get(), data, mSize); + memcpy(mBuffer, data, size); +} + + +Packet::~Packet() +{ + free(mBuffer); } @@ -207,6 +214,17 @@ Packet& Packet::operator<<(double value) size_t Packet::write(const void* bytes, size_t size) { size_t nBytes = std::min(size, mSize - mW); + if (!mBuffer || nBytes < size) + { + int numPages = 1 + size / PAGE_SIZE; + int newSize = mSize + numPages * PAGE_SIZE; + char* newBuffer = (char*)realloc(mBuffer, newSize); + if (newBuffer) + { + mBuffer = newBuffer; + mSize = newSize; + } + } memcpy(&mBuffer[mW], bytes, nBytes); mW += nBytes; return nBytes;