This commit is contained in:
JoelKatz
2012-05-09 17:49:25 -07:00
parent 0139304b98
commit aac413fcd2

View File

@@ -13,8 +13,7 @@ void PackedMessage::encodeHeader(unsigned size, int type)
} }
PackedMessage::PackedMessage(MessagePointer msg, int type) PackedMessage::PackedMessage(MessagePointer msg, int type) : mMsg(msg)
: mMsg(msg)
{ {
unsigned msg_size = mMsg->ByteSize(); unsigned msg_size = mMsg->ByteSize();
assert(msg_size); assert(msg_size);
@@ -36,25 +35,20 @@ bool PackedMessage::operator == (const PackedMessage& other)
unsigned PackedMessage::getLength(std::vector<uint8_t>& buf) unsigned PackedMessage::getLength(std::vector<uint8_t>& buf)
{ {
if(buf.size() < HEADER_SIZE) return 0; if(buf.size() < HEADER_SIZE)
return 0;
int ret = buf[0]; int ret = buf[0];
ret<<=8; ret <<= 8; ret |= buf[1]; ret <<= 8; ret |= buf[2]; ret <<= 8; ret |= buf[3];
ret|=buf[1]; return ret;
ret<<=8;
ret|=buf[2];
ret<<=8;
ret|=buf[3];
return(ret);
} }
int PackedMessage::getType(std::vector<uint8_t>& buf) int PackedMessage::getType(std::vector<uint8_t>& buf)
{ {
if(buf.size() < HEADER_SIZE) return 0; if(buf.size() < HEADER_SIZE)
return 0;
int ret = buf[4]; int ret = buf[4];
ret<<=8; ret <<= 8; ret |= buf[5];
ret|=buf[5]; return ret;
return(ret);
} }