Adding network msg to network msg

src/luascript.cpp

@@ -2527,6 +2527,7 @@ void LuaScriptInterface::registerFunctions()
 	registerMethod(L, "NetworkMessage", "addDouble", LuaScriptInterface::luaNetworkMessageAddDouble);
 	registerMethod(L, "NetworkMessage", "addItem", LuaScriptInterface::luaNetworkMessageAddItem);
 	registerMethod(L, "NetworkMessage", "addItemId", LuaScriptInterface::luaNetworkMessageAddItemId);
+	registerMethod(L, "NetworkMessage", "compose", LuaScriptInterface::luaNetworkMessageCompose);
 
 	registerMethod(L, "NetworkMessage", "reset", LuaScriptInterface::luaNetworkMessageReset);
 	registerMethod(L, "NetworkMessage", "seek", LuaScriptInterface::luaNetworkMessageSeek);
@@ -6293,6 +6294,26 @@ int LuaScriptInterface::luaNetworkMessageAddItemId(lua_State* L)
 	return 1;
 }
 
+int LuaScriptInterface::luaNetworkMessageCompose(lua_State* L)
+{
+	// networkMessage:compose(otherMsg)
+	NetworkMessage* message = tfs::lua::getUserdata<NetworkMessage>(L, 1);
+	if (!message) {
+		lua_pushnil(L);
+		return 1;
+	}
+
+	NetworkMessage* msgToAdd = tfs::lua::getUserdata<NetworkMessage>(L, 2);
+	if (!msgToAdd) {
+		lua_pushnil(L);
+		return 1;
+	}
+
+	message->addNetworkMessage(*msgToAdd);
+	tfs::lua::pushBoolean(L, true);
+	return 1;
+}
+
 int LuaScriptInterface::luaNetworkMessageReset(lua_State* L)
 {
 	// networkMessage:reset()

src/luascript.h

@@ -395,6 +395,7 @@ class LuaScriptInterface
 	static int luaNetworkMessageAddDouble(lua_State* L);
 	static int luaNetworkMessageAddItem(lua_State* L);
 	static int luaNetworkMessageAddItemId(lua_State* L);
+	static int luaNetworkMessageCompose(lua_State* L);
 
 	static int luaNetworkMessageReset(lua_State* L);
 	static int luaNetworkMessageSeek(lua_State* L);

src/networkmessage.cpp

@@ -10,6 +10,8 @@
 
 #include <boost/locale.hpp>
 
+static constexpr size_t MAX_BODY_SIZE = 8192;
+
 std::string NetworkMessage::getString(uint16_t stringLen /* = 0*/)
 {
 	if (stringLen == 0) {
@@ -42,7 +44,7 @@ void NetworkMessage::addString(std::string_view value)
 	std::string latin1Str = boost::locale::conv::from_utf<char>(value.data(), value.data() + value.size(), "ISO-8859-1",
 	                                                            boost::locale::conv::skip);
 	size_t stringLen = latin1Str.size();
-	if (!canAdd(stringLen + 2) || stringLen > 8192) {
+	if (!canAdd(stringLen + 2) || stringLen > MAX_BODY_SIZE) {
 		return;
 	}
 
@@ -61,7 +63,18 @@ void NetworkMessage::addDouble(double value, uint8_t precision /* = 2*/)
 
 void NetworkMessage::addBytes(const char* bytes, size_t size)
 {
-	if (!canAdd(size) || size > 8192) {
+	if (!canAdd(size) || size > MAX_BODY_SIZE) {
+		return;
+	}
+
+	std::memcpy(buffer.data() + info.position, bytes, size);
+	info.position += size;
+	info.length += size;
+}
+
+void NetworkMessage::addBytes(const uint8_t* bytes, size_t size)
+{
+	if (!canAdd(size) || size > MAX_BODY_SIZE) {
 		return;
 	}
 
@@ -191,3 +204,12 @@ void NetworkMessage::addItem(const Item* item)
 }
 
 void NetworkMessage::addItemId(uint16_t itemId) { add<uint16_t>(Item::items[itemId].clientId); }
+
+void NetworkMessage::addNetworkMessage(const NetworkMessage& networkMsg)
+{
+	if (!canAdd(networkMsg.getLength())) {
+		return;
+	}
+
+	addBytes(networkMsg.getBuffer() + INITIAL_BUFFER_POSITION, networkMsg.getLength());
+}

src/networkmessage.h

@@ -100,6 +100,7 @@ class NetworkMessage
 	}
 
 	void addBytes(const char* bytes, size_t size);
+	void addBytes(const uint8_t* bytes, size_t size);
 	void addPaddingBytes(size_t n);
 
 	void addString(std::string_view value);
@@ -111,6 +112,7 @@ class NetworkMessage
 	void addItem(uint16_t id, uint8_t count);
 	void addItem(const Item* item);
 	void addItemId(uint16_t itemId);
+	void addNetworkMessage(const NetworkMessage& networkMsg);
 
 	MsgSize_t getLength() const { return info.length; }