Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced lambda implementations with calls to the 'full unload' methods

Browse Source 
IT should be noted that ClientManager::CheckConnections() no longer
removes a client; instead, it returns a client index that needs to be
removed via another means. This allows ServerApplication to use the 'full
unload' method.
This commit is contained in:
Kayne Ruse
2014-12-19 17:58:50 +11:00
parent 0d9dfad4a5
commit 15ea360b8a
3 changed files with 6 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/clients/client_manager.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ int ClientManager::CheckConnections() {
for (auto& it : elementMap) {
if (it.second.GetAttempts() > 2) {
int ret = it.first;
elementMap.erase(it.first);
// elementMap.erase(it.first);
return ret;
}
}
server/server_connections.cpp
+4 -31
View File
@@ -137,18 +137,8 @@ void ServerApplication::HandleLogoutRequest(ClientPacket* const argPacket) {
network.SendTo(clientData->GetAddress(), static_cast<SerialPacket*>(&newPacket));
//save and unload this accounts characters
characterMgr.UnloadIf([&](std::pair<int, CharacterData> it) -> bool {
if (argPacket->accountIndex == it.second.GetOwner()) {
//pump the unload message to all remaining clients
//TODO: pump character unload
return true;
}
return false;
});
//unload this account
accountMgr.Unload(argPacket->accountIndex);
//save and unload this account and it's characters
FullAccountUnload(argPacket->accountIndex);
//finished this routine
std::cout << "New logout, " << clientMgr.GetLoadedCount() << " clients and " << accountMgr.GetLoadedCount() << " accounts total" << std::endl;
@@ -174,25 +164,8 @@ void ServerApplication::HandleDisconnectRequest(ClientPacket* const argPacket) {
network.SendTo(clientData->GetAddress(), static_cast<SerialPacket*>(&newPacket));
//TODO: need a method for this redundunt chunk of redundant code
//find and unload the accounts associated with this client
accountMgr.UnloadIf([&](std::pair<const int, AccountData> account) -> bool {
if (account.second.GetClientIndex() == argPacket->clientIndex) {
//find and unload the characters associated with this account
characterMgr.UnloadIf([&](std::pair<const int, CharacterData> character) -> bool {
if (character.second.GetOwner() == account.first) {
//TODO: pump character unload
return true;
}
return false;
});
return true;
}
return false;
});
//unload this client
clientMgr.Unload(argPacket->clientIndex);
//unload the client, it's accounts, and their characters
FullClientUnload(argPacket->clientIndex);
//finished this routine
std::cout << "New disconnection, " << clientMgr.GetLoadedCount() << " clients and " << accountMgr.GetLoadedCount() << " accounts total" << std::endl;
server/server_logic.cpp
+1 -21
View File
@@ -182,27 +182,7 @@ void ServerApplication::Proc() {
//Check connections
int disconnected = clientMgr.CheckConnections();
if (disconnected != -1) {
//find and unload the accounts associated with this client
accountMgr.UnloadIf([&](std::pair<const int, AccountData> account) -> bool {
if (account.second.GetClientIndex() == disconnected) {
//find and unload the characters associated with this account
characterMgr.UnloadIf([&](std::pair<const int, CharacterData> character) -> bool {
if (character.second.GetOwner() == account.first) {
//pump character delete
CharacterPacket newPacket;
newPacket.type = SerialPacketType::CHARACTER_DELETE;
newPacket.characterIndex = character.first;
PumpPacket(static_cast<SerialPacket*>(&newPacket));
//unload this character
return true;
}
return false;
});
return true;
}
return false;
});
FullClientUnload(disconnected);
}
//give the computer a break