oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-27 17:28:41 +00:00
Code Wiki Activity

Network cleanup (#6302)

Browse source 
* Cleanup network headers

* Move peerhandler to a specific header to reduce compilation times
* Move socket.cpp/h to network folder

* More work

* Network code cleanups

* Move socket.{cpp,h} to network folder
* Move Address object to network/address.{cpp,h}
* Move network exceptions to network/networkexceptions.h
* Client: use unique_ptr for Connection
* Server/ClientIface: use shared_ptr for Connection

* Format fixes

* Remove socket.cpp socket.h from clang-format whitelist

* Also fix NetworkPacket code style & make it under clang-format
This commit is contained in:
Loïc Blot 2017-08-24 08:28:54 +02:00 • committed by GitHub
parent 928609c8bd
commit c7160cb629
27 changed files with 1059 additions and 924 deletions
Download patch file Download diff file Expand all files Collapse all files

151
src/network/networkpacket.h
View file

@ -28,109 +28,112 @@ class NetworkPacket
{
public:
NetworkPacket(u16 command, u32 datasize, u16 peer_id);
NetworkPacket(u16 command, u32 datasize);
NetworkPacket() = default;
NetworkPacket(u16 command, u32 datasize, u16 peer_id);
NetworkPacket(u16 command, u32 datasize);
NetworkPacket() = default;
~NetworkPacket();
~NetworkPacket();
void putRawPacket(u8 *data, u32 datasize, u16 peer_id);
void putRawPacket(u8 *data, u32 datasize, u16 peer_id);
// Getters
u32 getSize() { return m_datasize; }
u16 getPeerId() { return m_peer_id; }
u16 getCommand() { return m_command; }
const u32 getRemainingBytes() const { return m_datasize - m_read_offset; }
const char* getRemainingString() { return getString(m_read_offset); }
// Getters
u32 getSize() { return m_datasize; }
u16 getPeerId() { return m_peer_id; }
u16 getCommand() { return m_command; }
const u32 getRemainingBytes() const { return m_datasize - m_read_offset; }
const char *getRemainingString() { return getString(m_read_offset); }
// Returns a c-string without copying.
// A better name for this would be getRawString()
const char* getString(u32 from_offset);
// major difference to putCString(): doesn't write len into the buffer
void putRawString(const char* src, u32 len);
void putRawString(const std::string &src)
{ putRawString(src.c_str(), src.size()); }
// Returns a c-string without copying.
// A better name for this would be getRawString()
const char *getString(u32 from_offset);
// major difference to putCString(): doesn't write len into the buffer
void putRawString(const char *src, u32 len);
void putRawString(const std::string &src)
{
putRawString(src.c_str(), src.size());
}
NetworkPacket& operator>>(std::string& dst);
NetworkPacket& operator<<(const std::string &src);
NetworkPacket &operator>>(std::string &dst);
NetworkPacket &operator<<(const std::string &src);
void putLongString(const std::string &src);
void putLongString(const std::string &src);
NetworkPacket& operator>>(std::wstring& dst);
NetworkPacket& operator<<(const std::wstring &src);
NetworkPacket &operator>>(std::wstring &dst);
NetworkPacket &operator<<(const std::wstring &src);
std::string readLongString();
std::string readLongString();
char getChar(u32 offset);
NetworkPacket& operator>>(char& dst);
NetworkPacket& operator<<(char src);
char getChar(u32 offset);
NetworkPacket &operator>>(char &dst);
NetworkPacket &operator<<(char src);
NetworkPacket& operator>>(bool& dst);
NetworkPacket& operator<<(bool src);
NetworkPacket &operator>>(bool &dst);
NetworkPacket &operator<<(bool src);
u8 getU8(u32 offset);
u8 getU8(u32 offset);
NetworkPacket& operator>>(u8& dst);
NetworkPacket& operator<<(u8 src);
NetworkPacket &operator>>(u8 &dst);
NetworkPacket &operator<<(u8 src);
u8* getU8Ptr(u32 offset);
u8 *getU8Ptr(u32 offset);
u16 getU16(u32 from_offset);
NetworkPacket& operator>>(u16& dst);
NetworkPacket& operator<<(u16 src);
u16 getU16(u32 from_offset);
NetworkPacket &operator>>(u16 &dst);
NetworkPacket &operator<<(u16 src);
NetworkPacket& operator>>(u32& dst);
NetworkPacket& operator<<(u32 src);
NetworkPacket &operator>>(u32 &dst);
NetworkPacket &operator<<(u32 src);
NetworkPacket& operator>>(u64& dst);
NetworkPacket& operator<<(u64 src);
NetworkPacket &operator>>(u64 &dst);
NetworkPacket &operator<<(u64 src);
NetworkPacket& operator>>(std::time_t& dst);
NetworkPacket& operator<<(std::time_t src);
NetworkPacket &operator>>(std::time_t &dst);
NetworkPacket &operator<<(std::time_t src);
NetworkPacket& operator>>(float& dst);
NetworkPacket& operator<<(float src);
NetworkPacket &operator>>(float &dst);
NetworkPacket &operator<<(float src);
NetworkPacket& operator>>(v2f& dst);
NetworkPacket& operator<<(v2f src);
NetworkPacket &operator>>(v2f &dst);
NetworkPacket &operator<<(v2f src);
NetworkPacket& operator>>(v3f& dst);
NetworkPacket& operator<<(v3f src);
NetworkPacket &operator>>(v3f &dst);
NetworkPacket &operator<<(v3f src);
NetworkPacket& operator>>(s16& dst);
NetworkPacket& operator<<(s16 src);
NetworkPacket &operator>>(s16 &dst);
NetworkPacket &operator<<(s16 src);
NetworkPacket& operator>>(s32& dst);
NetworkPacket& operator<<(s32 src);
NetworkPacket &operator>>(s32 &dst);
NetworkPacket &operator<<(s32 src);
NetworkPacket& operator>>(v2s32& dst);
NetworkPacket& operator<<(v2s32 src);
NetworkPacket &operator>>(v2s32 &dst);
NetworkPacket &operator<<(v2s32 src);
NetworkPacket& operator>>(v3s16& dst);
NetworkPacket& operator<<(v3s16 src);
NetworkPacket &operator>>(v3s16 &dst);
NetworkPacket &operator<<(v3s16 src);
NetworkPacket& operator>>(v3s32& dst);
NetworkPacket& operator<<(v3s32 src);
NetworkPacket &operator>>(v3s32 &dst);
NetworkPacket &operator<<(v3s32 src);
NetworkPacket& operator>>(video::SColor& dst);
NetworkPacket& operator<<(video::SColor src);
NetworkPacket &operator>>(video::SColor &dst);
NetworkPacket &operator<<(video::SColor src);
// Temp, we remove SharedBuffer when migration finished
Buffer<u8> oldForgePacket();
// Temp, we remove SharedBuffer when migration finished
Buffer<u8> oldForgePacket();
private:
void checkReadOffset(u32 from_offset, u32 field_size);
void checkReadOffset(u32 from_offset, u32 field_size);
inline void checkDataSize(u32 field_size)
{
if (m_read_offset + field_size > m_datasize) {
m_datasize = m_read_offset + field_size;
m_data.resize(m_datasize);
}
inline void checkDataSize(u32 field_size)
{
if (m_read_offset + field_size > m_datasize) {
m_datasize = m_read_offset + field_size;
m_data.resize(m_datasize);
}
}
std::vector<u8> m_data;
u32 m_datasize = 0;
u32 m_read_offset = 0;
u16 m_command = 0;
u16 m_peer_id = 0;
std::vector<u8> m_data;
u32 m_datasize = 0;
u32 m_read_offset = 0;
u16 m_command = 0;
u16 m_peer_id = 0;
};