Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-12 19:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1219 from DarkflameUniverse/lol

Browse Source 
fix: Address race condition
This commit is contained in:
Gie "Max" Vanommeslaeghe 2023-10-19 12:25:27 +02:00 committed by GitHub
commit 4c507e34a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dMasterServer/MasterServer.cpp
View File

@ -116,7 +116,7 @@ int main(int argc, char** argv) {
uint32_t clientNetVersion = 0; uint32_t clientNetVersion = 0;
if (!GeneralUtils::TryParse(Game::config->GetValue("client_net_version"), clientNetVersion)) { if (!GeneralUtils::TryParse(Game::config->GetValue("client_net_version"), clientNetVersion)) {
Game::logger->Log("MasterServer", "Failed to parse (%s) as net version. Cannot start server as no clients could connect.",Game::config->GetValue("client_net_version").c_str()); Game::logger->Log("MasterServer", "Failed to parse (%s) as net version. Cannot start server as no clients could connect.", Game::config->GetValue("client_net_version").c_str());
Game::logger->Log("MasterServer", "As of version 1.1.1, client_net_version is required to be defined in sharedconfig.ini as opposed to in CMakeVariables.txt as NET_VERSION."); Game::logger->Log("MasterServer", "As of version 1.1.1, client_net_version is required to be defined in sharedconfig.ini as opposed to in CMakeVariables.txt as NET_VERSION.");
Game::logger->Log("MasterServer", "Rerun cmake to ensure all config values exist. If client_net_version already exists in sharedconfig.ini, please ensure it is a valid number."); Game::logger->Log("MasterServer", "Rerun cmake to ensure all config values exist. If client_net_version already exists in sharedconfig.ini, please ensure it is a valid number.");
Game::logger->Log("MasterServer", "like 171022"); Game::logger->Log("MasterServer", "like 171022");
@ -234,21 +234,21 @@ int main(int argc, char** argv) {
std::cout << "Do you want to change the password of that account? [y/n]?"; std::cout << "Do you want to change the password of that account? [y/n]?";
std::string prompt = ""; std::string prompt = "";
std::cin >> prompt; std::cin >> prompt;
if (prompt == "y" || prompt == "yes"){ if (prompt == "y" || prompt == "yes") {
uint32_t accountId = 0; uint32_t accountId = 0;
res->next(); res->next();
accountId = res->getUInt(1); accountId = res->getUInt(1);
if (accountId == 0) return EXIT_FAILURE; if (accountId == 0) return EXIT_FAILURE;
//Read the password from the console without echoing it. //Read the password from the console without echoing it.
#ifdef __linux__ #ifdef __linux__
//This function is obsolete, but it only meant to be used by the //This function is obsolete, but it only meant to be used by the
//sysadmin to create their first account. //sysadmin to create their first account.
password = getpass("Enter a password: "); password = getpass("Enter a password: ");
#else #else
std::cout << "Enter a password: "; std::cout << "Enter a password: ";
std::cin >> password; std::cin >> password;
#endif #endif
// Regenerate hash based on new password // Regenerate hash based on new password
char salt[BCRYPT_HASHSIZE]; char salt[BCRYPT_HASHSIZE];
@ -271,14 +271,14 @@ int main(int argc, char** argv) {
} }
//Read the password from the console without echoing it. //Read the password from the console without echoing it.
#ifdef __linux__ #ifdef __linux__
//This function is obsolete, but it only meant to be used by the //This function is obsolete, but it only meant to be used by the
//sysadmin to create their first account. //sysadmin to create their first account.
password = getpass("Enter a password: "); password = getpass("Enter a password: ");
#else #else
std::cout << "Enter a password: "; std::cout << "Enter a password: ";
std::cin >> password; std::cin >> password;
#endif #endif
//Generate new hash for bcrypt //Generate new hash for bcrypt
char salt[BCRYPT_HASHSIZE]; char salt[BCRYPT_HASHSIZE];
@ -295,8 +295,8 @@ int main(int argc, char** argv) {
statement->setString(2, std::string(hash, BCRYPT_HASHSIZE).c_str()); statement->setString(2, std::string(hash, BCRYPT_HASHSIZE).c_str());
statement->setInt(3, 9); statement->setInt(3, 9);
statement->execute(); statement->execute();
} catch(sql::SQLException& e) { } catch (sql::SQLException& e) {
Game::logger->Log("MasterServer", "A SQL error occurred!:\n %s", e.what()); Game::logger->Log("MasterServer", "A SQL error occurred!:\n %s", e.what());
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -581,20 +581,22 @@ void HandlePacket(Packet* packet) {
inStream.Read(theirServerType); inStream.Read(theirServerType);
theirIP = PacketUtils::ReadString(24, packet, false); //24 is the current offset theirIP = PacketUtils::ReadString(24, packet, false); //24 is the current offset
if (theirServerType == ServerType::World && !Game::im->IsPortInUse(theirPort)) { if (theirServerType == ServerType::World) {
Instance* in = new Instance(theirIP, theirPort, theirZoneID, theirInstanceID, 0, 12, 12); if (!Game::im->IsPortInUse(theirPort)) {
Instance* in = new Instance(theirIP, theirPort, theirZoneID, theirInstanceID, 0, 12, 12);
SystemAddress copy; SystemAddress copy;
copy.binaryAddress = packet->systemAddress.binaryAddress; copy.binaryAddress = packet->systemAddress.binaryAddress;
copy.port = packet->systemAddress.port; copy.port = packet->systemAddress.port;
in->SetSysAddr(copy); in->SetSysAddr(copy);
Game::im->AddInstance(in); Game::im->AddInstance(in);
} else { } else {
auto instance = Game::im->FindInstance( auto instance = Game::im->FindInstance(
theirZoneID, static_cast<uint16_t>(theirInstanceID)); theirZoneID, static_cast<uint16_t>(theirInstanceID));
if (instance) { if (instance) {
instance->SetSysAddr(packet->systemAddress); instance->SetSysAddr(packet->systemAddress);
}
} }
} }