/*
Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2015 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
This program is free software; you can redistribute it and/or modify
#include "networkpacket.h"
#include "debug.h"
+#include "exceptions.h"
#include "util/serialize.h"
-NetworkPacket::NetworkPacket(u8 *data, u32 datasize, u16 peer_id):
-m_peer_id(peer_id)
+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_read_offset = 0;
- m_datasize = datasize - 2;
-
- // Copy data packet to remove opcode
- m_data = new u8[m_datasize];
+ m_data.resize(m_datasize);
+}
- memcpy(m_data, &data[2], m_datasize);
+NetworkPacket::NetworkPacket(u16 command, u32 datasize):
+m_datasize(datasize), m_read_offset(0), m_command(command), m_peer_id(0)
+{
+ m_data.resize(m_datasize);
}
NetworkPacket::~NetworkPacket()
{
- delete [] m_data;
+ m_data.clear();
+}
+
+void NetworkPacket::checkReadOffset(u32 from_offset, u32 field_size)
+{
+ if (from_offset + field_size > m_datasize) {
+ std::stringstream ss;
+ ss << "Reading outside packet (offset: " <<
+ from_offset << ", packet size: " << getSize() << ")";
+ throw PacketError(ss.str());
+ }
}
-char* NetworkPacket::getString(u32 from_offset)
+void NetworkPacket::putRawPacket(u8 *data, u32 datasize, u16 peer_id)
{
- assert(from_offset < m_datasize);
+ // If a m_command is already set, we are rewriting on same packet
+ // This is not permitted
+ assert(m_command == 0);
+
+ m_datasize = datasize - 2;
+ m_peer_id = peer_id;
+
+ // split command and datas
+ m_command = readU16(&data[0]);
+ m_data = std::vector<u8>(&data[2], &data[2 + m_datasize]);
+}
+
+const char* NetworkPacket::getString(u32 from_offset)
+{
+ checkReadOffset(from_offset, 0);
return (char*)&m_data[from_offset];
}
-char NetworkPacket::getChar(u32 offset)
+void NetworkPacket::putRawString(const char* src, u32 len)
{
- assert(offset < m_datasize);
+ if (m_read_offset + len > m_datasize) {
+ m_datasize = m_read_offset + len;
+ m_data.resize(m_datasize);
+ }
+
+ if (len == 0)
+ return;
- return m_data[offset];
+ 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)
+{
+ u16 msgsize = src.size();
+ if (msgsize > STRING_MAX_LEN) {
+ throw PacketError("String too long");
+ }
+
+ *this << msgsize;
+
+ putRawString(src.c_str(), (u32)msgsize);
+
return *this;
}
+void NetworkPacket::putLongString(std::string src)
+{
+ u32 msgsize = src.size();
+ if (msgsize > LONG_STRING_MAX_LEN) {
+ throw PacketError("String too long");
+ }
+
+ *this << 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)
+{
+ u16 msgsize = src.size();
+ if (msgsize > WIDE_STRING_MAX_LEN) {
+ throw PacketError("String too long");
+ }
+
+ *this << msgsize;
+
+ // Write string
+ for (u16 i=0; i<msgsize; i++) {
+ *this << (u16) src[i];
+ }
+
+ return *this;
+}
+
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)
{
- dst = getChar(m_read_offset);
+ checkReadOffset(m_read_offset, 1);
+
+ dst = readU8(&m_data[m_read_offset]);
- m_read_offset += sizeof(char);
+ m_read_offset += 1;
return *this;
}
-u8* NetworkPacket::getU8Ptr(u32 from_offset)
+char NetworkPacket::getChar(u32 offset)
{
- assert(from_offset < m_datasize);
+ checkReadOffset(offset, 1);
- return (u8*)&m_data[from_offset];
+ return readU8(&m_data[offset]);
}
-u8 NetworkPacket::getU8(u32 offset)
+NetworkPacket& NetworkPacket::operator<<(char src)
{
- assert(offset < m_datasize);
+ checkDataSize(1);
+
+ writeU8(&m_data[m_read_offset], src);
- return m_data[offset];
+ m_read_offset += 1;
+ return *this;
}
-NetworkPacket& NetworkPacket::operator>>(u8& dst)
+NetworkPacket& NetworkPacket::operator<<(u8 src)
{
- assert(m_read_offset < m_datasize);
- dst = m_data[m_read_offset];
+ checkDataSize(1);
+
+ writeU8(&m_data[m_read_offset], src);
- m_read_offset += sizeof(u8);
+ m_read_offset += 1;
return *this;
}
-NetworkPacket& NetworkPacket::operator>>(bool& dst)
+NetworkPacket& NetworkPacket::operator<<(bool src)
{
- assert(m_read_offset < m_datasize);
- dst = m_data[m_read_offset];
+ checkDataSize(1);
+
+ writeU8(&m_data[m_read_offset], src);
- m_read_offset += sizeof(u8);
+ m_read_offset += 1;
return *this;
}
-u16 NetworkPacket::getU16(u32 from_offset)
+NetworkPacket& NetworkPacket::operator<<(u16 src)
{
- assert(from_offset < m_datasize);
+ checkDataSize(2);
- return readU16(&m_data[from_offset]);
+ writeU16(&m_data[m_read_offset], src);
+
+ m_read_offset += 2;
+ return *this;
}
-NetworkPacket& NetworkPacket::operator>>(u16& dst)
+NetworkPacket& NetworkPacket::operator<<(u32 src)
{
- dst = getU16(m_read_offset);
+ checkDataSize(4);
- m_read_offset += sizeof(u16);
+ writeU32(&m_data[m_read_offset], src);
+
+ m_read_offset += 4;
return *this;
}
-u32 NetworkPacket::getU32(u32 from_offset)
+NetworkPacket& NetworkPacket::operator<<(u64 src)
{
- assert(from_offset < m_datasize);
+ checkDataSize(8);
+
+ writeU64(&m_data[m_read_offset], src);
- return readU32(&m_data[from_offset]);
+ m_read_offset += 8;
+ return *this;
}
-NetworkPacket& NetworkPacket::operator>>(u32& dst)
+NetworkPacket& NetworkPacket::operator<<(float src)
{
- dst = getU32(m_read_offset);
+ checkDataSize(4);
+
+ writeF1000(&m_data[m_read_offset], src);
- m_read_offset += sizeof(u32);
+ m_read_offset += 4;
return *this;
}
-u64 NetworkPacket::getU64(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(bool& dst)
{
- assert(from_offset < m_datasize);
+ checkReadOffset(m_read_offset, 1);
+
+ dst = readU8(&m_data[m_read_offset]);
- return readU64(&m_data[from_offset]);
+ m_read_offset += 1;
+ return *this;
}
-NetworkPacket& NetworkPacket::operator>>(u64& dst)
+NetworkPacket& NetworkPacket::operator>>(u8& dst)
+{
+ checkReadOffset(m_read_offset, 1);
+
+ dst = readU8(&m_data[m_read_offset]);
+
+ m_read_offset += 1;
+ return *this;
+}
+
+u8 NetworkPacket::getU8(u32 offset)
+{
+ checkReadOffset(offset, 1);
+
+ return readU8(&m_data[offset]);
+}
+
+u8* NetworkPacket::getU8Ptr(u32 from_offset)
+{
+ if (m_datasize == 0) {
+ return NULL;
+ }
+
+ checkReadOffset(from_offset, 1);
+
+ return (u8*)&m_data[from_offset];
+}
+
+NetworkPacket& NetworkPacket::operator>>(u16& dst)
+{
+ checkReadOffset(m_read_offset, 2);
+
+ dst = readU16(&m_data[m_read_offset]);
+
+ m_read_offset += 2;
+ return *this;
+}
+
+u16 NetworkPacket::getU16(u32 from_offset)
+{
+ checkReadOffset(from_offset, 2);
+
+ return readU16(&m_data[from_offset]);
+}
+
+NetworkPacket& NetworkPacket::operator>>(u32& dst)
{
- dst = getU64(m_read_offset);
+ checkReadOffset(m_read_offset, 4);
- m_read_offset += sizeof(u64);
+ dst = readU32(&m_data[m_read_offset]);
+
+ m_read_offset += 4;
return *this;
}
-float NetworkPacket::getF1000(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(u64& dst)
{
- assert(from_offset < m_datasize);
+ checkReadOffset(m_read_offset, 8);
- return readF1000(&m_data[from_offset]);
+ dst = readU64(&m_data[m_read_offset]);
+
+ m_read_offset += 8;
+ return *this;
}
NetworkPacket& NetworkPacket::operator>>(float& dst)
{
- dst = getF1000(m_read_offset);
+ checkReadOffset(m_read_offset, 4);
+
+ dst = readF1000(&m_data[m_read_offset]);
- m_read_offset += sizeof(float);
+ m_read_offset += 4;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(v2f& dst)
{
- assert(m_read_offset < m_datasize);
+ checkReadOffset(m_read_offset, 8);
dst = readV2F1000(&m_data[m_read_offset]);
- m_read_offset += sizeof(v2f);
+ m_read_offset += 8;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(v3f& dst)
{
- assert(m_read_offset < m_datasize);
+ checkReadOffset(m_read_offset, 12);
dst = readV3F1000(&m_data[m_read_offset]);
- m_read_offset += sizeof(v3f);
+ m_read_offset += 12;
return *this;
}
-s16 NetworkPacket::getS16(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(s16& dst)
{
- assert(from_offset < m_datasize);
+ checkReadOffset(m_read_offset, 2);
+
+ dst = readS16(&m_data[m_read_offset]);
- return readS16(&m_data[from_offset]);
+ m_read_offset += 2;
+ return *this;
}
-NetworkPacket& NetworkPacket::operator>>(s16& dst)
+NetworkPacket& NetworkPacket::operator<<(s16 src)
{
- dst = getS16(m_read_offset);
-
- m_read_offset += sizeof(s16);
+ *this << (u16) src;
return *this;
}
-s32 NetworkPacket::getS32(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(s32& dst)
{
- assert(from_offset < m_datasize);
+ checkReadOffset(m_read_offset, 4);
- return readS32(&m_data[from_offset]);
+ dst = readS32(&m_data[m_read_offset]);
+
+ m_read_offset += 4;
+ return *this;
}
-NetworkPacket& NetworkPacket::operator>>(s32& dst)
+NetworkPacket& NetworkPacket::operator<<(s32 src)
+{
+ *this << (u32) src;
+ return *this;
+}
+
+NetworkPacket& NetworkPacket::operator>>(v3s16& dst)
{
- dst = getS32(m_read_offset);
+ checkReadOffset(m_read_offset, 6);
- m_read_offset += sizeof(s32);
+ dst = readV3S16(&m_data[m_read_offset]);
+
+ m_read_offset += 6;
return *this;
}
NetworkPacket& NetworkPacket::operator>>(v2s32& dst)
{
+ checkReadOffset(m_read_offset, 8);
+
dst = readV2S32(&m_data[m_read_offset]);
- m_read_offset += sizeof(v2s32);
+ m_read_offset += 8;
return *this;
}
-v3s16 NetworkPacket::getV3S16(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(v3s32& dst)
{
- assert(from_offset < m_datasize);
+ checkReadOffset(m_read_offset, 12);
+
+ dst = readV3S32(&m_data[m_read_offset]);
- return readV3S16(&m_data[from_offset]);
+ m_read_offset += 12;
+ return *this;
}
-NetworkPacket& NetworkPacket::operator>>(v3s16& dst)
+NetworkPacket& NetworkPacket::operator<<(v2f src)
+{
+ *this << (float) src.X;
+ *this << (float) src.Y;
+ return *this;
+}
+
+NetworkPacket& NetworkPacket::operator<<(v3f src)
+{
+ *this << (float) src.X;
+ *this << (float) src.Y;
+ *this << (float) src.Z;
+ return *this;
+}
+
+NetworkPacket& NetworkPacket::operator<<(v3s16 src)
+{
+ *this << (s16) src.X;
+ *this << (s16) src.Y;
+ *this << (s16) src.Z;
+ return *this;
+}
+
+NetworkPacket& NetworkPacket::operator<<(v2s32 src)
{
- dst = getV3S16(m_read_offset);
+ *this << (s32) src.X;
+ *this << (s32) src.Y;
+ return *this;
+}
- m_read_offset += sizeof(v3s16);
+NetworkPacket& NetworkPacket::operator<<(v3s32 src)
+{
+ *this << (s32) src.X;
+ *this << (s32) src.Y;
+ *this << (s32) src.Z;
return *this;
}
-v3s32 NetworkPacket::getV3S32(u32 from_offset)
+NetworkPacket& NetworkPacket::operator>>(video::SColor& dst)
{
- assert(from_offset < m_datasize);
+ checkReadOffset(m_read_offset, 4);
- return readV3S32(&m_data[from_offset]);
+ dst = readARGB8(&m_data[m_read_offset]);
+
+ m_read_offset += 4;
+ return *this;
}
-NetworkPacket& NetworkPacket::operator>>(v3s32& dst)
+NetworkPacket& NetworkPacket::operator<<(video::SColor src)
{
- dst = getV3S32(m_read_offset);
+ checkDataSize(4);
- m_read_offset += sizeof(v3s32);
+ writeU32(&m_data[m_read_offset], src.color);
+
+ m_read_offset += 4;
return *this;
}
+
+Buffer<u8> NetworkPacket::oldForgePacket()
+{
+ Buffer<u8> sb(m_datasize + 2);
+ writeU16(&sb[0], m_command);
+
+ u8* datas = getU8Ptr(0);
+
+ if (datas != NULL)
+ memcpy(&sb[2], datas, m_datasize);
+ return sb;
+}
projects / dragonfireclient.git / blobdiff