games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Add proxy connection mode for lobby rooms

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-12 17:21:59 +02:00
parent 709905b1a0
commit 033b2889c4
5 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
server/GlobalLobbyProcessor.cpp
View File

@@ -15,11 +15,16 @@
GlobalLobbyProcessor::GlobalLobbyProcessor(CVCMIServer & owner)
: owner(owner)
{
logGlobal->info("Connecting to lobby server");
establishNewConnection();
}
void GlobalLobbyProcessor::establishNewConnection()
{
std::string hostname = settings["lobby"]["hostname"].String();
int16_t port = settings["lobby"]["port"].Integer();
owner.networkHandler->connectToRemote(*this, hostname, port);
logGlobal->info("Connecting to lobby server");
}
void GlobalLobbyProcessor::onDisconnected(const std::shared_ptr<INetworkConnection> & connection)
@@ -56,7 +61,12 @@ void GlobalLobbyProcessor::receiveLoginSuccess(const JsonNode & json)
void GlobalLobbyProcessor::receiveAccountJoinsRoom(const JsonNode & json)
{
// TODO: establish new connection to lobby, login, and transfer connection to our owner
std::string accountID = json["accountID"].String();
assert(proxyConnections.count(accountID) == 0);
proxyConnections[accountID] = nullptr;
establishNewConnection();
}
void GlobalLobbyProcessor::onConnectionFailed(const std::string & errorMessage)
@@ -66,14 +76,35 @@ void GlobalLobbyProcessor::onConnectionFailed(const std::string & errorMessage)
void GlobalLobbyProcessor::onConnectionEstablished(const std::shared_ptr<INetworkConnection> & connection)
{
controlConnection = connection;
logGlobal->info("Connection to lobby server established");
if (controlConnection == nullptr)
{
controlConnection = connection;
logGlobal->info("Connection to lobby server established");
JsonNode toSend;
toSend["type"].String() = "serverLogin";
toSend["accountID"] = settings["lobby"]["accountID"];
toSend["accountCookie"] = settings["lobby"]["accountCookie"];
sendMessage(toSend);
JsonNode toSend;
toSend["type"].String() = "serverLogin";
toSend["accountID"] = settings["lobby"]["accountID"];
toSend["accountCookie"] = settings["lobby"]["accountCookie"];
sendMessage(toSend);
}
else
{
// Proxy connection for a player
std::string accountID;
for (auto const & proxies : proxyConnections)
if (proxies.second == nullptr)
accountID = proxies.first;
JsonNode toSend;
toSend["type"].String() = "serverProxyLogin";
toSend["gameRoomID"].String() = "";
toSend["accountID"].String() = accountID;
toSend["accountCookie"] = settings["lobby"]["accountCookie"];
sendMessage(toSend);
proxyConnections[accountID] = connection;
owner.onNewConnection(connection);
}
}
void GlobalLobbyProcessor::sendMessage(const JsonNode & data)