mosskoi/Champions-Reborn-Server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Store the game type in the socket for gateways

Browse Source
This commit is contained in:
HikikoMarmy
2025-06-15 23:07:52 +01:00
parent cb7a3f0825
commit fffbc95b87
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Lobby Server/LobbyServer.cpp
View File

@@ -256,7 +256,7 @@ void LobbyServer::CheckSocketProblem()
} }
} }
void LobbyServer::AcceptGateway( SOCKET socket, RealmGameType clientType ) void LobbyServer::AcceptGateway( SOCKET socket, RealmGameType gameType )
{ {
sockaddr_in clientInfo{}; sockaddr_in clientInfo{};
int32_t addrSize = sizeof( clientInfo ); int32_t addrSize = sizeof( clientInfo );
@@ -273,12 +273,13 @@ void LobbyServer::AcceptGateway( SOCKET socket, RealmGameType clientType )
new_socket->remote_addr = clientInfo; new_socket->remote_addr = clientInfo;
new_socket->remote_ip = inet_ntoa( clientInfo.sin_addr ); new_socket->remote_ip = inet_ntoa( clientInfo.sin_addr );
new_socket->remote_port = ntohs( clientInfo.sin_port ); new_socket->remote_port = ntohs( clientInfo.sin_port );
new_socket->gameType = gameType;
m_clientSockets.push_back( new_socket ); m_clientSockets.push_back( new_socket );
Log::Info( "New Gateway Client Connected : (%s)", new_socket->remote_ip.c_str() ); Log::Info( "New Gateway Client Connected : (%s)", new_socket->remote_ip.c_str() );
} }
void LobbyServer::AcceptClient( SOCKET socket, RealmGameType clientType ) void LobbyServer::AcceptClient( SOCKET socket, RealmGameType gameType )
{ {
sockaddr_in clientInfo{}; sockaddr_in clientInfo{};
int32_t addrSize = sizeof( clientInfo ); int32_t addrSize = sizeof( clientInfo );
@@ -295,10 +296,10 @@ void LobbyServer::AcceptClient( SOCKET socket, RealmGameType clientType )
new_socket->remote_addr = clientInfo; new_socket->remote_addr = clientInfo;
new_socket->remote_ip = inet_ntoa( clientInfo.sin_addr ); new_socket->remote_ip = inet_ntoa( clientInfo.sin_addr );
new_socket->remote_port = ntohs( clientInfo.sin_port ); new_socket->remote_port = ntohs( clientInfo.sin_port );
new_socket->gameType = gameType;
m_clientSockets.push_back( new_socket ); m_clientSockets.push_back( new_socket );
RealmUserManager::Get().CreateUser( new_socket, clientType ); RealmUserManager::Get().CreateUser( new_socket, gameType );
Log::Info( "New Client Connected : (%s)", new_socket->remote_ip.c_str() ); Log::Info( "New Client Connected : (%s)", new_socket->remote_ip.c_str() );
} }

18
Network/Event/RequestGetServerAddress.cpp
View File

@@ -15,27 +15,21 @@ sptr_generic_response RequestGetServerAddress::ProcessRequest( sptr_socket socke
{ {
Deserialize( stream ); Deserialize( stream );
auto user = RealmUserManager::Get().FindUserBySocket( socket ); if( socket->gameType == RealmGameType::RETURN_TO_ARMS )
if( user == nullptr )
{ {
return std::make_shared< ResultGetServerAddress >( this, "", 0, RealmGameType::RETURN_TO_ARMS ); return std::make_shared< ResultGetServerAddress >( this, Config::service_ip, Config::rta_lobby_port, socket->gameType );
}
if (user->m_gameType == RealmGameType::RETURN_TO_ARMS)
{
return std::make_shared< ResultGetServerAddress >(this, Config::service_ip, Config::rta_lobby_port, user->m_gameType);
} }
else else
{ {
return std::make_shared< ResultGetServerAddress >(this, Config::service_ip, Config::con_lobby_port, user->m_gameType); return std::make_shared< ResultGetServerAddress >( this, Config::service_ip, Config::con_lobby_port, socket->gameType );
} }
} }
ResultGetServerAddress::ResultGetServerAddress( GenericRequest *request, std::string ip, int32_t port, RealmGameType clientType ) : GenericResponse( *request ) ResultGetServerAddress::ResultGetServerAddress( GenericRequest *request, std::string ip, int32_t port, RealmGameType gameType ) : GenericResponse( *request )
{ {
m_ip = ip; m_ip = ip;
m_port = port; m_port = port;
m_clientType = clientType; m_gameType = gameType;
} }
ByteBuffer &ResultGetServerAddress::Serialize() ByteBuffer &ResultGetServerAddress::Serialize()
@@ -44,7 +38,7 @@ ByteBuffer &ResultGetServerAddress::Serialize()
m_stream.write_u32( m_trackId ); m_stream.write_u32( m_trackId );
m_stream.write_u32( 0 ); m_stream.write_u32( 0 );
if( m_clientType == RealmGameType::RETURN_TO_ARMS ) if( m_gameType == RealmGameType::RETURN_TO_ARMS )
m_stream.write_utf8( m_ip ); m_stream.write_utf8( m_ip );
else else
m_stream.write_sz_utf8( m_ip ); m_stream.write_sz_utf8( m_ip );

2
Network/Event/RequestGetServerAddress.h
View File

@@ -22,7 +22,7 @@ class ResultGetServerAddress : public GenericResponse {
public: public:
std::string m_ip; std::string m_ip;
int32_t m_port; int32_t m_port;
RealmGameType m_clientType; RealmGameType m_gameType;
ResultGetServerAddress( GenericRequest *request, std::string ip, int32_t port, RealmGameType clientType ); ResultGetServerAddress( GenericRequest *request, std::string ip, int32_t port, RealmGameType clientType );
ByteBuffer &Serialize(); ByteBuffer &Serialize();

2
Network/RealmSocket.h
View File

@@ -8,6 +8,7 @@
#include "GenericNetRequest.h" #include "GenericNetRequest.h"
#include "GenericNetResponse.h" #include "GenericNetResponse.h"
#include "GenericNetMessage.h" #include "GenericNetMessage.h"
#include "../Common/Constant.h"
class RealmSocket class RealmSocket
{ {
@@ -46,6 +47,7 @@ public:
sockaddr_in local_addr; sockaddr_in local_addr;
sockaddr_in remote_addr; sockaddr_in remote_addr;
RealmGameType gameType;
std::string remote_ip; std::string remote_ip;
uint32_t remote_port; uint32_t remote_port;
uint32_t last_write_position; uint32_t last_write_position;