mosskoi/Champions-Reborn-Server-Mirror
1
0
Fork 0
mirror of https://github.com/HikikoMarmy/Champions-Reborn-Server.git synced 2026-04-05 08:59:54 -03:00
Code Issues Packages Projects Releases Wiki Activity

Misc changes

Browse Source
This commit is contained in:
HikikoMarmy
2025-04-24 11:22:47 +01:00
parent 1efb371f44
commit 5b53afaafb
6 changed files with 349 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Network/RealmSocket.cpp
View File

@@ -58,6 +58,8 @@ void RealmSocket::send( const sptr_generic_response response )
m_pendingWriteBuffer.insert( m_pendingWriteBuffer.end(), ( uint8_t * )&netSize, ( uint8_t * )&netSize + 4 );
m_pendingWriteBuffer.insert( m_pendingWriteBuffer.end(), stream.data.begin(), stream.data.end() );
Log::Packet( response->m_stream.data, response->m_stream.get_length(), true);
}
void RealmSocket::send( GenericMessage &message )
@@ -67,4 +69,6 @@ void RealmSocket::send( GenericMessage &message )
m_pendingWriteBuffer.insert( m_pendingWriteBuffer.end(), ( uint8_t * )&netSize, ( uint8_t * )&netSize + 4 );
m_pendingWriteBuffer.insert( m_pendingWriteBuffer.end(), stream.data.begin(), stream.data.end() );
Log::Packet( stream.data, stream.get_length(), true );
}

111
Norrath Server.vcxproj
View File

@@ -189,34 +189,53 @@
<ClInclude Include="Crypto\RealmCrypt.h" />
<ClInclude Include="Crypto\rijndael.h" />
<ClInclude Include="Discovery Server\DiscoveryServer.h" />
<ClInclude Include="Game\ChatRoomSession.h" />
<ClInclude Include="Game\ChatRoomManager.h" />
<ClInclude Include="Game\Constant.hpp" />
<ClInclude Include="Game\RealmUser.h" />
<ClInclude Include="Game\RealmUserManager.h" />
<ClInclude Include="Game\GameSession.h" />
<ClInclude Include="Game\GameSessionManager.h" />
<ClInclude Include="global_define.h" />
<ClInclude Include="Lobby Server\Event\RequestGetServerAddress.h" />
<ClInclude Include="Lobby Server\LobbyEvents.h" />
<ClInclude Include="Lobby Server\Event\NotifyClientDiscovered.h" />
<ClInclude Include="Lobby Server\Event\NotifyClientReqConnect.h" />
<ClInclude Include="Lobby Server\Event\NotifyGameDiscovered.h" />
<ClInclude Include="Lobby Server\Event\RequestCancelGame.h" />
<ClInclude Include="Lobby Server\Event\RequestCreateAccount.h" />
<ClInclude Include="Lobby Server\Event\RequestCreatePrivateGame.h" />
<ClInclude Include="Lobby Server\Event\RequestCreatePublicGame.h" />
<ClInclude Include="Lobby Server\Event\RequestDoClientDiscovery.h" />
<ClInclude Include="Lobby Server\Event\RequestGetEncryptionKey.h" />
<ClInclude Include="Lobby Server\Event\RequestGetGame.h" />
<ClInclude Include="Lobby Server\Event\RequestGetRealmStats.h" />
<ClInclude Include="Lobby Server\Event\RequestGetRules.h" />
<ClInclude Include="Lobby Server\Event\RequestLogin.h" />
<ClInclude Include="Lobby Server\Event\RequestLogout.h" />
<ClInclude Include="Lobby Server\Event\RequestMatchGame.h" />
<ClInclude Include="Lobby Server\Event\RequestTouchSession.h" />
<ClInclude Include="Lobby Server\Event\RequestUpdateGameData.h" />
<ClInclude Include="Lobby Server\LobbyServer.h" />
<ClInclude Include="logging.h" />
<ClInclude Include="misc\ByteStream.h" />
<ClInclude Include="misc\Utility.h" />
<ClInclude Include="Network\Events.h" />
<ClInclude Include="Network\Event\NotifyClientDiscovered.h" />
<ClInclude Include="Network\Event\NotifyClientReqConnect.h" />
<ClInclude Include="Network\Event\NotifyForcedLogout.h" />
<ClInclude Include="Network\Event\NotifyGameDiscovered.h" />
<ClInclude Include="Network\Event\Notify_4C.h" />
<ClInclude Include="Network\Event\NotifyClientRequestConnect_RTA.h" />
<ClInclude Include="Network\Event\RequestCancelGame.h" />
<ClInclude Include="Network\Event\RequestCancelGame_RTA.h" />
<ClInclude Include="Network\Event\RequestCreateAccount.h" />
<ClInclude Include="Network\Event\RequestCreatePrivateGame.h" />
<ClInclude Include="Network\Event\RequestCreatePrivateGame_RTA.h" />
<ClInclude Include="Network\Event\RequestCreatePrivateRoom.h" />
<ClInclude Include="Network\Event\RequestCreatePublicGame.h" />
<ClInclude Include="Network\Event\RequestCreatePublicGame_RTA.h" />
<ClInclude Include="Network\Event\RequestDoClientDiscovery.h" />
<ClInclude Include="Network\Event\RequestEnterRoom.h" />
<ClInclude Include="Network\Event\RequestGetEncryptionKey.h" />
<ClInclude Include="Network\Event\RequestGetGame.h" />
<ClInclude Include="Network\Event\RequestGetGame_RTA.h" />
<ClInclude Include="Network\Event\RequestGetPublicRooms.h" />
<ClInclude Include="Network\Event\RequestGetRealmStats.h" />
<ClInclude Include="Network\Event\RequestGetRoom.h" />
<ClInclude Include="Network\Event\RequestGetRules.h" />
<ClInclude Include="Network\Event\RequestGetServerAddress.h" />
<ClInclude Include="Network\Event\RequestLogin.h" />
<ClInclude Include="Network\Event\RequestLogout.h" />
<ClInclude Include="Network\Event\RequestMatchGame.h" />
<ClInclude Include="Network\Event\RequestMatchGame_RTA.h" />
<ClInclude Include="Network\Event\RequestSaveNewCharacter_RTA.h" />
<ClInclude Include="Network\Event\RequestTouchSession.h" />
<ClInclude Include="Network\Event\RequestUpdateGameData.h" />
<ClInclude Include="Network\Event\Request_5B.h" />
<ClInclude Include="Network\Event\Request_5D.h" />
<ClInclude Include="Network\Event\Request_61.h" />
<ClInclude Include="Network\GenericNetMessage.hpp" />
<ClInclude Include="Network\GenericNetRequest.hpp" />
<ClInclude Include="Network\GenericNetResponse.hpp" />
@@ -230,34 +249,52 @@
<ClCompile Include="Crypto\RealmCrypt.cpp" />
<ClCompile Include="Crypto\rijndael.cpp" />
<ClCompile Include="Discovery Server\DiscoveryServer.cpp" />
<ClCompile Include="Game\ChatRoom.cpp" />
<ClCompile Include="Game\ChatRoomManager.cpp" />
<ClCompile Include="Game\RealmUser.cpp" />
<ClCompile Include="Game\RealmUserManager.cpp" />
<ClCompile Include="Game\GameSession.cpp" />
<ClCompile Include="Game\GameSessionManager.cpp" />
<ClCompile Include="global_define.cpp" />
<ClCompile Include="Lobby Server\Event\NotifyClientDiscovered.cpp" />
<ClCompile Include="Lobby Server\Event\NotifyClientReqConnect.cpp" />
<ClCompile Include="Lobby Server\Event\NotifyGameDiscovered.cpp" />
<ClCompile Include="Lobby Server\Event\RequestCancelGame.cpp" />
<ClCompile Include="Lobby Server\Event\RequestCreateAccount.cpp" />
<ClCompile Include="Lobby Server\Event\RequestCreatePrivateGame.cpp" />
<ClCompile Include="Lobby Server\Event\RequestCreatePublicGame.cpp" />
<ClCompile Include="Lobby Server\Event\RequestDoClientDiscovery.cpp" />
<ClCompile Include="Lobby Server\Event\RequestGetEncryptionKey.cpp" />
<ClCompile Include="Lobby Server\Event\RequestGetGame.cpp" />
<ClCompile Include="Lobby Server\Event\RequestGetRealmStats.cpp" />
<ClCompile Include="Lobby Server\Event\RequestGetRules.cpp" />
<ClCompile Include="Lobby Server\Event\RequestGetServerAddress.cpp" />
<ClCompile Include="Lobby Server\Event\RequestLogin.cpp" />
<ClCompile Include="Lobby Server\Event\RequestLogout.cpp" />
<ClCompile Include="Lobby Server\Event\RequestMatchGame.cpp" />
<ClCompile Include="Lobby Server\Event\RequestTouchSession.cpp" />
<ClCompile Include="Lobby Server\Event\RequestUpdateGameData.cpp" />
<ClCompile Include="Lobby Server\LobbyServer.cpp" />
<ClCompile Include="logging.cpp" />
<ClCompile Include="misc\ByteStream.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="misc\Utility.cpp" />
<ClCompile Include="Network\Event\NotifyClientDiscovered.cpp" />
<ClCompile Include="Network\Event\NotifyClientReqConnect.cpp" />
<ClCompile Include="Network\Event\NotifyForcedLogout.cpp" />
<ClCompile Include="Network\Event\NotifyGameDiscovered.cpp" />
<ClCompile Include="Network\Event\Notify_4C.cpp" />
<ClCompile Include="Network\Event\NotifyClientRequestConnect_RTA.cpp" />
<ClCompile Include="Network\Event\RequestCancelGame.cpp" />
<ClCompile Include="Network\Event\RequestCancelGame_RTA.cpp" />
<ClCompile Include="Network\Event\RequestCreateAccount.cpp" />
<ClCompile Include="Network\Event\RequestCreatePrivateGame.cpp" />
<ClCompile Include="Network\Event\RequestCreatePrivateGame_RTA.cpp" />
<ClCompile Include="Network\Event\RequestCreatePrivateRoom.cpp" />
<ClCompile Include="Network\Event\RequestCreatePublicGame.cpp" />
<ClCompile Include="Network\Event\RequestCreatePublicGame_RTA.cpp" />
<ClCompile Include="Network\Event\RequestDoClientDiscovery.cpp" />
<ClCompile Include="Network\Event\RequestEnterRoom.cpp" />
<ClCompile Include="Network\Event\RequestGetEncryptionKey.cpp" />
<ClCompile Include="Network\Event\RequestGetGame.cpp" />
<ClCompile Include="Network\Event\RequestGetGame_RTA.cpp" />
<ClCompile Include="Network\Event\RequestGetRealmStats.cpp" />
<ClCompile Include="Network\Event\RequestGetRoom.cpp" />
<ClCompile Include="Network\Event\RequestGetRules.cpp" />
<ClCompile Include="Network\Event\RequestGetServerAddress.cpp" />
<ClCompile Include="Network\Event\RequestLogin.cpp" />
<ClCompile Include="Network\Event\RequestLogout.cpp" />
<ClCompile Include="Network\Event\RequestMatchGame.cpp" />
<ClCompile Include="Network\Event\RequestSaveNewCharacter_RTA.cpp" />
<ClCompile Include="Network\Event\RequestTouchSession.cpp" />
<ClCompile Include="Network\Event\RequestUpdateGameData.cpp" />
<ClCompile Include="Network\Event\RequestGetPublicRooms.cpp" />
<ClCompile Include="Network\Event\RequestMatchGame_RTA.cpp" />
<ClCompile Include="Network\Event\Request_5B.cpp" />
<ClCompile Include="Network\Event\Request_5D.cpp" />
<ClCompile Include="Network\Event\Request_61.cpp" />
<ClCompile Include="network\RealmSocket.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

337
Norrath Server.vcxproj.filters
View File

@@ -45,11 +45,11 @@
<Filter Include="Source Files\Discovery Server">
<UniqueIdentifier>{76928587-566c-4842-9fa3-1a5baec12238}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Lobby Server\Event">
<UniqueIdentifier>{fe6aba50-18f0-46a1-b154-4226b3ca42ab}</UniqueIdentifier>
<Filter Include="Source Files\Network\Event">
<UniqueIdentifier>{a72820fb-0d67-45e0-91f3-b7d7b6b61465}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Lobby Server\Event">
<UniqueIdentifier>{6432e486-7341-4eb8-a6c0-c21ecd2e92f8}</UniqueIdentifier>
<Filter Include="Header Files\Network\Event">
<UniqueIdentifier>{48da1e06-b5a7-49cd-b264-12389d181a65}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@@ -95,9 +95,6 @@
<ClInclude Include="Crypto\rijndael.h">
<Filter>Header Files\Crypto</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\LobbyEvents.h">
<Filter>Header Files\Lobby Server</Filter>
</ClInclude>
<ClInclude Include="Discovery Server\DiscoveryServer.h">
<Filter>Header Files\Discovery Server</Filter>
</ClInclude>
@@ -107,68 +104,128 @@
<ClInclude Include="Game\GameSessionManager.h">
<Filter>Header Files\Game</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestCancelGame.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestCreateAccount.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestCreatePrivateGame.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestCreatePublicGame.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestDoClientDiscovery.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestGetEncryptionKey.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestGetRules.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestLogin.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestLogout.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestMatchGame.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestTouchSession.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\NotifyClientDiscovered.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\NotifyClientReqConnect.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\NotifyGameDiscovered.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Network\GenericNetMessage.hpp">
<Filter>Header Files\Network</Filter>
</ClInclude>
<ClInclude Include="configuration.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestGetRealmStats.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestUpdateGameData.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestGetGame.h">
<Filter>Header Files\Lobby Server\Event</Filter>
</ClInclude>
<ClInclude Include="Crypto\RealmCrypt.h">
<Filter>Header Files\Crypto</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\Event\RequestGetServerAddress.h">
<Filter>Header Files\Lobby Server\Event</Filter>
<ClInclude Include="Game\Constant.hpp">
<Filter>Header Files\Game</Filter>
</ClInclude>
<ClInclude Include="Network\Event\NotifyClientDiscovered.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\NotifyClientReqConnect.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\NotifyGameDiscovered.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\Request_5B.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\Request_5D.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\Request_61.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestCancelGame.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestCreateAccount.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestCreatePrivateGame.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestCreatePrivateGame_RTA.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestCreatePublicGame.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestCreatePublicGame_RTA.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestDoClientDiscovery.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestEnterRoom.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestGetEncryptionKey.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestGetGame.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestGetPublicRooms.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestGetRealmStats.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestGetRules.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestGetServerAddress.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestLogin.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestLogout.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestMatchGame.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestMatchGame_RTA.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestTouchSession.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestUpdateGameData.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Events.h">
<Filter>Header Files\Network</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestSaveNewCharacter_RTA.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestGetGame_RTA.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestCreatePrivateRoom.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestCancelGame_RTA.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Game\ChatRoomSession.h">
<Filter>Header Files\Game</Filter>
</ClInclude>
<ClInclude Include="Game\ChatRoomManager.h">
<Filter>Header Files\Game</Filter>
</ClInclude>
<ClInclude Include="Network\Event\RequestGetRoom.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\Notify_4C.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\NotifyForcedLogout.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
<ClInclude Include="Network\Event\NotifyClientRequestConnect_RTA.h">
<Filter>Header Files\Network\Event</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -214,65 +271,119 @@
<ClCompile Include="Game\GameSessionManager.cpp">
<Filter>Source Files\Game</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestCancelGame.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestCreateAccount.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestCreatePrivateGame.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestCreatePublicGame.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestDoClientDiscovery.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestGetEncryptionKey.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestGetRules.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestLogin.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestLogout.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestMatchGame.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestTouchSession.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\NotifyClientDiscovered.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\NotifyClientReqConnect.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\NotifyGameDiscovered.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="configuration.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestGetRealmStats.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestUpdateGameData.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestGetGame.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
</ClCompile>
<ClCompile Include="Crypto\RealmCrypt.cpp">
<Filter>Source Files\Crypto</Filter>
</ClCompile>
<ClCompile Include="Lobby Server\Event\RequestGetServerAddress.cpp">
<Filter>Source Files\Lobby Server\Event</Filter>
<ClCompile Include="Network\Event\NotifyClientDiscovered.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\NotifyClientReqConnect.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\NotifyGameDiscovered.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestGetPublicRooms.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\Request_5B.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\Request_5D.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestMatchGame_RTA.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\Request_61.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestCancelGame.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestCreateAccount.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestCreatePrivateGame.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestCreatePrivateGame_RTA.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestCreatePublicGame.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestCreatePublicGame_RTA.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestDoClientDiscovery.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestEnterRoom.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestGetEncryptionKey.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestGetGame.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestGetRealmStats.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestGetRules.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestGetServerAddress.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestLogin.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestLogout.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestMatchGame.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestTouchSession.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestUpdateGameData.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestSaveNewCharacter_RTA.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestGetGame_RTA.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestCreatePrivateRoom.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestCancelGame_RTA.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Game\ChatRoom.cpp">
<Filter>Source Files\Game</Filter>
</ClCompile>
<ClCompile Include="Game\ChatRoomManager.cpp">
<Filter>Source Files\Game</Filter>
</ClCompile>
<ClCompile Include="Network\Event\RequestGetRoom.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\Notify_4C.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\NotifyForcedLogout.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
<ClCompile Include="Network\Event\NotifyClientRequestConnect_RTA.cpp">
<Filter>Source Files\Network\Event</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>

9
global_define.h
View File

@@ -6,16 +6,25 @@
#include <cstdint>
#include <memory>
#include <format>
#include <thread>
#include <mutex>
#include <map>
#include <unordered_map>
#include <vector>
#include "misc/Utility.h"
#include "misc/ByteStream.h"
#include "Crypto/RealmCrypt.h"
#include "Game/Constant.hpp"
#include "Network/RealmSocket.h"
#include "Game/RealmUserManager.h"
#include "Game/GameSessionManager.h"
#include "Game/ChatRoomManager.h"
#include "Network/GenericNetRequest.hpp"
#include "Network/GenericNetResponse.hpp"

72
logging.cpp
View File

@@ -137,66 +137,68 @@ void Log::Error( std::string format, ... )
void Log::Packet( std::vector<uint8_t> p, size_t size, bool send )
{
log_lock.lock();
std::lock_guard<std::mutex> lock( log_lock );
HANDLE hConsole = GetStdHandle( STD_OUTPUT_HANDLE );
SetConsoleTextAttribute( hConsole, 15 );
uint16_t i = 0;
uint16_t r = 0;
uint8_t line[ 16 ] = {};
uint8_t r = 0;
if( send )
{
SetConsoleTextAttribute( hConsole, 11 );
printf( "(SEND)(00|01|02|03|04|05|06|07|08|09|0A|0B|0C|0D|0E|0F)\n" );
SetConsoleTextAttribute( hConsole, 15 );
}
else
{
SetConsoleTextAttribute( hConsole, 10 );
printf( "(RECV)(00|01|02|03|04|05|06|07|08|09|0A|0B|0C|0D|0E|0F)\n" );
SetConsoleTextAttribute( hConsole, 15 );
}
SetConsoleTextAttribute( hConsole, send ? 11 : 10 );
printf( "(%s)(00|01|02|03|04|05|06|07|08|09|0A|0B|0C|0D|0E|0F)\n", send ? "SEND" : "RECV" );
SetConsoleTextAttribute( hConsole, 15 );
while( i < size )
{
if( r == 16 )
if( i % 16 == 0 )
{
uint8_t *c = &p[ ( i - 16 ) ];
for( r = 0; r < 16; r++, c++ )
if( i > 0 )
{
if( ( ( *c ) >= 0x20 && ( *c ) <= 127 ) && ( isprint( ( *c ) ) ) )
printf( "%c", ( *c ) );
else
printf( "%c", 0x2E );
printf( " " );
for( uint8_t j = 0; j < r; ++j )
{
char c = line[ j ];
printf( "%c", ( c >= 0x20 && c <= 0x7E ) ? c : '.' );
}
printf( "\n" );
}
printf( "(%04X) ", i );
r = 0;
}
if( i % 16 == 0 )
{
SetConsoleTextAttribute( hConsole, ( send ) ? 11 : 10 );
if( i > 0 ) printf( "\n" );
printf( "(%04X) ", i );
SetConsoleTextAttribute( hConsole, 15 );
}
line[ r++ ] = p[ i ];
if( i == 4 || i == 5 )
{
SetConsoleTextAttribute( hConsole, ( send ) ? 11 : 10 );
SetConsoleTextAttribute( hConsole, send ? 11 : 10 );
printf( "%02X ", p[ i ] );
SetConsoleTextAttribute( hConsole, 15 );
}
else
{
printf( "%02X ", p[ i ] );
}
i++;
r++;
++i;
}
if( r > 0 )
{
for( uint8_t j = r; j < 16; ++j )
printf( " " ); // Pad to align character section
printf( " " );
for( uint8_t j = 0; j < r; ++j )
{
char c = line[ j ];
printf( "%c", ( c >= 0x20 && c <= 0x7E ) ? c : '.' );
}
}
printf( "\n\n" );
log_lock.unlock();
}

2
main.cpp
View File

@@ -45,7 +45,7 @@ int main()
}
auto &lobby_server = LobbyServer::Get();
lobby_server.Start( Config::service_ip, Config::lobby_port );
lobby_server.Start( Config::service_ip );
auto &discovery_server = DiscoveryServer::Get();
discovery_server.Start( Config::service_ip, Config::discovery_port );