mirror of
https://github.com/SourMesen/Mesen2.git
synced 2025-04-02 10:21:44 -04:00
f3b75dbeee
-A client disconnecting could cause the server to crash -A server stopping, then starting again, could cause the client to crash when reconnecting to the server after getting disconnected by the server stopped -The select controller menu was not getting updated and was always empty
105 lines
No EOL
2.4 KiB
C++
105 lines
No EOL
2.4 KiB
C++
#include "pch.h"
|
|
#include "Netplay/GameClient.h"
|
|
#include "Netplay/ClientConnectionData.h"
|
|
#include "Netplay/GameClientConnection.h"
|
|
#include "Shared/MessageManager.h"
|
|
#include "Shared/Emulator.h"
|
|
#include "Shared/NotificationManager.h"
|
|
#include "Utilities/Socket.h"
|
|
|
|
GameClient::GameClient(Emulator* emu)
|
|
{
|
|
_emu = emu;
|
|
_stop = false;
|
|
_connected = false;
|
|
}
|
|
|
|
GameClient::~GameClient()
|
|
{
|
|
}
|
|
|
|
bool GameClient::Connected()
|
|
{
|
|
return _connected;
|
|
}
|
|
|
|
void GameClient::Connect(ClientConnectionData &connectionData)
|
|
{
|
|
Disconnect();
|
|
|
|
_stop = false;
|
|
unique_ptr<Socket> socket(new Socket());
|
|
if(socket->Connect(connectionData.Host.c_str(), connectionData.Port)) {
|
|
_connection.reset(new GameClientConnection(_emu, std::move(socket), connectionData));
|
|
_connected = true;
|
|
_clientThread.reset(new thread(&GameClient::Exec, this));
|
|
_emu->GetNotificationManager()->RegisterNotificationListener(shared_from_this());
|
|
} else {
|
|
MessageManager::DisplayMessage("NetPlay", "CouldNotConnect");
|
|
_connected = false;
|
|
}
|
|
}
|
|
|
|
void GameClient::Disconnect()
|
|
{
|
|
_stop = true;
|
|
_connected = false;
|
|
if(_clientThread) {
|
|
_clientThread->join();
|
|
_clientThread.reset();
|
|
}
|
|
}
|
|
|
|
void GameClient::Exec()
|
|
{
|
|
if(_connected) {
|
|
while(!_stop) {
|
|
if(!_connection->ConnectionError()) {
|
|
_connection->ProcessMessages();
|
|
_connection->SendInput();
|
|
} else {
|
|
break;
|
|
}
|
|
std::this_thread::sleep_for(std::chrono::duration<int, std::milli>(1));
|
|
}
|
|
_connected = false;
|
|
_connection->Shutdown();
|
|
}
|
|
}
|
|
|
|
void GameClient::ProcessNotification(ConsoleNotificationType type, void* parameter)
|
|
{
|
|
if(!_connected) {
|
|
return;
|
|
}
|
|
|
|
if(type == ConsoleNotificationType::GameLoaded &&
|
|
std::this_thread::get_id() != _clientThread->get_id() &&
|
|
!_emu->IsEmulationThread()
|
|
) {
|
|
//Disconnect if the client tried to manually load a game
|
|
//A deadlock occurs if this is called from the emulation thread while a network message is being processed
|
|
Disconnect();
|
|
}
|
|
|
|
if(_connection) {
|
|
_connection->ProcessNotification(type, parameter);
|
|
}
|
|
}
|
|
|
|
void GameClient::SelectController(NetplayControllerInfo controller)
|
|
{
|
|
if(_connection) {
|
|
_connection->SelectController(controller);
|
|
}
|
|
}
|
|
|
|
vector<NetplayControllerUsageInfo> GameClient::GetControllerList()
|
|
{
|
|
return _connection ? _connection->GetControllerList() : vector<NetplayControllerUsageInfo>();
|
|
}
|
|
|
|
NetplayControllerInfo GameClient::GetControllerPort()
|
|
{
|
|
return _connection ? _connection->GetControllerPort() : NetplayControllerInfo { GameConnection::SpectatorPort, 0 };
|
|
} |