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

Moving RequestGetServerAddress into the Lobby Server.

Browse Source
This commit is contained in:
HikikoMarmy
2025-04-14 19:32:04 +01:00
parent da39da996e
commit 94753a7bd4
5 changed files with 12 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gateway Server/Event/GetServerAddressEvent.cpp → Lobby Server/Event/RequestGetServerAddress.cpp
View File

@@ -1,14 +1,14 @@
#include "../../global_define.h"
#include "GetServerAddressEvent.h"
#include "RequestGetServerAddress.h"
void RequestGetServerAddress::Deserialize( sptr_byte_stream stream )
{
DeserializeHeader( stream );
}
sptr_generic_response RequestGetServerAddress::ProcessRequest( sptr_byte_stream stream )
sptr_generic_response RequestGetServerAddress::ProcessRequest( sptr_user user, sptr_byte_stream stream )
{
Deserialize( stream);
Deserialize( stream );
return std::make_shared< ResultGetServerAddress >( this, Config::service_ip, Config::lobby_port );
}
@@ -19,7 +19,7 @@ ResultGetServerAddress::ResultGetServerAddress( GenericRequest *request, std::st
m_port = port;
}
ByteStream& ResultGetServerAddress::Serialize()
ByteStream &ResultGetServerAddress::Serialize()
{
m_stream.write_u16( m_packetId );
m_stream.write_u32( m_requestId );

3
Gateway Server/Event/GetServerAddressEvent.h → Lobby Server/Event/RequestGetServerAddress.h
View File

@@ -6,7 +6,8 @@ public:
{
return std::make_unique< RequestGetServerAddress >();
}
sptr_generic_response ProcessRequest( sptr_byte_stream stream ) override;
sptr_generic_response ProcessRequest( sptr_user user, sptr_byte_stream stream ) override;
void Deserialize( sptr_byte_stream stream ) override;
};

95
Lobby Server/EventLookup.h
View File

@@ -1,95 +0,0 @@
#pragma once
#include <map>
#include <functional>
#include "Event/RequestCancelGame.h"
#include "Event/RequestCreateAccount.h"
#include "Event/RequestCreatePrivateGame.h"
#include "Event/RequestCreatePublicGame.h"
#include "Event/RequestGetGame.h"
#include "Event/RequestGetRealmStats.h"
#include "Event/RequestLogin.h"
#include "Event/RequestLogout.h"
#include "Event/RequestMatchGame.h"
#include "Event/RequestTouchSession.h"
#include "Event/RequestDoClientDiscovery.h"
#include "Event/RequestGetEncryptionKey.h"
#include "Event/RequestGetRules.h"
#include "Event/RequestUpdateGameData.h"
const std::map< int16_t, std::function< std::unique_ptr< GenericRequest >() > > LOBBY_REQUEST_EVENT =
{
{ 0x0005, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestCancelGame >();
}
},
{ 0x0006, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestCreateAccount >();
}
},
{ 0x0008, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestCreatePrivateGame >();
}
},
{ 0x000A, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestCreatePublicGame >();
}
},
{ 0x000D, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestGetGame >();
}
},
{ 0x000F, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestGetRealmStats >();
}
},
{ 0x0016, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestLogin >();
}
},
{ 0x0017, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestLogout >();
}
},
{ 0x0018, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestMatchGame >();
}
},
{ 0x0024, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestTouchSession >();
}
},
{ 0x0025, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestDoClientDiscovery >();
}
},
{ 0x0027, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestGetEncryptionKey >();
}
},
{ 0x0042, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestGetRules >();
}
},
{
0x0044, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestUpdateGameData >();
}
}
};

6
Lobby Server/LobbyEvents.h
View File

@@ -14,6 +14,7 @@
#include "Event/RequestMatchGame.h"
#include "Event/RequestTouchSession.h"
#include "Event/RequestDoClientDiscovery.h"
#include "Event/RequestGetServerAddress.h"
#include "Event/RequestGetEncryptionKey.h"
#include "Event/RequestGetRules.h"
#include "Event/RequestUpdateGameData.h"
@@ -85,6 +86,11 @@ const std::map< int16_t, std::function< std::unique_ptr< GenericRequest >() > >
return std::make_unique< RequestGetRules >();
}
},
{ 0x0043, []() -> std::unique_ptr< GenericRequest >
{
return std::make_unique< RequestGetServerAddress >();
}
},
{
0x0044, []() -> std::unique_ptr< GenericRequest >
{

2
Lobby Server/LobbyServer.cpp
View File

@@ -295,8 +295,6 @@ void LobbyServer::WriteSocket( sptr_socket socket )
void LobbyServer::HandleRequest( sptr_socket socket, sptr_byte_stream stream )
{
//Log::Packet( stream->data, stream->data.size(), false );
auto packetId = stream->read< uint16_t >();
stream->set_position( 0 );