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 files + logging

Browse Source
This commit is contained in:
HikikoMarmy
2025-04-14 03:56:17 +01:00
parent 8b3d6cc62a
commit e61aa99737
6 changed files with 65 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Norrath Server.vcxproj
View File

@@ -186,18 +186,18 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="configuration.h" />
<ClInclude Include="Crypto\NorrathCrypt.h" />
<ClInclude Include="Crypto\RealmCrypt.h" />
<ClInclude Include="Crypto\rijndael.h" />
<ClInclude Include="Discovery Server\DiscoveryServer.h" />
<ClInclude Include="Game\RealmCharacterData.h" />
<ClInclude Include="Game\RealmUser.h" />
<ClInclude Include="Game\RealmUserManager.h" />
<ClInclude Include="Game\GameSession.h" />
<ClInclude Include="Game\GameSessionManager.h" />
<ClInclude Include="Gateway Server\EventHandlers\GatewayEvents.h" />
<ClInclude Include="Gateway Server\EventHandlers\GetServerAddressEvent.h" />
<ClInclude Include="Gateway Server\Event\GatewayEvents.h" />
<ClInclude Include="Gateway Server\Event\GetServerAddressEvent.h" />
<ClInclude Include="Gateway Server\GatewayServer.h" />
<ClInclude Include="global_define.h" />
<ClInclude Include="Lobby Server\EventLookup.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" />
@@ -218,10 +218,7 @@
<ClInclude Include="Lobby Server\LobbyServer.h" />
<ClInclude Include="logging.h" />
<ClInclude Include="misc\ByteStream.h" />
<ClInclude Include="misc\RealmCrypt.h" />
<ClInclude Include="misc\math.h" />
<ClInclude Include="misc\threadsafe_queue.hpp" />
<ClInclude Include="misc\Timer.h" />
<ClInclude Include="misc\Utility.h" />
<ClInclude Include="Network\GenericNetMessage.hpp" />
<ClInclude Include="Network\GenericNetRequest.hpp" />
<ClInclude Include="Network\GenericNetResponse.hpp" />
@@ -232,14 +229,14 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="configuration.cpp" />
<ClCompile Include="Crypto\NorrathCrypt.cpp" />
<ClCompile Include="Crypto\RealmCrypt.cpp" />
<ClCompile Include="Crypto\rijndael.cpp" />
<ClCompile Include="Discovery Server\DiscoveryServer.cpp" />
<ClCompile Include="Discovery Server\DiscoverySession.cpp" />
<ClCompile Include="Game\RealmUser.cpp" />
<ClCompile Include="Game\RealmUserManager.cpp" />
<ClCompile Include="Game\GameSession.cpp" />
<ClCompile Include="Game\GameSessionManager.cpp" />
<ClCompile Include="Gateway Server\EventHandlers\GetServerAddressEvent.cpp" />
<ClCompile Include="Gateway Server\Event\GetServerAddressEvent.cpp" />
<ClCompile Include="Gateway Server\GatewayServer.cpp" />
<ClCompile Include="global_define.cpp" />
<ClCompile Include="Lobby Server\Event\NotifyClientDiscovered.cpp" />
@@ -262,9 +259,8 @@
<ClCompile Include="Lobby Server\LobbyServer.cpp" />
<ClCompile Include="logging.cpp" />
<ClCompile Include="misc\ByteStream.cpp" />
<ClCompile Include="misc\RealmCrypt.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="misc\math.cpp" />
<ClCompile Include="misc\Utility.cpp" />
<ClCompile Include="network\RealmSocket.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

91
Norrath Server.vcxproj.filters
View File

@@ -39,15 +39,6 @@
<Filter Include="Source Files\Game">
<UniqueIdentifier>{3b0176b6-97aa-4e67-ab27-60626f71b573}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Gateway Server\EventHandlers">
<UniqueIdentifier>{f90649a3-247a-4a65-9ec2-3fca02c7af52}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Gateway Server\EventHandlers">
<UniqueIdentifier>{01a6a552-7c0d-4ca4-b4d1-5c05d6048fda}</UniqueIdentifier>
</Filter>
<Filter Include="Crypto">
<UniqueIdentifier>{d4bad384-e0dc-4704-8471-c91277eb6d52}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Crypto">
<UniqueIdentifier>{a8fcffaa-8fc1-4dbc-a005-b5ddb78ee586}</UniqueIdentifier>
</Filter>
@@ -66,6 +57,12 @@
<Filter Include="Source Files\Lobby Server\Event">
<UniqueIdentifier>{6432e486-7341-4eb8-a6c0-c21ecd2e92f8}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Gateway Server\Event">
<UniqueIdentifier>{01a6a552-7c0d-4ca4-b4d1-5c05d6048fda}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Gateway Server\Event">
<UniqueIdentifier>{f90649a3-247a-4a65-9ec2-3fca02c7af52}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
@@ -80,21 +77,12 @@
<ClInclude Include="global_define.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="misc\math.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="misc\Timer.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="misc\threadsafe_queue.hpp">
<ClInclude Include="misc\Utility.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="misc\RealmCrypt.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
<ClInclude Include="misc\ByteStream.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
@@ -119,24 +107,15 @@
<ClInclude Include="Game\RealmUserManager.h">
<Filter>Header Files\Game</Filter>
</ClInclude>
<ClInclude Include="Gateway Server\EventHandlers\GatewayEvents.h">
<Filter>Header Files\Gateway Server\EventHandlers</Filter>
</ClInclude>
<ClInclude Include="Gateway Server\EventHandlers\GetServerAddressEvent.h">
<Filter>Header Files\Gateway Server\EventHandlers</Filter>
</ClInclude>
<ClInclude Include="Crypto\NorrathCrypt.h">
<ClInclude Include="Crypto\rijndael.h">
<Filter>Header Files\Crypto</Filter>
</ClInclude>
<ClInclude Include="Lobby Server\EventLookup.h">
<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>
<ClInclude Include="Discovery Server\DiscoverySession.h">
<Filter>Header Files\Discovery Server</Filter>
</ClInclude>
<ClInclude Include="Game\GameSession.h">
<Filter>Header Files\Game</Filter>
</ClInclude>
@@ -188,6 +167,27 @@
<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="Gateway Server\Event\GatewayEvents.h">
<Filter>Header Files\Gateway Server\Event</Filter>
</ClInclude>
<ClInclude Include="Gateway Server\Event\GetServerAddressEvent.h">
<Filter>Header Files\Gateway Server\Event</Filter>
</ClInclude>
<ClInclude Include="Crypto\RealmCrypt.h">
<Filter>Header Files\Crypto</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
@@ -196,15 +196,12 @@
<ClCompile Include="global_define.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="misc\math.cpp">
<ClCompile Include="misc\Utility.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="misc\RealmCrypt.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="misc\ByteStream.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
@@ -226,18 +223,12 @@
<ClCompile Include="Game\RealmUserManager.cpp">
<Filter>Source Files\Game</Filter>
</ClCompile>
<ClCompile Include="Gateway Server\EventHandlers\GetServerAddressEvent.cpp">
<Filter>Source Files\Gateway Server\EventHandlers</Filter>
</ClCompile>
<ClCompile Include="Crypto\NorrathCrypt.cpp">
<ClCompile Include="Crypto\rijndael.cpp">
<Filter>Source Files\Crypto</Filter>
</ClCompile>
<ClCompile Include="Discovery Server\DiscoveryServer.cpp">
<Filter>Source Files\Discovery Server</Filter>
</ClCompile>
<ClCompile Include="Discovery Server\DiscoverySession.cpp">
<Filter>Source Files\Discovery Server</Filter>
</ClCompile>
<ClCompile Include="Game\GameSession.cpp">
<Filter>Source Files\Game</Filter>
</ClCompile>
@@ -286,6 +277,24 @@
<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="Gateway Server\Event\GetServerAddressEvent.cpp">
<Filter>Source Files\Gateway Server\Event</Filter>
</ClCompile>
<ClCompile Include="Crypto\RealmCrypt.cpp">
<Filter>Source Files\Crypto</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Norrath Server.rc" />

9
global_define.h
View File

@@ -1,19 +1,16 @@
#pragma once
#define _WINSOCK_DEPRECATED_NO_WARNINGS
#define FD_SETSIZE 1024
#define FD_SETSIZE 512
#include <WinSock2.h>
#include <cstdint>
#include <memory>
#include "misc/math.h"
#include "misc/Timer.h"
#include "misc/Utility.h"
#include "misc/ByteStream.h"
#include "misc/threadsafe_queue.hpp"
#include "misc/RealmCrypt.h"
#include "misc/ByteStream.h"
#include "Crypto/RealmCrypt.h"
#include "Network/RealmSocket.h"

68
logging.cpp
View File

@@ -135,73 +135,7 @@ void Log::Error( std::string format, ... )
WriteToLog( log_error, &buf[ 0 ] );
}
void Log::Packet( std::vector< uint8_t > p, bool send )
{
log_lock.lock();
HANDLE hConsole = GetStdHandle( STD_OUTPUT_HANDLE );
uint32_t size = _byteswap_ulong( *( uint32_t * )&p[ 0 ] );
SetConsoleTextAttribute( hConsole, 15 );
uint16_t i = 0;
uint16_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 );
}
while( i < size )
{
if( r == 16 )
{
uint8_t *c = &p[ ( i - 16 ) ];
for( r = 0; r < 16; r++, c++ )
{
if( ( ( *c ) >= 0x20 && ( *c ) <= 127 ) && ( isprint( ( *c ) ) ) )
printf( "%c", ( *c ) );
else
printf( "%c", 0x2E );
}
r = 0;
}
if( i % 16 == 0 )
{
SetConsoleTextAttribute( hConsole, ( send ) ? 11 : 10 );
if( i > 0 ) printf( "\n" );
printf( "(%04X) ", i );
SetConsoleTextAttribute( hConsole, 15 );
}
if( i == 4 || i == 5 )
{
SetConsoleTextAttribute( hConsole, ( send ) ? 11 : 10 );
printf( "%02X ", p[ i ] );
SetConsoleTextAttribute( hConsole, 15 );
}
else
printf( "%02X ", p[ i ] );
i++;
r++;
}
printf( "\n\n" );
log_lock.unlock();
}
void Log::Packet( std::vector<uint8_t> p, uint32_t size, bool send )
void Log::Packet( std::vector<uint8_t> p, size_t size, bool send )
{
log_lock.lock();

5
logging.h
View File

@@ -40,8 +40,5 @@ public:
static void Warn( std::string format, ... );
static void Debug( std::string format, ... );
static void Error( std::string format, ... );
static void Packet( std::vector< uint8_t > p, bool send );
static void Packet( std::vector< uint8_t > p, uint32_t size, bool send );
static void Packet( std::vector< uint8_t > p, size_t size, bool send );
};

2
main.cpp
View File

@@ -73,8 +73,6 @@ int main()
break;
}
GameSessionManager::Get().Process();
std::this_thread::sleep_for( std::chrono::milliseconds( 250 ) );
}