*/
#include "networkpacket.h"
-#include "debug.h"
-#include "exceptions.h"
+#include <sstream>
+#include "networkexceptions.h"
#include "util/serialize.h"
NetworkPacket::NetworkPacket(u16 command, u32 datasize, u16 peer_id):
-m_datasize(datasize), m_read_offset(0), m_command(command), m_peer_id(peer_id)
+m_datasize(datasize), m_command(command), m_peer_id(peer_id)
{
m_data.resize(m_datasize);
}
NetworkPacket::NetworkPacket(u16 command, u32 datasize):
-m_datasize(datasize), m_read_offset(0), m_command(command), m_peer_id(0)
+m_datasize(datasize), m_command(command)
{
m_data.resize(m_datasize);
}
m_data.clear();
}
-void NetworkPacket::checkReadOffset(u32 from_offset)
+void NetworkPacket::checkReadOffset(u32 from_offset, u32 field_size)
{
- if (from_offset >= m_datasize) {
+ if (from_offset + field_size > m_datasize) {
std::stringstream ss;
ss << "Reading outside packet (offset: " <<
from_offset << ", packet size: " << getSize() << ")";
m_data = std::vector<u8>(&data[2], &data[2 + m_datasize]);
}
-char* NetworkPacket::getString(u32 from_offset)
+const char* NetworkPacket::getString(u32 from_offset)
{
- checkReadOffset(from_offset);
+ checkReadOffset(from_offset, 0);
return (char*)&m_data[from_offset];
}
void NetworkPacket::putRawString(const char* src, u32 len)
{
- if (m_read_offset + len * sizeof(char) >= m_datasize) {
- m_datasize += len * sizeof(char);
+ if (m_read_offset + len > m_datasize) {
+ m_datasize = m_read_offset + len;
m_data.resize(m_datasize);
}
+ if (len == 0)
+ return;
+
memcpy(&m_data[m_read_offset], src, len);
m_read_offset += len;
}
NetworkPacket& NetworkPacket::operator>>(std::string& dst)
{
+ checkReadOffset(m_read_offset, 2);
u16 strLen = readU16(&m_data[m_read_offset]);
- m_read_offset += sizeof(u16);
+ m_read_offset += 2;
dst.clear();
return *this;
}
+ checkReadOffset(m_read_offset, strLen);
+
dst.reserve(strLen);
dst.append((char*)&m_data[m_read_offset], strLen);
- m_read_offset += strLen * sizeof(char);
+ m_read_offset += strLen;
return *this;
}
-NetworkPacket& NetworkPacket::operator<<(std::string src)
+NetworkPacket& NetworkPacket::operator<<(const std::string &src)
{
u16 msgsize = src.size();
- if (msgsize > 0xFFFF) {
- msgsize = 0xFFFF;
+ if (msgsize > STRING_MAX_LEN) {
+ throw PacketError("String too long");
}
*this << msgsize;
- if (m_read_offset + msgsize * sizeof(char) >= m_datasize) {
- m_datasize += msgsize * sizeof(char);
- m_data.resize(m_datasize);
- }
-
- memcpy(&m_data[m_read_offset], src.c_str(), msgsize);
- m_read_offset += msgsize;
+ putRawString(src.c_str(), (u32)msgsize);
return *this;
}
-void NetworkPacket::putLongString(std::string src)
+void NetworkPacket::putLongString(const std::string &src)
{
u32 msgsize = src.size();
- if (msgsize > 0xFFFFFFFF) {
- msgsize = 0xFFFFFFFF;
+ if (msgsize > LONG_STRING_MAX_LEN) {
+ throw PacketError("String too long");
}
*this << msgsize;
- if (m_read_offset + msgsize * sizeof(char) >= m_datasize) {
- m_datasize += msgsize * sizeof(char);
- m_data.resize(m_datasize);
- }
-
- memcpy(&m_data[m_read_offset], src.c_str(), msgsize);
- m_read_offset += msgsize;
+ putRawString(src.c_str(), msgsize);
}
NetworkPacket& NetworkPacket::operator>>(std::wstring& dst)
{
+ checkReadOffset(m_read_offset, 2);
u16 strLen = readU16(&m_data[m_read_offset]);
- m_read_offset += sizeof(u16);
+ m_read_offset += 2;
dst.clear();
return *this;
}
+ checkReadOffset(m_read_offset, strLen * 2);
+
dst.reserve(strLen);
for(u16 i=0; i<strLen; i++) {
wchar_t c16 = readU16(&m_data[m_read_offset]);
return *this;
}
-NetworkPacket& NetworkPacket::operator<<(std::wstring src)
+NetworkPacket& NetworkPacket::operator<<(const std::wstring &src)
{
u16 msgsize = src.size();
- if (msgsize > 0xFFFF) {
- msgsize = 0xFFFF;
+ if (msgsize > WIDE_STRING_MAX_LEN) {
+ throw PacketError("String too long");
}
*this << msgsize;
std::string NetworkPacket::readLongString()
{
+ checkReadOffset(m_read_offset, 4);
u32 strLen = readU32(&m_data[m_read_offset]);
- m_read_offset += sizeof(u32);
+ m_read_offset += 4;
if (strLen == 0) {
return "";
}
+ if (strLen > LONG_STRING_MAX_LEN) {
+ throw PacketError("String too long");
+ }
+
+ checkReadOffset(m_read_offset, strLen);
+
std::string dst;
dst.reserve(strLen);
dst.append((char*)&m_data[m_read_offset], strLen);
- m_read_offset += strLen*sizeof(char);
+ m_read_offset += strLen;
return dst;
}
NetworkPacket& NetworkPacket::operator>>(char& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 1);
dst = readU8(&m_data[m_read_offset]);
- incrOffset<char>();
+ m_read_offset += 1;
return *this;
}
char NetworkPacket::getChar(u32 offset)
{
- checkReadOffset(offset);
+ checkReadOffset(offset, 1);
return readU8(&m_data[offset]);
}
NetworkPacket& NetworkPacket::operator<<(char src)
{
- checkDataSize<u8>();
+ checkDataSize(1);
writeU8(&m_data[m_read_offset], src);
- incrOffset<char>();
+ m_read_offset += 1;
return *this;
}
NetworkPacket& NetworkPacket::operator<<(u8 src)
{
- checkDataSize<u8>();
+ checkDataSize(1);
writeU8(&m_data[m_read_offset], src);
- incrOffset<u8>();
+ m_read_offset += 1;
return *this;
}
NetworkPacket& NetworkPacket::operator<<(bool src)
{
- checkDataSize<u8>();
+ checkDataSize(1);
writeU8(&m_data[m_read_offset], src);
- incrOffset<u8>();
+ m_read_offset += 1;
return *this;
}
NetworkPacket& NetworkPacket::operator<<(u16 src)
{
- checkDataSize<u16>();
+ checkDataSize(2);
writeU16(&m_data[m_read_offset], src);
- incrOffset<u16>();
+ m_read_offset += 2;
return *this;
}
NetworkPacket& NetworkPacket::operator<<(u32 src)
{
- checkDataSize<u32>();
+ checkDataSize(4);
writeU32(&m_data[m_read_offset], src);
- incrOffset<u32>();
+ m_read_offset += 4;
return *this;
}
NetworkPacket& NetworkPacket::operator<<(u64 src)
{
- checkDataSize<u64>();
+ checkDataSize(8);
writeU64(&m_data[m_read_offset], src);
- incrOffset<u64>();
+ m_read_offset += 8;
+ return *this;
+}
+
+NetworkPacket& NetworkPacket::operator<<(std::time_t src)
+{
+ *this << (u64) src;
return *this;
}
NetworkPacket& NetworkPacket::operator<<(float src)
{
- checkDataSize<float>();
+ checkDataSize(4);
writeF1000(&m_data[m_read_offset], src);
- incrOffset<float>();
+ m_read_offset += 4;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(bool& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 1);
dst = readU8(&m_data[m_read_offset]);
- incrOffset<u8>();
+ m_read_offset += 1;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(u8& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 1);
dst = readU8(&m_data[m_read_offset]);
- incrOffset<u8>();
+ m_read_offset += 1;
return *this;
}
u8 NetworkPacket::getU8(u32 offset)
{
- checkReadOffset(offset);
+ checkReadOffset(offset, 1);
return readU8(&m_data[offset]);
}
return NULL;
}
- checkReadOffset(from_offset);
+ checkReadOffset(from_offset, 1);
return (u8*)&m_data[from_offset];
}
NetworkPacket& NetworkPacket::operator>>(u16& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 2);
dst = readU16(&m_data[m_read_offset]);
- incrOffset<u16>();
+ m_read_offset += 2;
return *this;
}
u16 NetworkPacket::getU16(u32 from_offset)
{
- checkReadOffset(from_offset);
+ checkReadOffset(from_offset, 2);
return readU16(&m_data[from_offset]);
}
NetworkPacket& NetworkPacket::operator>>(u32& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 4);
dst = readU32(&m_data[m_read_offset]);
- incrOffset<u32>();
+ m_read_offset += 4;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(u64& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 8);
+
+ dst = readU64(&m_data[m_read_offset]);
+
+ m_read_offset += 8;
+ return *this;
+}
+
+NetworkPacket& NetworkPacket::operator>>(std::time_t& dst)
+{
+ checkReadOffset(m_read_offset, 8);
dst = readU64(&m_data[m_read_offset]);
- incrOffset<u64>();
+ m_read_offset += 8;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(float& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 4);
dst = readF1000(&m_data[m_read_offset]);
- incrOffset<float>();
+ m_read_offset += 4;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(v2f& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 8);
dst = readV2F1000(&m_data[m_read_offset]);
- incrOffset<v2f>();
+ m_read_offset += 8;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(v3f& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 12);
dst = readV3F1000(&m_data[m_read_offset]);
- incrOffset<v3f>();
+ m_read_offset += 12;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(s16& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 2);
dst = readS16(&m_data[m_read_offset]);
- incrOffset<s16>();
+ m_read_offset += 2;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(s32& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 4);
dst = readS32(&m_data[m_read_offset]);
- incrOffset<s32>();
+ m_read_offset += 4;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(v3s16& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 6);
dst = readV3S16(&m_data[m_read_offset]);
- incrOffset<v3s16>();
+ m_read_offset += 6;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(v2s32& dst)
{
+ checkReadOffset(m_read_offset, 8);
+
dst = readV2S32(&m_data[m_read_offset]);
- incrOffset<v2s32>();
+ m_read_offset += 8;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(v3s32& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 12);
dst = readV3S32(&m_data[m_read_offset]);
- incrOffset<v3s32>();
+ m_read_offset += 12;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(video::SColor& dst)
{
- checkReadOffset(m_read_offset);
+ checkReadOffset(m_read_offset, 4);
dst = readARGB8(&m_data[m_read_offset]);
- incrOffset<u32>();
+ m_read_offset += 4;
return *this;
}
NetworkPacket& NetworkPacket::operator<<(video::SColor src)
{
- checkDataSize<u32>();
+ checkDataSize(4);
writeU32(&m_data[m_read_offset], src.color);
- incrOffset<u32>();
+ m_read_offset += 4;
return *this;
}
-Buffer<u8> NetworkPacket::oldForgePacket()
+SharedBuffer<u8> NetworkPacket::oldForgePacket()
{
- Buffer<u8> sb(m_datasize + 2);
+ SharedBuffer<u8> sb(m_datasize + 2);
writeU16(&sb[0], m_command);
u8* datas = getU8Ptr(0);