diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-09-27 19:47:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-27 19:47:36 +0200 |
commit | ad7daf7b52348e1b71aa803be10de5b2134cba11 (patch) | |
tree | e5a528d0e9be11f678d113dde3ec4b49f3d96c26 /src/network/networkpacket.h | |
parent | 50b2185ced9dc64e054ce743bbc22d15ecdf6192 (diff) | |
download | minetest-ad7daf7b52348e1b71aa803be10de5b2134cba11.tar.gz minetest-ad7daf7b52348e1b71aa803be10de5b2134cba11.tar.bz2 minetest-ad7daf7b52348e1b71aa803be10de5b2134cba11.zip |
Add session_t typedef + remove unused functions (#6470)
* Add session_t typedef + remove unused functions
u16 peer_id is used everywhere, to be more consistent and permit some evolutions on this type in the future (i'm working on a PoC), uniformize u16 peer_id to SessionId peer_id
Diffstat (limited to 'src/network/networkpacket.h')
-rw-r--r-- | src/network/networkpacket.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h index 008271fab..760b51f7a 100644 --- a/src/network/networkpacket.h +++ b/src/network/networkpacket.h @@ -22,23 +22,24 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <ctime> #include "util/pointer.h" #include "util/numeric.h" +#include "networkprotocol.h" #include <SColor.h> class NetworkPacket { public: - NetworkPacket(u16 command, u32 datasize, u16 peer_id); + NetworkPacket(u16 command, u32 datasize, session_t peer_id); NetworkPacket(u16 command, u32 datasize); NetworkPacket() = default; ~NetworkPacket(); - void putRawPacket(u8 *data, u32 datasize, u16 peer_id); + void putRawPacket(u8 *data, u32 datasize, session_t peer_id); // Getters - u32 getSize() { return m_datasize; } - u16 getPeerId() { return m_peer_id; } + u32 getSize() const { return m_datasize; } + session_t getPeerId() const { 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); } @@ -135,5 +136,5 @@ private: u32 m_datasize = 0; u32 m_read_offset = 0; u16 m_command = 0; - u16 m_peer_id = 0; + session_t m_peer_id = 0; }; |