From b3149429f1601119bf847e299e782e23211b998d Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 17 May 2018 17:53:12 +0000 Subject: [PATCH 1/4] Revert "forgot to switch to the 64 bit int map func" This reverts commit ea64809fbbe9f50afd72862f4a66c7e44c720415. --- .../application/LoginServer/src/shared/ClientConnection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp index dc5bd08f..8b43f6d8 100755 --- a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp @@ -181,7 +181,7 @@ void ClientConnection::validateClient(const std::string &id, const std::string & authOK = true; parentAccount = api.getString("mainAccount"); - childAccounts = api.getStringMap64("subAccounts"); + childAccounts = api.getStringMap("subAccounts"); if (!ConfigLoginServer::getUseOldSuidGenerator()) { user_id = static_cast(api.getNullableValue("user_id")); From 3167f81fcd6e32893c7f75052a8e59f95efe3115 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 17 May 2018 17:53:19 +0000 Subject: [PATCH 2/4] Revert "this should make things display properly again" This reverts commit 9dffede072c191486483521551b68931a4aacba3. --- .../src/shared/ClientConnection.cpp | 6 ++--- external/3rd/library/webAPI/webAPI.cpp | 23 ++----------------- external/3rd/library/webAPI/webAPI.h | 7 ++---- 3 files changed, 7 insertions(+), 29 deletions(-) diff --git a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp index 8b43f6d8..d955e5eb 100755 --- a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp @@ -161,7 +161,7 @@ void ClientConnection::validateClient(const std::string &id, const std::string & StationId user_id; StationId parent_id; - std::unordered_map childAccounts; + std::unordered_map childAccounts; if (!authURL.empty()) { // create the object @@ -184,8 +184,8 @@ void ClientConnection::validateClient(const std::string &id, const std::string & childAccounts = api.getStringMap("subAccounts"); if (!ConfigLoginServer::getUseOldSuidGenerator()) { - user_id = static_cast(api.getNullableValue("user_id")); - parent_id = static_cast(api.getNullableValue("parent_id")); + user_id = static_cast(api.getNullableValue("user_id")); + parent_id = static_cast(api.getNullableValue("parent_id")); } else { if (parentAccount.length() > MAX_ACCOUNT_NAME_LENGTH) { parentAccount.resize(MAX_ACCOUNT_NAME_LENGTH); diff --git a/external/3rd/library/webAPI/webAPI.cpp b/external/3rd/library/webAPI/webAPI.cpp index faf7d11b..b03ea28c 100644 --- a/external/3rd/library/webAPI/webAPI.cpp +++ b/external/3rd/library/webAPI/webAPI.cpp @@ -72,26 +72,7 @@ std::unordered_map webAPI::getStringMap(const std::string &slo return ret; } -std::unordered_map webAPI::getStringMap64(const std::string &slot) { - std::unordered_map ret = std::unordered_map(); - - if (!responseData.empty() && !slot.empty() && responseData.count(slot) && !responseData[slot].is_null()) { - - nlohmann::json j = responseData[slot]; - - for (nlohmann::json::iterator it = j.begin(); it != j.end(); ++it) { - std::string tmp(it.key()); - int64_t k = strtoll(tmp.c_str(), nullptr, 10); - std::string val = it.value(); - - ret.insert({k, val}); - } - } - - return ret; -} - -bool webAPI::submit(const int32_t &reqType, const int32_t &getPost, const int32_t &respType) { +bool webAPI::submit(const int &reqType, const int &getPost, const int &respType) { if (reqType == DTYPE::JSON) // json request { if (!requestData.empty()) { @@ -112,7 +93,7 @@ bool webAPI::submit(const int32_t &reqType, const int32_t &getPost, const int32_ return false; } -bool webAPI::fetch(const int32_t &getPost, const int32_t &mimeType) // 0 for json 1 for string +bool webAPI::fetch(const int &getPost, const int &mimeType) // 0 for json 1 for string { bool fetchStatus = false; diff --git a/external/3rd/library/webAPI/webAPI.h b/external/3rd/library/webAPI/webAPI.h index 2209b8f5..501c18cb 100644 --- a/external/3rd/library/webAPI/webAPI.h +++ b/external/3rd/library/webAPI/webAPI.h @@ -49,7 +49,7 @@ namespace StellaBellum { // submits the request bool - submit(const int32_t &reqType = DTYPE::JSON, const int32_t &getPost = HTTP::POST, const int32_t &respType = DTYPE::JSON); + submit(const int &reqType = DTYPE::JSON, const int &getPost = HTTP::POST, const int &respType = DTYPE::JSON); // set the endpoint after object creation...or change the target if needed bool setEndpoint(const std::string endpoint); @@ -66,9 +66,6 @@ namespace StellaBellum { // get a vector of strings from a given slot std::unordered_map getStringMap(const std::string &slot); - // get a 64 bit keyed vector of strings from a given slot - std::unordered_map getStringMap64(const std::string &slot); - // set json key and value for request template bool addJsonData(const std::string &key, const T &value) { if (!key.empty() && @@ -107,7 +104,7 @@ namespace StellaBellum { std::string uri; // fetcher - returns raw response direct from remote - bool fetch(const int32_t &getPost = HTTP::POST, const int32_t &mimeType = DTYPE::JSON); + bool fetch(const int &getPost = HTTP::POST, const int &mimeType = DTYPE::JSON); // cURL writeback callback static size_t writeCallback(void *contents, size_t size, size_t nmemb, void *userp); From fc52ba532a54540fbfcef3b59207451e138c12f7 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 17 May 2018 17:53:30 +0000 Subject: [PATCH 3/4] Revert "use larger sized ints so that oracle doesn't crap the bed" This reverts commit ca105492e7af5d7ca7d64725ad45b251e9a8b66f. --- .../src/shared/CharacterNameLocator.h | 8 +++--- .../src/shared/core/NameManager.cpp | 26 +++++++++---------- .../serverGame/src/shared/core/NameManager.h | 6 ++--- .../gameGameServer/CharacterNamesMessage.cpp | 2 +- .../gameGameServer/CharacterNamesMessage.h | 14 +++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h index 6227b30e..258a1359 100755 --- a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h +++ b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h @@ -36,8 +36,8 @@ class CharacterNameLocator : public ObjectLocator DB::BindableInt64 character_station_id; DB::BindableString<127> character_name; DB::BindableString<127> character_full_name; - DB::BindableInt64 character_create_time; - DB::BindableInt64 character_last_login_time; + DB::BindableLong character_create_time; + DB::BindableLong character_last_login_time; }; class CharacterNameQuery : public DB::Query @@ -67,8 +67,8 @@ class CharacterNameLocator : public ObjectLocator std::vector m_stationIds; std::vector m_characterNames; std::vector m_characterFullNames; - std::vector m_characterCreateTime; - std::vector m_characterLastLoginTime; + std::vector m_characterCreateTime; + std::vector m_characterLastLoginTime; }; // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.cpp b/engine/server/library/serverGame/src/shared/core/NameManager.cpp index 2ee27216..f5ea7c6d 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/NameManager.cpp @@ -224,15 +224,15 @@ void NameManager::addPlayer(const NetworkId &id, StationId stationId, const std: std::vector stationIds; std::vector characterNames; std::vector characterFullNames; - std::vector characterCreateTimes; - std::vector characterLastLoginTimes; + std::vector characterCreateTimes; + std::vector characterLastLoginTimes; ids.push_back(id); stationIds.push_back(stationId); characterNames.push_back(normalizedName); characterFullNames.push_back(fullName); - characterCreateTimes.push_back(static_cast(createTime)); - characterLastLoginTimes.push_back(static_cast(lastLoginTime)); + characterCreateTimes.push_back(static_cast(createTime)); + characterLastLoginTimes.push_back(static_cast(lastLoginTime)); ServerMessageForwarding::beginBroadcast(); @@ -316,24 +316,24 @@ const std::string & NameManager::getPlayerFullName(const NetworkId &id) const // ---------------------------------------------------------------------- -int64 NameManager::getPlayerCreateTime(const NetworkId &id) const +int NameManager::getPlayerCreateTime(const NetworkId &id) const { IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id); if (i==m_idToCharacterDataMap->end()) return -1; else - return static_cast(i->second.createTime); + return static_cast(i->second.createTime); } // ---------------------------------------------------------------------- -int64 NameManager::getPlayerLastLoginTime(const NetworkId &id) const +int NameManager::getPlayerLastLoginTime(const NetworkId &id) const { IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id); if (i==m_idToCharacterDataMap->end()) return -1; else - return static_cast(i->second.lastLoginTime); + return static_cast(i->second.lastLoginTime); } // ---------------------------------------------------------------------- @@ -464,7 +464,7 @@ void NameManager::releasePlayerName(const NetworkId &id) // ---------------------------------------------------------------------- -void NameManager::addPlayers(const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes) +void NameManager::addPlayers(const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes) { DEBUG_FATAL(ids.size() != stationIds.size(),("Programmer bug: Vectors ids and stationIds must be the same size.\n")); DEBUG_FATAL(ids.size() != names.size(),("Programmer bug: Vectors ids and names must be the same size.\n")); @@ -486,8 +486,8 @@ void NameManager::sendAllNamesToServer (std::vector const & servers) con std::vector stationIds; std::vector characterNames; std::vector characterFullNames; - std::vector characterCreateTimes; - std::vector characterLastLoginTimes; + std::vector characterCreateTimes; + std::vector characterLastLoginTimes; for (IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->begin(); i!=m_idToCharacterDataMap->end(); ++i) { @@ -495,8 +495,8 @@ void NameManager::sendAllNamesToServer (std::vector const & servers) con stationIds.push_back(i->second.stationId); characterNames.push_back(i->second.characterName); characterFullNames.push_back(i->second.characterFullName); - characterCreateTimes.push_back(static_cast(i->second.createTime)); - characterLastLoginTimes.push_back(static_cast(i->second.lastLoginTime)); + characterCreateTimes.push_back(static_cast(i->second.createTime)); + characterLastLoginTimes.push_back(static_cast(i->second.lastLoginTime)); } ServerMessageForwarding::begin(servers); diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.h b/engine/server/library/serverGame/src/shared/core/NameManager.h index 453ba626..f98940e2 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.h +++ b/engine/server/library/serverGame/src/shared/core/NameManager.h @@ -35,7 +35,7 @@ class NameManager public: int getTotalPlayerCount () const; void addPlayer (const NetworkId &id, StationId stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers); - void addPlayers (const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes); + void addPlayers (const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes); void renamePlayer (const NetworkId &id, const Unicode::String &name, const Unicode::String &fullName); std::string debugGetNameList () const; bool isPlayer (NetworkId const & possiblePlayer) const; @@ -43,8 +43,8 @@ class NameManager StationId getPlayerStationId (const NetworkId &id) const; const std::string & getPlayerName (const NetworkId &id) const; const std::string & getPlayerFullName (const NetworkId &id) const; - int64 getPlayerCreateTime (const NetworkId &id) const; - int64 getPlayerLastLoginTime (const NetworkId &id) const; + int getPlayerCreateTime (const NetworkId &id) const; + int getPlayerLastLoginTime (const NetworkId &id) const; void getPlayerWithLastLoginTimeAfter (time_t time, std::multimap, std::string> > &result) const; void getPlayerWithLastLoginTimeBefore (time_t time, std::multimap, std::string> > &result) const; void getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap, std::string> > &result) const; diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp index 3bd27763..8dcb9a94 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp @@ -10,7 +10,7 @@ // ====================================================================== -CharacterNamesMessage::CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes) : +CharacterNamesMessage::CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes) : GameNetworkMessage("CharacterNamesMessage"), m_ids(), m_stationIds(), diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h index bb1aef7b..047b32d0 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h @@ -22,7 +22,7 @@ class CharacterNamesMessage : public GameNetworkMessage { public: - CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes); + CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes); CharacterNamesMessage(Archive::ReadIterator & source); ~CharacterNamesMessage(); @@ -30,16 +30,16 @@ class CharacterNamesMessage : public GameNetworkMessage const std::vector &getStationIds() const; const std::vector &getNames() const; const std::vector &getFullNames() const; - const std::vector &getCreateTimes() const; - const std::vector &getLoginTimes() const; + const std::vector &getCreateTimes() const; + const std::vector &getLoginTimes() const; private: Archive::AutoArray m_ids; Archive::AutoArray m_stationIds; Archive::AutoArray m_names; Archive::AutoArray m_fullNames; - Archive::AutoArray m_createTimes; - Archive::AutoArray m_loginTimes; + Archive::AutoArray m_createTimes; + Archive::AutoArray m_loginTimes; private: //disabled functions: @@ -79,14 +79,14 @@ inline const std::vector & CharacterNamesMessage::getFullNames() co // ---------------------------------------------------------------------- -inline const std::vector & CharacterNamesMessage::getCreateTimes() const +inline const std::vector & CharacterNamesMessage::getCreateTimes() const { return m_createTimes.get(); } // ---------------------------------------------------------------------- -inline const std::vector & CharacterNamesMessage::getLoginTimes() const +inline const std::vector & CharacterNamesMessage::getLoginTimes() const { return m_loginTimes.get(); } From 1fcbbaeb4074e40d82d37858835051577d2cb538 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 17 May 2018 17:55:22 +0000 Subject: [PATCH 4/4] Revert "switch to int64 for the StationId typedef, and use the StationId typedef everywhere. Note that the Archive.h in this commit really needs to use a centralized Types.h or FoundationTypes.h file, as do many others...in this case I just typedefed at the top" This reverts commit 8fb01069e119bc8f29fc2814ef1c93ba4c612e59. --- .../src/shared/CentralServer.cpp | 4 +-- .../CentralServer/src/shared/CentralServer.h | 2 +- .../src/shared/ConnectionServerConnection.cpp | 4 +-- .../src/shared/ConnectionServer.cpp | 4 +-- .../src/shared/ConnectionServer.h | 2 +- .../src/shared/CharacterNameLocator.h | 3 +- .../src/shared/core/NameManager.cpp | 16 +++++------ .../serverGame/src/shared/core/NameManager.h | 10 +++---- .../gameGameServer/CharacterNamesMessage.cpp | 2 +- .../gameGameServer/CharacterNamesMessage.h | 9 +++--- .../sharedFoundation/src/shared/StationId.h | 2 +- .../src/linux/FoundationTypesLinux.h | 7 ++--- .../src/win32/FoundationTypesWin32.h | 6 ---- .../VChatAPI/utils2.0/utils/Base/types.h | 5 ++++ .../ours/library/archive/src/shared/Archive.h | 28 +------------------ .../src/shared/generated/Schema_h.template | 4 +-- .../src/shared/tasks/TaskRestoreCharacter.h | 2 +- 17 files changed, 38 insertions(+), 72 deletions(-) diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.cpp b/engine/server/application/CentralServer/src/shared/CentralServer.cpp index 2da16b79..8e39542c 100755 --- a/engine/server/application/CentralServer/src/shared/CentralServer.cpp +++ b/engine/server/application/CentralServer/src/shared/CentralServer.cpp @@ -1233,7 +1233,7 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons DEBUG_REPORT_LOG(true, ("Pending character %lu is logging in or dropping\n", m.getAccountNumber())); // Once they're logged in, Central doesn't need to know about them anymore: - removeSuidFromAccountConnectionMap(m.getAccountNumber()); + removeFromAccountConnectionMap(m.getAccountNumber()); break; } case constcrc("CharacterListMessage") : { @@ -3419,7 +3419,7 @@ void CentralServer::addToAccountConnectionMap(StationId suid, ConnectionServerCo // ---------------------------------------------------------------------- -void CentralServer::removeSuidFromAccountConnectionMap(StationId suid) +void CentralServer::removeFromAccountConnectionMap(StationId suid) { ConnectionServerSUIDMap::iterator i=m_accountConnectionMap.find(suid); if (i!=m_accountConnectionMap.end()) diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.h b/engine/server/application/CentralServer/src/shared/CentralServer.h index 95b6dd25..22e6a7de 100755 --- a/engine/server/application/CentralServer/src/shared/CentralServer.h +++ b/engine/server/application/CentralServer/src/shared/CentralServer.h @@ -169,7 +169,7 @@ public: void getCharacterMatchStatistics(int & numberOfCharacterMatchRequests, int & numberOfCharacterMatchResultsPerRequest, int & timeSpentPerCharacterMatchRequestMs); - void removeSuidFromAccountConnectionMap(StationId suid); + void removeFromAccountConnectionMap(StationId suid); private: void handleRequestGameServerForLoginMessage (const RequestGameServerForLoginMessage & msg); diff --git a/engine/server/application/CentralServer/src/shared/ConnectionServerConnection.cpp b/engine/server/application/CentralServer/src/shared/ConnectionServerConnection.cpp index 3c6f6335..196f5a18 100755 --- a/engine/server/application/CentralServer/src/shared/ConnectionServerConnection.cpp +++ b/engine/server/application/CentralServer/src/shared/ConnectionServerConnection.cpp @@ -254,7 +254,7 @@ void ConnectionServerConnection::onReceive(const Archive::ByteStream & message) s_pseudoClientConnectionMap[info.getValue().first] = std::make_pair(static_cast(info.getValue().second), this); // remove corresponding "non pseudo client connection" - CentralServer::getInstance().removeSuidFromAccountConnectionMap(static_cast(info.getValue().first)); + CentralServer::getInstance().removeFromAccountConnectionMap(static_cast(info.getValue().first)); break; } case constcrc("DestroyPseudoClientConnection") : @@ -443,4 +443,4 @@ void ConnectionServerConnection::removeFromAccountConnectionMap(unsigned int sta { s_pseudoClientConnectionMap.erase(f); } -} +} \ No newline at end of file diff --git a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp index d8f3c142..55fb16e6 100755 --- a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp @@ -161,7 +161,7 @@ void ConnectionServer::addGameConnection(unsigned long gameServerId, GameConnect //----------------------------------------------------------------------- bool -ConnectionServer::decryptToken(const KeyShare::Token &token, StationId &stationUserId, bool &secure, std::string &accountName) { +ConnectionServer::decryptToken(const KeyShare::Token &token, uint32 &stationUserId, bool &secure, std::string &accountName) { static ConnectionServer &cs = instance(); //Also the sizeof(int) is likewise magic from the session api @@ -179,7 +179,7 @@ ConnectionServer::decryptToken(const KeyShare::Token &token, StationId &stationU char *tmpBuffer = new char[MAX_ACCOUNT_NAME_LENGTH + 1]; memset(tmpBuffer, 0, MAX_ACCOUNT_NAME_LENGTH + 1); - memcpy(&stationUserId, keyBufferPointer, sizeof(StationId)); + memcpy(&stationUserId, keyBufferPointer, sizeof(uint32)); keyBufferPointer += sizeof(uint32); memcpy(&secure, keyBufferPointer, sizeof(bool)); keyBufferPointer += sizeof(bool); diff --git a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h index 1e337661..36abc449 100755 --- a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h +++ b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h @@ -48,7 +48,7 @@ class ConnectionServer : public MessageDispatch::Receiver static void addNewClient(ClientConnection* cconn, const NetworkId &oid, GameConnection* gconn, const std::string &sceneName, bool sendToStarport ); static void addConnectedClient(uint32 suid, ClientConnection* conn); static void addGameConnection(unsigned long gameServerId, GameConnection* gc); - static bool decryptToken(const KeyShare::Token & token, StationId & stationUserId, bool & secure, std::string & accountName); + static bool decryptToken(const KeyShare::Token & token, uint32 & stationUserId, bool & secure, std::string & accountName); static bool decryptToken(const KeyShare::Token & token, char* sessionKey, StationId & stationId); static CentralConnection * getCentralConnection(); static void dropClient(ClientConnection * conn, const std::string &description); diff --git a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h index 258a1359..c8f95c55 100755 --- a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h +++ b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h @@ -14,7 +14,6 @@ #include "sharedDatabaseInterface/BindableNetworkId.h" #include "sharedDatabaseInterface/DbQuery.h" #include "serverDatabase/ObjectLocator.h" -#include "sharedFoundation/StationId.h" #include // ====================================================================== @@ -64,7 +63,7 @@ class CharacterNameLocator : public ObjectLocator private: std::vector m_characterIds; - std::vector m_stationIds; + std::vector m_stationIds; std::vector m_characterNames; std::vector m_characterFullNames; std::vector m_characterCreateTime; diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.cpp b/engine/server/library/serverGame/src/shared/core/NameManager.cpp index f5ea7c6d..3724892f 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/NameManager.cpp @@ -189,7 +189,7 @@ int NameManager::getTotalPlayerCount() const // ---------------------------------------------------------------------- -void NameManager::addPlayer(const NetworkId &id, StationId stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers) +void NameManager::addPlayer(const NetworkId &id, uint32 stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers) { std::string normalizedName(normalizeName(name)); @@ -221,14 +221,14 @@ void NameManager::addPlayer(const NetworkId &id, StationId stationId, const std: if (notifyOtherServers) { std::vector ids; - std::vector stationIds; + std::vector stationIds; std::vector characterNames; std::vector characterFullNames; std::vector characterCreateTimes; std::vector characterLastLoginTimes; ids.push_back(id); - stationIds.push_back(stationId); + stationIds.push_back(static_cast(stationId)); characterNames.push_back(normalizedName); characterFullNames.push_back(fullName); characterCreateTimes.push_back(static_cast(createTime)); @@ -247,7 +247,7 @@ void NameManager::addPlayer(const NetworkId &id, StationId stationId, const std: void NameManager::renamePlayer(const NetworkId &id, const Unicode::String &name, const Unicode::String &fullName) { - StationId stationId = 0; + uint32 stationId = 0; time_t createTime = 0; time_t lastLoginTime = 0; @@ -279,7 +279,7 @@ const NetworkId & NameManager::getPlayerId(const std::string &name) const // ---------------------------------------------------------------------- -StationId NameManager::getPlayerStationId(const NetworkId &id) const +uint32 NameManager::getPlayerStationId(const NetworkId &id) const { IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id); if (i==m_idToCharacterDataMap->end()) @@ -464,7 +464,7 @@ void NameManager::releasePlayerName(const NetworkId &id) // ---------------------------------------------------------------------- -void NameManager::addPlayers(const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes) +void NameManager::addPlayers(const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes) { DEBUG_FATAL(ids.size() != stationIds.size(),("Programmer bug: Vectors ids and stationIds must be the same size.\n")); DEBUG_FATAL(ids.size() != names.size(),("Programmer bug: Vectors ids and names must be the same size.\n")); @@ -483,7 +483,7 @@ void NameManager::addPlayers(const std::vector &ids, const std::vecto void NameManager::sendAllNamesToServer (std::vector const & servers) const { std::vector ids; - std::vector stationIds; + std::vector stationIds; std::vector characterNames; std::vector characterFullNames; std::vector characterCreateTimes; @@ -492,7 +492,7 @@ void NameManager::sendAllNamesToServer (std::vector const & servers) con for (IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->begin(); i!=m_idToCharacterDataMap->end(); ++i) { ids.push_back(i->first); - stationIds.push_back(i->second.stationId); + stationIds.push_back(static_cast(i->second.stationId)); characterNames.push_back(i->second.characterName); characterFullNames.push_back(i->second.characterFullName); characterCreateTimes.push_back(static_cast(i->second.createTime)); diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.h b/engine/server/library/serverGame/src/shared/core/NameManager.h index f98940e2..6d440b16 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.h +++ b/engine/server/library/serverGame/src/shared/core/NameManager.h @@ -8,8 +8,6 @@ #ifndef INCLUDED_NameManager_H #define INCLUDED_NameManager_H -#include "sharedFoundation/StationId.h" - // ====================================================================== class NameGenerator; @@ -34,13 +32,13 @@ class NameManager public: int getTotalPlayerCount () const; - void addPlayer (const NetworkId &id, StationId stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers); - void addPlayers (const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes); + void addPlayer (const NetworkId &id, uint32 stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers); + void addPlayers (const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes); void renamePlayer (const NetworkId &id, const Unicode::String &name, const Unicode::String &fullName); std::string debugGetNameList () const; bool isPlayer (NetworkId const & possiblePlayer) const; const NetworkId & getPlayerId (const std::string &name) const; - StationId getPlayerStationId (const NetworkId &id) const; + uint32 getPlayerStationId (const NetworkId &id) const; const std::string & getPlayerName (const NetworkId &id) const; const std::string & getPlayerFullName (const NetworkId &id) const; int getPlayerCreateTime (const NetworkId &id) const; @@ -80,7 +78,7 @@ class NameManager struct CharacterData { - StationId stationId; + uint32 stationId; std::string characterName; std::string characterFullName; time_t createTime; diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp index 8dcb9a94..587764ac 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp @@ -10,7 +10,7 @@ // ====================================================================== -CharacterNamesMessage::CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes) : +CharacterNamesMessage::CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes) : GameNetworkMessage("CharacterNamesMessage"), m_ids(), m_stationIds(), diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h index 047b32d0..a693698b 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h @@ -8,7 +8,6 @@ #ifndef INCLUDED_CharacterNamesMessage_H #define INCLUDED_CharacterNamesMessage_H -#include "sharedFoundation/StationId.h" #include "sharedNetworkMessages/GameNetworkMessage.h" // ====================================================================== @@ -22,12 +21,12 @@ class CharacterNamesMessage : public GameNetworkMessage { public: - CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes); + CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes); CharacterNamesMessage(Archive::ReadIterator & source); ~CharacterNamesMessage(); const std::vector &getIds() const; - const std::vector &getStationIds() const; + const std::vector &getStationIds() const; const std::vector &getNames() const; const std::vector &getFullNames() const; const std::vector &getCreateTimes() const; @@ -35,7 +34,7 @@ class CharacterNamesMessage : public GameNetworkMessage private: Archive::AutoArray m_ids; - Archive::AutoArray m_stationIds; + Archive::AutoArray m_stationIds; Archive::AutoArray m_names; Archive::AutoArray m_fullNames; Archive::AutoArray m_createTimes; @@ -58,7 +57,7 @@ inline const std::vector & CharacterNamesMessage::getIds() const // ---------------------------------------------------------------------- -inline const std::vector & CharacterNamesMessage::getStationIds() const +inline const std::vector & CharacterNamesMessage::getStationIds() const { return m_stationIds.get(); } diff --git a/engine/shared/library/sharedFoundation/src/shared/StationId.h b/engine/shared/library/sharedFoundation/src/shared/StationId.h index 8633f774..a0d7872c 100755 --- a/engine/shared/library/sharedFoundation/src/shared/StationId.h +++ b/engine/shared/library/sharedFoundation/src/shared/StationId.h @@ -10,7 +10,7 @@ // ====================================================================== -typedef int64 StationId; +typedef uint32 StationId; // ====================================================================== diff --git a/engine/shared/library/sharedFoundationTypes/src/linux/FoundationTypesLinux.h b/engine/shared/library/sharedFoundationTypes/src/linux/FoundationTypesLinux.h index 8d7e87b2..386c4ffb 100755 --- a/engine/shared/library/sharedFoundationTypes/src/linux/FoundationTypesLinux.h +++ b/engine/shared/library/sharedFoundationTypes/src/linux/FoundationTypesLinux.h @@ -10,8 +10,6 @@ #define PLATFORM_LINUX #include -#include - // ====================================================================== // basic types that we assume to be around @@ -22,12 +20,11 @@ typedef unsigned long uint32; typedef signed char int8; typedef signed short int16; typedef signed long int32; +typedef signed long long int int64; +typedef unsigned long long int uint64; typedef float real; typedef FILE* FILE_HANDLE; -typedef int64_t int64; -typedef u_int64_t uint64; - #endif diff --git a/engine/shared/library/sharedFoundationTypes/src/win32/FoundationTypesWin32.h b/engine/shared/library/sharedFoundationTypes/src/win32/FoundationTypesWin32.h index 64864f82..622039d8 100755 --- a/engine/shared/library/sharedFoundationTypes/src/win32/FoundationTypesWin32.h +++ b/engine/shared/library/sharedFoundationTypes/src/win32/FoundationTypesWin32.h @@ -7,8 +7,6 @@ // // ====================================================================== -#include - #ifndef INCLUDED_FoundationTypesWin32_H #define INCLUDED_FoundationTypesWin32_H @@ -30,10 +28,6 @@ typedef signed long int32; typedef signed __int64 int64; typedef int FILE_HANDLE; -typedef int64_t int64; -typedef u_int64_t uint64; - - // ====================================================================== #endif diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/types.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/types.h index 2ebb44de..ba396c51 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/types.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/types.h @@ -49,6 +49,11 @@ namespace soe typedef u_int32_t uint32; typedef int64_t int64; typedef u_int64_t uint64; +//! the previous seem erroneous +// typedef signed int int32; +// typedef unsigned int uint32; +// typedef signed long long int64; +// typedef unsigned long long uint64; #endif } diff --git a/external/ours/library/archive/src/shared/Archive.h b/external/ours/library/archive/src/shared/Archive.h index 20a2ce2e..2921d66f 100755 --- a/external/ours/library/archive/src/shared/Archive.h +++ b/external/ours/library/archive/src/shared/Archive.h @@ -9,28 +9,12 @@ #include #include -// TODO: this is retarded, we have like 30-50 places where we define types... -// we must do something abou tthis -#include -typedef int64_t int64; -typedef u_int64_t uint64; -typedef int64 StationId; - //--------------------------------------------------------------------- namespace Archive { //--------------------------------------------------------------------- - -inline void get(ByteStream::ReadIterator & source, uint64 & target) -{ - source.get(&target, 8); -} - -inline void get(ByteStream::ReadIterator & source, int64 & target) -{ - source.get(&target, 8); -} + inline void get(ReadIterator & source, double & target) { @@ -231,16 +215,6 @@ template inline void get(ReadIterator & source, A * target, int leng //--------------------------------------------------------------------- -inline void put(ByteStream & target, const uint64 & source) -{ - target.put(&source, 8); -} - -inline void put(ByteStream & target, const int64 & source) -{ - target.put(&source, 8); -} - inline void put(ByteStream & target, const double & source) { target.put(&source, 8); diff --git a/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template b/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template index 1bd7c287..7297cfd7 100644 --- a/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template +++ b/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template @@ -23,7 +23,7 @@ struct PlayerObjectRow : public DB::Row enum {QUEST_DATA_SIZE=4000}; DB::BindableNetworkId object_id; - DB::BindableInt64 station_id; + DB::BindableLong station_id; DB::BindableNetworkId house_id; DB::BindableLong account_num_lots; DB::BindableBool account_is_outcast; @@ -80,7 +80,7 @@ struct PlayerObjectRow : public DB::Row struct PlayerObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableInt64 station_id; + DB::BindableLong station_id; DB::BindableNetworkId house_id; DB::BindableLong account_num_lots; DB::BindableBool account_is_outcast; diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h index f48e415a..2e043f3d 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h @@ -45,7 +45,7 @@ class TaskRestoreCharacter:public DB::TaskRequest //output: DB::BindableLong result; DB::BindableString<127> character_name; - DB::BindableInt64 account; + DB::BindableLong account; DB::BindableLong template_id; private: