[WIP] Feature/newprotocol

.dockerignore

@@ -1,5 +1,4 @@
 dependencies/v8
-.git
-build
-cmake-build-debug/
-cmake-build-release/
+dependencies/depot_tools
+build*
+cmake-*

CMakeLists.txt

@@ -84,8 +84,8 @@ STRING(REGEX REPLACE "(-[0-9]+:[0-9]+)" "" VER_CPACK ${VER_CPACK})
 
 # Generate version header from the above
 configure_file(
-		${PROJECT_SOURCE_DIR}/server/include/IConfig.h.in
-		${PROJECT_BINARY_DIR}/server/include/IConfig.h
+	${PROJECT_SOURCE_DIR}/server/include/IConfig.h.in
+	${PROJECT_BINARY_DIR}/server/include/IConfig.h
 )
 
 option(STATIC "Compile as a static runtime." ON)
@@ -127,12 +127,12 @@ if(APPLE)
 	set(CPACK_GENERATOR DragNDrop)
 	set(CPACK_DMG_VOLUME_NAME "${PROJECT_NAME} ${VER_FULL}")
 	set(
-			CPACK_DMG_DS_STORE_SETUP_SCRIPT
-			${PROJECT_SOURCE_DIR}/resources/packaging/osx/DMGSetup.scpt
+		CPACK_DMG_DS_STORE_SETUP_SCRIPT
+		${PROJECT_SOURCE_DIR}/resources/packaging/osx/DMGSetup.scpt
 	)
 	set(
-			CPACK_DMG_BACKGROUND_IMAGE
-			${PROJECT_SOURCE_DIR}/resources/packaging/osx/DMGBackground.tif
+		CPACK_DMG_BACKGROUND_IMAGE
+		${PROJECT_SOURCE_DIR}/resources/packaging/osx/DMGBackground.tif
 	)
 elseif(WIN32)
 	set(CPACK_GENERATOR "ZIP")
@@ -160,8 +160,8 @@ include(CPack)
 
 # Generate version header from the above
 configure_file(
-		${PROJECT_SOURCE_DIR}/server/include/IConfig.h.in
-		${PROJECT_BINARY_DIR}/server/include/IConfig.h
+	${PROJECT_SOURCE_DIR}/server/include/IConfig.h.in
+	${PROJECT_BINARY_DIR}/server/include/IConfig.h
 )
 
 if(APPLE)
@@ -200,8 +200,8 @@ elseif(WIN32)
 		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
 		set(
-				CMAKE_CXX_FLAGS_RELWITHDEBINFO
-				"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MTd"
+			CMAKE_CXX_FLAGS_RELWITHDEBINFO
+			"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MTd"
 		)
 		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
 		cmake_policy(SET CMP0043 NEW)
@@ -234,7 +234,7 @@ elseif(WIN32)
 else()
 	set(MAKE_TESTS ON)
 	if(STATIC)
-		#	SET(CMAKE_EXE_LINKER_FLAGS "-static")
+		#SET(CMAKE_EXE_LINKER_FLAGS "-static")
 	endif()
 
 	add_definitions(-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=1 -DNDEBUG=1 -DENABLE_SCRIPTENV_DEBUG=1)

cmake/FindMiniupnpc.cmake

@@ -37,7 +37,7 @@ set(MINIUPNP_STATIC_LIBRARIES ${MINIUPNP_STATIC_LIBRARY})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
-  MiniUPnPc DEFAULT_MSG
+  Miniupnpc DEFAULT_MSG
   MINIUPNP_INCLUDE_DIR
   MINIUPNP_LIBRARY
 )

server/CMakeLists.txt

@@ -18,7 +18,6 @@
 #  You should have received a copy of the GNU General Public License
 #  along with GS2Emu.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 include(CheckFunctionExists)
 include(CheckSymbolExists)
 
@@ -248,6 +247,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${GS2COMPILER_INCLUDE_DIRECTORY
 
 add_dependencies(${TARGET_NAME} gs2compiler)
 target_link_libraries(${TARGET_NAME} gs2compiler)
+
 add_dependencies(${TARGET_NAME} gs2lib)
 target_link_libraries(${TARGET_NAME} gs2lib)
 

server/include/Animation/TGameAni.h

@@ -6,6 +6,7 @@
 #include <string>
 #include <optional>
 #include "CString.h"
+#include "TPlayer.h"
 
 class TServer;
 
@@ -72,7 +73,7 @@ class TGameAni
 
 	//! Get the bytecode packet to send to clients for the ani script
 	//! \return bytecode packet
-	CString getBytecodePacket() const;
+	void sendBytecodePacket(TPlayer* p) const;
 
 	//! Load a TGameAni from the filesystem
 	//! \param server Global server pointer so we can fetch the correct filesystem

server/include/Misc/CUPNP.h

@@ -1,68 +1,68 @@
-#ifdef UPNP
-#ifndef CUPNP_H
-#define CUPNP_H
-
-#include <set>
-#include <memory.h>
-#include "CString.h"
-#include "miniupnpc/miniwget.h"
-#include "miniupnpc/miniupnpc.h"
-#include "miniupnpc/upnpcommands.h"
-
-class TServer;
-
-class CUPNP
-{
-	public:
-		CUPNP(TServer* server)
-		{
-			this->server = server;
-		}
-
-		// Allows std::thread to work.
-		void operator()()
-		{
-			discover();
-			add_port_forward(local_ip, port);
-		}
-
-		void initialize(const char* local_ip, const char* port)
-		{
-			this->local_ip = local_ip;
-			this->port = port;
-		}
-
-		// Finds a valid UPNP device.
-		void discover();
-
-		// Adds a port forward.
-		void add_port_forward(const CString& addr, const CString& port);
-
-		// Removes a port forward.
-		void remove_port_forward(const CString& port);
-
-		// Removes all the port forwards created by the add_port_forward command.
-		void remove_all_forwarded_ports()
-		{
-			while (!ports_forwarded.empty())
-				remove_port_forward(*ports_forwarded.rbegin());
-			ports_forwarded.clear();
-		}
-
-		// Returns true if the port was successfully forwarded.
-		bool port_was_forwarded(const CString& port)
-		{
-			return ports_forwarded.find(port) != ports_forwarded.end();
-		}
-
-	private:
-		TServer* server;
-		std::set<CString> ports_forwarded;
-		CString local_ip;
-		CString port;
-		struct UPNPUrls urls;
-		struct IGDdatas data;
-};
-
-#endif
+#ifdef UPNP
+#ifndef CUPNP_H
+#define CUPNP_H
+
+#include <set>
+#include <memory.h>
+#include "CString.h"
+#include "miniwget.h"
+#include "miniupnpc.h"
+#include "upnpcommands.h"
+
+class TServer;
+
+class CUPNP
+{
+	public:
+		CUPNP(TServer* server)
+		{
+			this->server = server;
+		}
+
+		// Allows std::thread to work.
+		void operator()()
+		{
+			discover();
+			add_port_forward(local_ip, port);
+		}
+
+		void initialize(const char* local_ip, const char* port)
+		{
+			this->local_ip = local_ip;
+			this->port = port;
+		}
+
+		// Finds a valid UPNP device.
+		void discover();
+
+		// Adds a port forward.
+		void add_port_forward(const CString& addr, const CString& port);
+
+		// Removes a port forward.
+		void remove_port_forward(const CString& port);
+
+		// Removes all the port forwards created by the add_port_forward command.
+		void remove_all_forwarded_ports()
+		{
+			while (!ports_forwarded.empty())
+				remove_port_forward(*ports_forwarded.rbegin());
+			ports_forwarded.clear();
+		}
+
+		// Returns true if the port was successfully forwarded.
+		bool port_was_forwarded(const CString& port)
+		{
+			return ports_forwarded.find(port) != ports_forwarded.end();
+		}
+
+	private:
+		TServer* server;
+		std::set<CString> ports_forwarded;
+		CString local_ip;
+		CString port;
+		struct UPNPUrls urls;
+		struct IGDdatas data;
+};
+
+#endif
 #endif

server/include/TLevel/TLevel.h

@@ -6,6 +6,8 @@
 #include <optional>
 #include "IUtil.h"
 #include "CString.h"
+#include "IEnums.h"
+#include "TPacket.h"
 #include "TLevelBaddy.h"
 #include "TLevelBoardChange.h"
 #include "TLevelChest.h"
@@ -42,16 +44,16 @@ class TLevel
 		TLevel* clone();
 
 		// get crafted packets
-		CString getBaddyPacket(int clientVersion = CLVER_2_17);
-		CString getBoardPacket();
-		CString getLayerPacket(int i);
-		CString getBoardChangesPacket(time_t time);
-		CString getBoardChangesPacket2(time_t time);
-		CString getChestPacket(TPlayer *pPlayer);
-		CString getHorsePacket();
-		CString getLinksPacket();
-		CString getNpcsPacket(time_t time, int clientVersion = CLVER_2_17);
-		CString getSignsPacket(TPlayer *pPlayer);
+		std::vector<TPacket<PlayerOutPacket>> getBaddyPackets(int clientVersion = CLVER_2_17);
+		TPacket<PlayerOutPacket> getBoardPacket();
+		TPacket<PlayerOutPacket> getLayerPacket(int i);
+		void getBoardChangesPacket(TPlayer *pPlayer, time_t time);
+		void getBoardChangesPacket2(TPlayer *pPlayer, time_t time);
+		void getChestPacket(TPlayer *pPlayer);
+		void getHorsePacket(TPlayer *pPlayer);
+		void getLinksPacket(TPlayer *pPlayer);
+		void getNpcsPacket(TPlayer *pPlayer, time_t time, int clientVersion = CLVER_2_17);
+		void getSignsPacket(TPlayer *pPlayer);
 
 		//! Gets the actual level name.
 		//! \return The actual level name.

server/include/TPacket.h

@@ -0,0 +1,17 @@
+
+#ifndef GS2EMU_TPACKET_H
+#define GS2EMU_TPACKET_H
+
+#include <utility>
+
+#include "IEnums.h"
+#include "CString.h"
+
+
+template <class T>
+struct TPacket {
+	T		Id;
+	CString	Data;
+};
+
+#endif //GS2EMU_TPACKET_H

server/include/TPlayer.h

@@ -11,9 +11,12 @@
 #include "TAccount.h"
 #include "CEncryption.h"
 #include "CSocket.h"
+#include "TPacket.h"
 
 #ifdef V8NPCSERVER
 #include "ScriptBindings.h"
+#include "TPacket.h"
+
 #endif
 
 class TLevel;
@@ -103,7 +106,10 @@ class TPlayer : public TAccount, public CSocketStub
 
 		// Socket-Functions
 		bool doMain();
-		void sendPacket(CString pPacket, bool appendNL = true);
+		template <class T>
+		void sendPacket(const TPacket<T>& packet, bool sendNow = false, bool appendNL = true) { sendPacket((unsigned char)packet.Id, packet.Data, sendNow, appendNL); };
+		void sendPacket(unsigned char packetId, const CString& pPacket, bool sendNow = false, bool appendNL = true);
+		void sendPacketOld(CString pPacket, bool appendNL = true);
 		bool sendFile(const CString& pFile);
 		bool sendFile(const CString& pPath, const CString& pFile);
 
@@ -301,7 +307,8 @@ class TPlayer : public TAccount, public CSocketStub
 		bool msgPLI_UPDATEPACKAGEREQUESTFILE(CString& pPacket);
 		bool msgPLI_RC_UNKNOWN162(CString& pPacket);
 
-	private:
+	bool newProtocol;
+private:
 		// Login functions.
 		bool sendLoginClient();
 		bool sendLoginNC();
@@ -333,7 +340,7 @@ class TPlayer : public TAccount, public CSocketStub
 		int codepage;
 		TLevel *level;
 		int id, type, versionID;
-		time_t lastData, lastMovement, lastChat, lastNick, lastMessage, lastSave, last1m;
+	time_t lastData, lastMovement, lastChat, lastNick, lastMessage, lastSave, last1m;
 		std::vector<SCachedLevel*> cachedLevels;
 		std::map<CString, CString> rcLargeFiles;
 		std::map<CString, TLevel*> spLevels;

server/include/TScriptClass.h

@@ -6,6 +6,7 @@
 #include <string>
 #include "CString.h"
 #include "SourceCode.h"
+#include "TPlayer.h"
 
 class TServer;
 class TScriptClass
@@ -15,8 +16,8 @@ class TScriptClass
 	~TScriptClass();
 
 	// Functions -> Inline Get-Functions
-	CString getClassPacket() const;
-	
+	void sendClassPacket(TPlayer *p) const;
+
 	const std::string& getName() const {
 		return _className;
 	}