OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-03-15 18:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revamp CNShared logic

Browse Source 
* Use a specialized connection object
* Copy the Player object less frequently
* Use a randomly generated serial key for shard auth
* Refuse invalid shard connection attempts
* Clean up connection metadata when a Player joins the shard
* Prune abandoned connections when they time out
This commit is contained in:
dongresource
2022-07-24 00:16:04 +02:00
parent c5dd745aa1
commit 741bfb675b
6 changed files with 78 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/servers/CNLoginServer.cpp
View File

@@ -468,21 +468,24 @@ void CNLoginServer::characterSelect(CNSocket* sock, CNPacketData* data) {
resp.g_FE_ServerIP[strlen(shard_ip)] = '\0';
resp.g_FE_ServerPort = settings::SHARDPORT;
// pass player to CNShared
Player passPlayer = {};
Database::getPlayer(&passPlayer, selection->iPC_UID);
LoginMetadata *lm = new LoginMetadata();
lm->FEKey = sock->getFEKey();
lm->timestamp = getTime();
Database::getPlayer(&lm->plr, selection->iPC_UID);
// this should never happen but for extra safety
if (passPlayer.iID == 0)
if (lm->plr.iID == 0)
return invalidCharacter(sock);
passPlayer.FEKey = sock->getFEKey();
resp.iEnterSerialKey = passPlayer.iID;
CNShared::setPlayer(resp.iEnterSerialKey, passPlayer);
resp.iEnterSerialKey = Rand::rand(); // TODO: cryptographic RNG
// transfer ownership of connection data to CNShared
CNShared::storeLoginMetadata(resp.iEnterSerialKey, lm);
sock->sendPacket(resp, P_LS2CL_REP_SHARD_SELECT_SUCC);
// update current slot in DB
Database::updateSelected(loginSessions[sock].userID, passPlayer.slot);
Database::updateSelected(loginSessions[sock].userID, lm->plr.slot);
}
void CNLoginServer::finishTutorial(CNSocket* sock, CNPacketData* data) {

7
src/servers/CNShardServer.cpp
View File

@@ -99,14 +99,7 @@ void CNShardServer::_killConnection(CNSocket* cns) {
if (PlayerManager::players.find(cns) == PlayerManager::players.end())
return;
Player* plr = PlayerManager::getPlayer(cns);
int64_t key = plr->SerialKey;
PlayerManager::removePlayer(cns); // removes the player from the list and saves it to DB
// remove from CNShared
CNShared::erasePlayer(key);
}
void CNShardServer::killConnection(CNSocket *cns) {