From 86b8d23865d26e30ea6d01f22855aff5d474a901 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 17 Dec 2016 19:55:13 +0000 Subject: [PATCH] stdc++6 build fixes --- .../src/shared/GameServerConnection.cpp | 22 ++++++++++------ .../src/shared/CentralServerConnection.cpp | 25 +++++++++++-------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/engine/server/application/CentralServer/src/shared/GameServerConnection.cpp b/engine/server/application/CentralServer/src/shared/GameServerConnection.cpp index ac6edcb8..bb70c1c5 100755 --- a/engine/server/application/CentralServer/src/shared/GameServerConnection.cpp +++ b/engine/server/application/CentralServer/src/shared/GameServerConnection.cpp @@ -33,9 +33,10 @@ #include "serverNetworkMessages/UploadCharacterMessage.h" #include "sharedLog/Log.h" #include "sharedNetworkMessages/ConsoleChannelMessages.h" -#include "sharedNetworkMessages/GenericValueTypeMessage.h" #include "unicodeArchive/UnicodeArchive.h" +#include "sharedNetworkMessages/GenericValueTypeMessage.h" + #include "sharedFoundation/CrcConstexpr.hpp" // ====================================================================== @@ -126,11 +127,16 @@ void GameServerConnection::onReceive(Archive::ByteStream const &message) } case constcrc("TransferReplyNameValidation") : { - GenericValueTypeMessage > const replyNameValidation(ri); + GenericValueTypeMessage > const replyNameValidation(ri); + auto i = replyNameValidation.getValue().begin(); - if (replyNameValidation.getValue().second.getTransferRequestSource() == TransferRequestMoveValidation::TRS_transfer_server) + if (i == replyNameValidation.getValue().end()) { + break; + } + + if (i->second.getTransferRequestSource() == TransferRequestMoveValidation::TRS_transfer_server) { - LOG("CustomerService", ("CharacterTransfer: Received TransferReplyNameValidation from GameServer, forwarding to TransferServer : %s", replyNameValidation.getValue().second.toString().c_str())); + LOG("CustomerService", ("CharacterTransfer: Received TransferReplyNameValidation from GameServer, forwarding to TransferServer : %s", i->second.toString().c_str())); CentralServer::getInstance().sendToTransferServer(replyNameValidation); } else @@ -138,14 +144,14 @@ void GameServerConnection::onReceive(Archive::ByteStream const &message) // pass reply back to the source galaxy for handling, which is to // either display an error message to the user if the request failed, // or to start the transfer process if the request succeeds - LOG("CustomerService", ("CharacterTransfer: Received TransferReplyNameValidation from GameServer, forwarding to source galaxy CentralServer : %s", replyNameValidation.getValue().second.toString().c_str())); + LOG("CustomerService", ("CharacterTransfer: Received TransferReplyNameValidation from GameServer, forwarding to source galaxy CentralServer : %s", i->second.toString().c_str())); CentralServer::getInstance().sendToArbitraryLoginServer(replyNameValidation); // if the request succeeded, also disconnect any clients with a connection to SWG services on this (the target) galaxy - if (replyNameValidation.getValue().second.getIsValidName() && (replyNameValidation.getValue().second.getTransferRequestSource() != TransferRequestMoveValidation::TRS_ingame_freects_command_validate) && (replyNameValidation.getValue().second.getTransferRequestSource() != TransferRequestMoveValidation::TRS_ingame_cts_command_validate)) + if (i->second.getIsValidName() && (i->second.getTransferRequestSource() != TransferRequestMoveValidation::TRS_ingame_freects_command_validate) && (i->second.getTransferRequestSource() != TransferRequestMoveValidation::TRS_ingame_cts_command_validate)) { - GenericValueTypeMessage kickSource("TransferKickConnectedClients", replyNameValidation.getValue().second.getSourceStationId()); - GenericValueTypeMessage kickDestination("TransferKickConnectedClients", replyNameValidation.getValue().second.getDestinationStationId()); + GenericValueTypeMessage kickSource("TransferKickConnectedClients", i->second.getSourceStationId()); + GenericValueTypeMessage kickDestination("TransferKickConnectedClients", i->second.getDestinationStationId()); CentralServer::getInstance().sendToAllLoginServers(kickSource); CentralServer::getInstance().sendToAllLoginServers(kickDestination); CentralServer::getInstance().sendToAllConnectionServers(kickSource, true); diff --git a/engine/server/application/TransferServer/src/shared/CentralServerConnection.cpp b/engine/server/application/TransferServer/src/shared/CentralServerConnection.cpp index ece4ff3d..ea3b1637 100755 --- a/engine/server/application/TransferServer/src/shared/CentralServerConnection.cpp +++ b/engine/server/application/TransferServer/src/shared/CentralServerConnection.cpp @@ -228,27 +228,32 @@ void CentralServerConnection::onReceive(const Archive::ByteStream & message) } case constcrc("TransferReplyNameValidation") : { - const GenericValueTypeMessage > replyNameValidation(ri); - if(!replyNameValidation.getValue().second.getIsMoveRequest()) + const GenericValueTypeMessage > replyNameValidation(ri); + auto i = replyNameValidation.getValue().begin(); + + if (i == replyNameValidation.getValue().end()) { + break; + } + + if(!i->second.getIsMoveRequest()) { - LOG("CustomerService", ("CharacterTransfer: Received replyNameValidation for move validation request. (%s) %s", replyNameValidation.getValue().first.c_str(), replyNameValidation.getValue().second.toString().c_str())); - TransferServer::replyValidateMove(replyNameValidation.getValue().second); + LOG("CustomerService", ("CharacterTransfer: Received replyNameValidation for move validation request. (%s) %s", i->first.c_str(), i->second.toString().c_str())); + TransferServer::replyValidateMove(i->second); } else { - if(TransferServer::isRename(replyNameValidation.getValue().second)) + if(TransferServer::isRename(i->second)) { - LOG("CustomerService", ("CharacterTransfer: Received replyNameValidation for rename request, starting character rename protocol. (%s) %s", replyNameValidation.getValue().first.c_str(), replyNameValidation.getValue().second.toString().c_str())); - const GenericValueTypeMessage renameCharacter("TransferRenameCharacter", replyNameValidation.getValue().second); - CentralServerConnection * centralServerConnection = CentralServerConnection::getCentralServerConnectionForGalaxy(replyNameValidation.getValue().second.getSourceGalaxy()); + LOG("CustomerService", ("CharacterTransfer: Received replyNameValidation for rename request, starting character rename protocol. (%s) %s", i->first.c_str(), i->second.toString().c_str())); + const GenericValueTypeMessage renameCharacter("TransferRenameCharacter", i->second); + CentralServerConnection * centralServerConnection = CentralServerConnection::getCentralServerConnectionForGalaxy(i->second.getSourceGalaxy()); if(centralServerConnection) { centralServerConnection->send(renameCharacter, true); } else { - TransferServer::transferCreateCharacterFailed(replyNameValidation.getValue().second); - } + TransferServer::transferCreateCharacterFailed(i->second); } } else {