diff options
Diffstat (limited to 'src/network/networkpacket.cpp')
| -rw-r--r-- | src/network/networkpacket.cpp | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp index 4d531b611..e82dd583e 100644 --- a/src/network/networkpacket.cpp +++ b/src/network/networkpacket.cpp @@ -23,14 +23,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/serialize.h" #include "networkprotocol.h" -NetworkPacket::NetworkPacket(u16 command, u32 datasize, session_t peer_id): -m_datasize(datasize), m_command(command), m_peer_id(peer_id) +NetworkPacket::NetworkPacket(u16 command, u32 datasize, session_t 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_command(command) +NetworkPacket::NetworkPacket(u16 command, u32 datasize) : + m_datasize(datasize), m_command(command) { m_data.resize(m_datasize); } @@ -44,8 +44,8 @@ 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() << ")"; + ss << "Reading outside packet (offset: " << from_offset + << ", packet size: " << getSize() << ")"; throw PacketError(ss.str()); } } @@ -75,14 +75,14 @@ void NetworkPacket::clear() m_peer_id = 0; } -const char* NetworkPacket::getString(u32 from_offset) +const char *NetworkPacket::getString(u32 from_offset) { checkReadOffset(from_offset, 0); - return (char*)&m_data[from_offset]; + return (char *)&m_data[from_offset]; } -void NetworkPacket::putRawString(const char* src, u32 len) +void NetworkPacket::putRawString(const char *src, u32 len) { if (m_read_offset + len > m_datasize) { m_datasize = m_read_offset + len; @@ -96,7 +96,7 @@ void NetworkPacket::putRawString(const char* src, u32 len) m_read_offset += len; } -NetworkPacket& NetworkPacket::operator>>(std::string& dst) +NetworkPacket &NetworkPacket::operator>>(std::string &dst) { checkReadOffset(m_read_offset, 2); u16 strLen = readU16(&m_data[m_read_offset]); @@ -111,13 +111,13 @@ NetworkPacket& NetworkPacket::operator>>(std::string& dst) checkReadOffset(m_read_offset, strLen); dst.reserve(strLen); - dst.append((char*)&m_data[m_read_offset], strLen); + dst.append((char *)&m_data[m_read_offset], strLen); m_read_offset += strLen; return *this; } -NetworkPacket& NetworkPacket::operator<<(const std::string &src) +NetworkPacket &NetworkPacket::operator<<(const std::string &src) { if (src.size() > STRING_MAX_LEN) { throw PacketError("String too long"); @@ -145,7 +145,7 @@ void NetworkPacket::putLongString(const std::string &src) putRawString(src.c_str(), msgsize); } -NetworkPacket& NetworkPacket::operator>>(std::wstring& dst) +NetworkPacket &NetworkPacket::operator>>(std::wstring &dst) { checkReadOffset(m_read_offset, 2); u16 strLen = readU16(&m_data[m_read_offset]); @@ -160,7 +160,7 @@ NetworkPacket& NetworkPacket::operator>>(std::wstring& dst) checkReadOffset(m_read_offset, strLen * 2); dst.reserve(strLen); - for(u16 i=0; i<strLen; i++) { + for (u16 i = 0; i < strLen; i++) { wchar_t c16 = readU16(&m_data[m_read_offset]); dst.append(&c16, 1); m_read_offset += sizeof(u16); @@ -169,7 +169,7 @@ NetworkPacket& NetworkPacket::operator>>(std::wstring& dst) return *this; } -NetworkPacket& NetworkPacket::operator<<(const std::wstring &src) +NetworkPacket &NetworkPacket::operator<<(const std::wstring &src) { if (src.size() > WIDE_STRING_MAX_LEN) { throw PacketError("String too long"); @@ -180,8 +180,8 @@ NetworkPacket& NetworkPacket::operator<<(const std::wstring &src) *this << msgsize; // Write string - for (u16 i=0; i<msgsize; i++) { - *this << (u16) src[i]; + for (u16 i = 0; i < msgsize; i++) { + *this << (u16)src[i]; } return *this; @@ -206,14 +206,14 @@ std::string NetworkPacket::readLongString() std::string dst; dst.reserve(strLen); - dst.append((char*)&m_data[m_read_offset], strLen); + dst.append((char *)&m_data[m_read_offset], strLen); m_read_offset += strLen; return dst; } -NetworkPacket& NetworkPacket::operator>>(char& dst) +NetworkPacket &NetworkPacket::operator>>(char &dst) { checkReadOffset(m_read_offset, 1); @@ -230,7 +230,7 @@ char NetworkPacket::getChar(u32 offset) return readU8(&m_data[offset]); } -NetworkPacket& NetworkPacket::operator<<(char src) +NetworkPacket &NetworkPacket::operator<<(char src) { checkDataSize(1); @@ -240,7 +240,7 @@ NetworkPacket& NetworkPacket::operator<<(char src) return *this; } -NetworkPacket& NetworkPacket::operator<<(u8 src) +NetworkPacket &NetworkPacket::operator<<(u8 src) { checkDataSize(1); @@ -250,7 +250,7 @@ NetworkPacket& NetworkPacket::operator<<(u8 src) return *this; } -NetworkPacket& NetworkPacket::operator<<(bool src) +NetworkPacket &NetworkPacket::operator<<(bool src) { checkDataSize(1); @@ -260,7 +260,7 @@ NetworkPacket& NetworkPacket::operator<<(bool src) return *this; } -NetworkPacket& NetworkPacket::operator<<(u16 src) +NetworkPacket &NetworkPacket::operator<<(u16 src) { checkDataSize(2); @@ -270,7 +270,7 @@ NetworkPacket& NetworkPacket::operator<<(u16 src) return *this; } -NetworkPacket& NetworkPacket::operator<<(u32 src) +NetworkPacket &NetworkPacket::operator<<(u32 src) { checkDataSize(4); @@ -280,7 +280,7 @@ NetworkPacket& NetworkPacket::operator<<(u32 src) return *this; } -NetworkPacket& NetworkPacket::operator<<(u64 src) +NetworkPacket &NetworkPacket::operator<<(u64 src) { checkDataSize(8); @@ -290,7 +290,7 @@ NetworkPacket& NetworkPacket::operator<<(u64 src) return *this; } -NetworkPacket& NetworkPacket::operator<<(float src) +NetworkPacket &NetworkPacket::operator<<(float src) { checkDataSize(4); @@ -300,7 +300,7 @@ NetworkPacket& NetworkPacket::operator<<(float src) return *this; } -NetworkPacket& NetworkPacket::operator>>(bool& dst) +NetworkPacket &NetworkPacket::operator>>(bool &dst) { checkReadOffset(m_read_offset, 1); @@ -310,7 +310,7 @@ NetworkPacket& NetworkPacket::operator>>(bool& dst) return *this; } -NetworkPacket& NetworkPacket::operator>>(u8& dst) +NetworkPacket &NetworkPacket::operator>>(u8 &dst) { checkReadOffset(m_read_offset, 1); @@ -327,7 +327,7 @@ u8 NetworkPacket::getU8(u32 offset) return readU8(&m_data[offset]); } -u8* NetworkPacket::getU8Ptr(u32 from_offset) +u8 *NetworkPacket::getU8Ptr(u32 from_offset) { if (m_datasize == 0) { return NULL; @@ -335,10 +335,10 @@ u8* NetworkPacket::getU8Ptr(u32 from_offset) checkReadOffset(from_offset, 1); - return (u8*)&m_data[from_offset]; + return (u8 *)&m_data[from_offset]; } -NetworkPacket& NetworkPacket::operator>>(u16& dst) +NetworkPacket &NetworkPacket::operator>>(u16 &dst) { checkReadOffset(m_read_offset, 2); @@ -355,7 +355,7 @@ u16 NetworkPacket::getU16(u32 from_offset) return readU16(&m_data[from_offset]); } -NetworkPacket& NetworkPacket::operator>>(u32& dst) +NetworkPacket &NetworkPacket::operator>>(u32 &dst) { checkReadOffset(m_read_offset, 4); @@ -365,7 +365,7 @@ NetworkPacket& NetworkPacket::operator>>(u32& dst) return *this; } -NetworkPacket& NetworkPacket::operator>>(u64& dst) +NetworkPacket &NetworkPacket::operator>>(u64 &dst) { checkReadOffset(m_read_offset, 8); @@ -375,7 +375,7 @@ NetworkPacket& NetworkPacket::operator>>(u64& dst) return *this; } -NetworkPacket& NetworkPacket::operator>>(float& dst) +NetworkPacket &NetworkPacket::operator>>(float &dst) { checkReadOffset(m_read_offset, 4); @@ -385,7 +385,7 @@ NetworkPacket& NetworkPacket::operator>>(float& dst) return *this; } -NetworkPacket& NetworkPacket::operator>>(v2f& dst) +NetworkPacket &NetworkPacket::operator>>(v2f &dst) { checkReadOffset(m_read_offset, 8); @@ -395,7 +395,7 @@ NetworkPacket& NetworkPacket::operator>>(v2f& dst) return *this; } -NetworkPacket& NetworkPacket::operator>>(v3f& dst) +NetworkPacket &NetworkPacket::operator>>(v3f &dst) { checkReadOffset(m_read_offset, 12); @@ -405,7 +405,7 @@ NetworkPacket& NetworkPacket::operator>>(v3f& dst) return *this; } -NetworkPacket& NetworkPacket::operator>>(s16& dst) +NetworkPacket &NetworkPacket::operator>>(s16 &dst) { checkReadOffset(m_read_offset, 2); @@ -415,13 +415,13 @@ NetworkPacket& NetworkPacket::operator>>(s16& dst) return *this; } -NetworkPacket& NetworkPacket::operator<<(s16 src) +NetworkPacket &NetworkPacket::operator<<(s16 src) { - *this << (u16) src; + *this << (u16)src; return *this; } -NetworkPacket& NetworkPacket::operator>>(s32& dst) +NetworkPacket &NetworkPacket::operator>>(s32 &dst) { checkReadOffset(m_read_offset, 4); @@ -431,13 +431,13 @@ NetworkPacket& NetworkPacket::operator>>(s32& dst) return *this; } -NetworkPacket& NetworkPacket::operator<<(s32 src) +NetworkPacket &NetworkPacket::operator<<(s32 src) { - *this << (u32) src; + *this << (u32)src; return *this; } -NetworkPacket& NetworkPacket::operator>>(v3s16& dst) +NetworkPacket &NetworkPacket::operator>>(v3s16 &dst) { checkReadOffset(m_read_offset, 6); @@ -447,7 +447,7 @@ NetworkPacket& NetworkPacket::operator>>(v3s16& dst) return *this; } -NetworkPacket& NetworkPacket::operator>>(v2s32& dst) +NetworkPacket &NetworkPacket::operator>>(v2s32 &dst) { checkReadOffset(m_read_offset, 8); @@ -457,7 +457,7 @@ NetworkPacket& NetworkPacket::operator>>(v2s32& dst) return *this; } -NetworkPacket& NetworkPacket::operator>>(v3s32& dst) +NetworkPacket &NetworkPacket::operator>>(v3s32 &dst) { checkReadOffset(m_read_offset, 12); @@ -467,45 +467,45 @@ NetworkPacket& NetworkPacket::operator>>(v3s32& dst) return *this; } -NetworkPacket& NetworkPacket::operator<<(v2f src) +NetworkPacket &NetworkPacket::operator<<(v2f src) { - *this << (float) src.X; - *this << (float) src.Y; + *this << (float)src.X; + *this << (float)src.Y; return *this; } -NetworkPacket& NetworkPacket::operator<<(v3f src) +NetworkPacket &NetworkPacket::operator<<(v3f src) { - *this << (float) src.X; - *this << (float) src.Y; - *this << (float) src.Z; + *this << (float)src.X; + *this << (float)src.Y; + *this << (float)src.Z; return *this; } -NetworkPacket& NetworkPacket::operator<<(v3s16 src) +NetworkPacket &NetworkPacket::operator<<(v3s16 src) { - *this << (s16) src.X; - *this << (s16) src.Y; - *this << (s16) src.Z; + *this << (s16)src.X; + *this << (s16)src.Y; + *this << (s16)src.Z; return *this; } -NetworkPacket& NetworkPacket::operator<<(v2s32 src) +NetworkPacket &NetworkPacket::operator<<(v2s32 src) { - *this << (s32) src.X; - *this << (s32) src.Y; + *this << (s32)src.X; + *this << (s32)src.Y; return *this; } -NetworkPacket& NetworkPacket::operator<<(v3s32 src) +NetworkPacket &NetworkPacket::operator<<(v3s32 src) { - *this << (s32) src.X; - *this << (s32) src.Y; - *this << (s32) src.Z; + *this << (s32)src.X; + *this << (s32)src.Y; + *this << (s32)src.Z; return *this; } -NetworkPacket& NetworkPacket::operator>>(video::SColor& dst) +NetworkPacket &NetworkPacket::operator>>(video::SColor &dst) { checkReadOffset(m_read_offset, 4); @@ -515,7 +515,7 @@ NetworkPacket& NetworkPacket::operator>>(video::SColor& dst) return *this; } -NetworkPacket& NetworkPacket::operator<<(video::SColor src) +NetworkPacket &NetworkPacket::operator<<(video::SColor src) { checkDataSize(4); @@ -530,7 +530,7 @@ SharedBuffer<u8> NetworkPacket::oldForgePacket() SharedBuffer<u8> sb(m_datasize + 2); writeU16(&sb[0], m_command); - u8* datas = getU8Ptr(0); + u8 *datas = getU8Ptr(0); if (datas != NULL) memcpy(&sb[2], datas, m_datasize); |