Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / network / networkpacket.h

diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
index e8c8565b0190222cd69ee774f80b5474c33cc7ba..c7ff03b8ebbbed1dc31920eb8a06effe554f49da 100644 (file)
--- a/src/network/networkpacket.h
+++ b/src/network/networkpacket.h
@@ -17,113 +17,120 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef NETWORKPACKET_HEADER
-#define NETWORKPACKET_HEADER
+#pragma once
 
 #include "util/pointer.h"
 #include "util/numeric.h"
 #include "networkprotocol.h"
+#include <SColor.h>
 
 class NetworkPacket
 {
 
 public:
-               NetworkPacket(u8 *data, u32 datasize, u16 peer_id);
-               NetworkPacket(u16 command, u32 datasize, u16 peer_id);
-               NetworkPacket(u16 command, u32 datasize);
-               ~NetworkPacket();
+       NetworkPacket(u16 command, u32 datasize, session_t peer_id);
+       NetworkPacket(u16 command, u32 datasize);
+       NetworkPacket() = default;
 
-               // Getters
-               u32 getSize() { return m_datasize; }
-               u16 getPeerId() { return m_peer_id; }
-               u16 getCommand() { return m_command; }
+       ~NetworkPacket();
 
-               // Data extractors
-               char* getString(u32 from_offset);
-               void putRawString(const char* src, u32 len);
+       void putRawPacket(const u8 *data, u32 datasize, session_t peer_id);
+       void clear();
 
-               NetworkPacket& operator>>(std::string& dst);
-               NetworkPacket& operator<<(std::string src);
+       // Getters
+       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); }
 
-               void putLongString(std::string src);
+       // 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::wstring& dst);
-               NetworkPacket& operator<<(std::wstring src);
+       NetworkPacket &operator>>(std::string &dst);
+       NetworkPacket &operator<<(const std::string &src);
 
-               std::string readLongString();
+       void putLongString(const std::string &src);
 
-               char getChar(u32 offset);
-               NetworkPacket& operator>>(char& dst);
-               NetworkPacket& operator<<(char src);
+       NetworkPacket &operator>>(std::wstring &dst);
+       NetworkPacket &operator<<(const std::wstring &src);
 
-               NetworkPacket& operator>>(bool& dst);
-               NetworkPacket& operator<<(bool src);
+       std::string readLongString();
 
-               u8 getU8(u32 offset);
+       NetworkPacket &operator>>(char &dst);
+       NetworkPacket &operator<<(char src);
 
-               NetworkPacket& operator>>(u8& dst);
-               NetworkPacket& operator<<(u8 src);
+       NetworkPacket &operator>>(bool &dst);
+       NetworkPacket &operator<<(bool src);
 
-               u8* getU8Ptr(u32 offset);
+       u8 getU8(u32 offset);
 
-               u16 getU16(u32 from_offset);
-               NetworkPacket& operator>>(u16& dst);
-               NetworkPacket& operator<<(u16 src);
+       NetworkPacket &operator>>(u8 &dst);
+       NetworkPacket &operator<<(u8 src);
 
-               NetworkPacket& operator>>(u32& dst);
-               NetworkPacket& operator<<(u32 src);
+       u8 *getU8Ptr(u32 offset);
 
-               NetworkPacket& operator>>(u64& dst);
-               NetworkPacket& operator<<(u64 src);
+       u16 getU16(u32 from_offset);
+       NetworkPacket &operator>>(u16 &dst);
+       NetworkPacket &operator<<(u16 src);
 
-               NetworkPacket& operator>>(float& dst);
-               NetworkPacket& operator<<(float src);
+       NetworkPacket &operator>>(u32 &dst);
+       NetworkPacket &operator<<(u32 src);
 
-               NetworkPacket& operator>>(v2f& dst);
-               NetworkPacket& operator<<(v2f src);
+       NetworkPacket &operator>>(u64 &dst);
+       NetworkPacket &operator<<(u64 src);
 
-               NetworkPacket& operator>>(v3f& dst);
-               NetworkPacket& operator<<(v3f src);
+       NetworkPacket &operator>>(float &dst);
+       NetworkPacket &operator<<(float src);
 
-               NetworkPacket& operator>>(s16& dst);
-               NetworkPacket& operator<<(s16 src);
+       NetworkPacket &operator>>(v2f &dst);
+       NetworkPacket &operator<<(v2f src);
 
-               NetworkPacket& operator>>(s32& dst);
-               NetworkPacket& operator<<(s32 src);
+       NetworkPacket &operator>>(v3f &dst);
+       NetworkPacket &operator<<(v3f src);
 
-               NetworkPacket& operator>>(v2s32& dst);
-               NetworkPacket& operator<<(v2s32 src);
+       NetworkPacket &operator>>(s16 &dst);
+       NetworkPacket &operator<<(s16 src);
 
-               NetworkPacket& operator>>(v3s16& dst);
-               NetworkPacket& operator<<(v3s16 src);
+       NetworkPacket &operator>>(s32 &dst);
+       NetworkPacket &operator<<(s32 src);
 
-               NetworkPacket& operator>>(v3s32& dst);
-               NetworkPacket& operator<<(v3s32 src);
+       NetworkPacket &operator>>(v2s32 &dst);
+       NetworkPacket &operator<<(v2s32 src);
 
-               NetworkPacket& operator>>(video::SColor& dst);
-               NetworkPacket& operator<<(video::SColor src);
+       NetworkPacket &operator>>(v3s16 &dst);
+       NetworkPacket &operator<<(v3s16 src);
+
+       NetworkPacket &operator>>(v3s32 &dst);
+       NetworkPacket &operator<<(v3s32 src);
+
+       NetworkPacket &operator>>(video::SColor &dst);
+       NetworkPacket &operator<<(video::SColor src);
+
+       // Temp, we remove SharedBuffer when migration finished
+       SharedBuffer<u8> oldForgePacket();
 
-               // Temp, we remove SharedBuffer when migration finished
-               SharedBuffer<u8> oldForgePacket();
 private:
-               template<typename T> void checkDataSize()
-               {
-                       if (m_read_offset + sizeof(T) > m_datasize) {
-                               m_datasize += sizeof(T);
-                               m_data.resize(m_datasize);
-                       }
-               }
+       void checkReadOffset(u32 from_offset, u32 field_size);
 
-               template<typename T> void incrOffset()
-               {
-                       m_read_offset += sizeof(T);
+       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;
-               u32 m_read_offset;
-               u16 m_command;
-               u16 m_peer_id;
+       std::vector<u8> m_data;
+       u32 m_datasize = 0;
+       u32 m_read_offset = 0;
+       u16 m_command = 0;
+       session_t m_peer_id = 0;
 };
-
-#endif