diff options
Diffstat (limited to 'src/server/authserver')
| -rwxr-xr-x | src/server/authserver/Main.cpp | 102 | ||||
| -rwxr-xr-x | src/server/authserver/Realms/RealmList.cpp | 4 | ||||
| -rwxr-xr-x | src/server/authserver/Realms/RealmList.h | 5 | ||||
| -rwxr-xr-x | src/server/authserver/Server/AuthSocket.cpp | 88 | ||||
| -rwxr-xr-x | src/server/authserver/Server/RealmSocket.cpp | 2 |
5 files changed, 99 insertions, 102 deletions
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index 7f7d2e39561..9d9dbf1b450 100755 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -88,7 +88,7 @@ class RealmdSignalHandler : public Trinity::SignalHandler /// Print out the usage string for this program on the console. void usage(const char *prog) { - sLog.outString("Usage: \n %s [<options>]\n" + sLog->outString("Usage: \n %s [<options>]\n" " -c config_file use config_file as configuration file\n\r" #ifdef _WIN32 " Running as service functions:\n\r" @@ -102,7 +102,7 @@ void usage(const char *prog) /// Launch the realm server extern int main(int argc, char **argv) { - sLog.SetLogDB(false); + sLog->SetLogDB(false); ///- Command line parsing to get the configuration file name char const* cfg_file = _TRINITY_REALM_CONFIG; int c=1; @@ -112,7 +112,7 @@ extern int main(int argc, char **argv) { if (++c >= argc) { - sLog.outError("Runtime-Error: -c option requires an input argument"); + sLog->outError("Runtime-Error: -c option requires an input argument"); usage(argv[0]); return 1; } @@ -128,25 +128,25 @@ extern int main(int argc, char **argv) { if (++c >= argc) { - sLog.outError("Runtime-Error: -s option requires an input argument"); + sLog->outError("Runtime-Error: -s option requires an input argument"); usage(argv[0]); return 1; } if (strcmp(argv[c],"install") == 0) { if (WinServiceInstall()) - sLog.outString("Installing service"); + sLog->outString("Installing service"); return 1; } else if (strcmp(argv[c],"uninstall") == 0) { if (WinServiceUninstall()) - sLog.outString("Uninstalling service"); + sLog->outString("Uninstalling service"); return 1; } else { - sLog.outError("Runtime-Error: unsupported option %s",argv[c]); + sLog->outError("Runtime-Error: unsupported option %s",argv[c]); usage(argv[0]); return 1; } @@ -160,19 +160,19 @@ extern int main(int argc, char **argv) ++c; } - if (!sConfig.SetSource(cfg_file)) + if (!sConfig->SetSource(cfg_file)) { - sLog.outError("Invalid or missing configuration file : %s", cfg_file); - sLog.outError("Verify that the file exists and has \'[authserver]\' written in the top of the file!"); + sLog->outError("Invalid or missing configuration file : %s", cfg_file); + sLog->outError("Verify that the file exists and has \'[authserver]\' written in the top of the file!"); return 1; } - sLog.Initialize(); + sLog->Initialize(); - sLog.outString("%s (realm-daemon)", _FULLVERSION); - sLog.outString("<Ctrl-C> to stop.\n"); - sLog.outString("Using configuration file %s.", cfg_file); + sLog->outString("%s (realm-daemon)", _FULLVERSION); + sLog->outString("<Ctrl-C> to stop.\n"); + sLog->outString("Using configuration file %s.", cfg_file); - sLog.outDetail("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION)); + sLog->outDetail("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION)); #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL) ACE_Reactor::instance(new ACE_Reactor(new ACE_Dev_Poll_Reactor(ACE::max_handles(), 1), 1), true); @@ -180,20 +180,20 @@ extern int main(int argc, char **argv) ACE_Reactor::instance(new ACE_Reactor(new ACE_TP_Reactor(), true), true); #endif - sLog.outBasic("Max allowed open files is %d", ACE::max_handles()); + sLog->outBasic("Max allowed open files is %d", ACE::max_handles()); /// realmd PID file creation - std::string pidfile = sConfig.GetStringDefault("PidFile", ""); + std::string pidfile = sConfig->GetStringDefault("PidFile", ""); if (!pidfile.empty()) { uint32 pid = CreatePIDFile(pidfile); if (!pid) { - sLog.outError("Cannot create PID file %s.\n", pidfile.c_str()); + sLog->outError("Cannot create PID file %s.\n", pidfile.c_str()); return 1; } - sLog.outString("Daemon PID: %u\n", pid); + sLog->outString("Daemon PID: %u\n", pid); } ///- Initialize the database connection @@ -201,29 +201,29 @@ extern int main(int argc, char **argv) return 1; ///- Initialize the log database - sLog.SetLogDBLater(sConfig.GetBoolDefault("EnableLogDB", false)); // set var to enable DB logging once startup finished. - sLog.SetLogDB(false); - sLog.SetRealmID(0); // ensure we've set realm to 0 (realmd realmid) + sLog->SetLogDBLater(sConfig->GetBoolDefault("EnableLogDB", false)); // set var to enable DB logging once startup finished. + sLog->SetLogDB(false); + sLog->SetRealmID(0); // ensure we've set realm to 0 (realmd realmid) ///- Get the list of realms for the server - sRealmList->Initialize(sConfig.GetIntDefault("RealmsStateUpdateDelay", 20)); + sRealmList->Initialize(sConfig->GetIntDefault("RealmsStateUpdateDelay", 20)); if (sRealmList->size() == 0) { - sLog.outError("No valid realms specified."); + sLog->outError("No valid realms specified."); return 1; } ///- Launch the listening network socket RealmAcceptor acceptor; - uint16 rmport = sConfig.GetIntDefault("RealmServerPort", 3724); - std::string bind_ip = sConfig.GetStringDefault("BindIP", "0.0.0.0"); + uint16 rmport = sConfig->GetIntDefault("RealmServerPort", 3724); + std::string bind_ip = sConfig->GetStringDefault("BindIP", "0.0.0.0"); ACE_INET_Addr bind_addr(rmport, bind_ip.c_str()); if (acceptor.open(bind_addr, ACE_Reactor::instance(), ACE_NONBLOCK) == -1) { - sLog.outError("Trinity realm can not bind to %s:%d", bind_ip.c_str(), rmport); + sLog->outError("Trinity realm can not bind to %s:%d", bind_ip.c_str(), rmport); return 1; } @@ -246,7 +246,7 @@ extern int main(int argc, char **argv) { HANDLE hProcess = GetCurrentProcess(); - uint32 Aff = sConfig.GetIntDefault("UseProcessors", 0); + uint32 Aff = sConfig->GetIntDefault("UseProcessors", 0); if (Aff > 0) { ULONG_PTR appAff; @@ -258,46 +258,46 @@ extern int main(int argc, char **argv) if (!curAff) { - sLog.outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for realmd. Accessible processors bitmask (hex): %x",Aff,appAff); + sLog->outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for realmd. Accessible processors bitmask (hex): %x",Aff,appAff); } else { if (SetProcessAffinityMask(hProcess,curAff)) - sLog.outString("Using processors (bitmask, hex): %x", curAff); + sLog->outString("Using processors (bitmask, hex): %x", curAff); else - sLog.outError("Can't set used processors (hex): %x", curAff); + sLog->outError("Can't set used processors (hex): %x", curAff); } } - sLog.outString(); + sLog->outString(); } - bool Prio = sConfig.GetBoolDefault("ProcessPriority", false); + bool Prio = sConfig->GetBoolDefault("ProcessPriority", false); if (Prio) { if (SetPriorityClass(hProcess,HIGH_PRIORITY_CLASS)) - sLog.outString("TrinityRealm process priority class set to HIGH"); + sLog->outString("TrinityRealm process priority class set to HIGH"); else - sLog.outError("Can't set realmd process priority class."); - sLog.outString(); + sLog->outError("Can't set realmd process priority class."); + sLog->outString(); } } #endif // maximum counter for next ping - uint32 numLoops = (sConfig.GetIntDefault("MaxPingTime", 30) * (MINUTE * 1000000 / 100000)); + uint32 numLoops = (sConfig->GetIntDefault("MaxPingTime", 30) * (MINUTE * 1000000 / 100000)); uint32 loopCounter = 0; // possibly enable db logging; avoid massive startup spam by doing it here. - if (sLog.GetLogDBLater()) + if (sLog->GetLogDBLater()) { - sLog.outString("Enabling database logging..."); - sLog.SetLogDBLater(false); + sLog->outString("Enabling database logging..."); + sLog->SetLogDBLater(false); // login db needs thread for logging - sLog.SetLogDB(true); + sLog->SetLogDB(true); } else - sLog.SetLogDB(false); + sLog->SetLogDB(false); ///- Wait for termination signal while (!stopEvent) @@ -311,7 +311,7 @@ extern int main(int argc, char **argv) if ((++loopCounter) == numLoops) { loopCounter = 0; - sLog.outDetail("Ping MySQL to keep connection alive"); + sLog->outDetail("Ping MySQL to keep connection alive"); LoginDatabase.KeepAlive(); } #ifdef _WIN32 @@ -323,38 +323,38 @@ extern int main(int argc, char **argv) ///- Close the Database Pool LoginDatabase.Close(); - sLog.outString("Halting process..."); + sLog->outString("Halting process..."); return 0; } /// Initialize connection to the database bool StartDB() { - std::string dbstring = sConfig.GetStringDefault("LoginDatabaseInfo", ""); + std::string dbstring = sConfig->GetStringDefault("LoginDatabaseInfo", ""); if (dbstring.empty()) { - sLog.outError("Database not specified"); + sLog->outError("Database not specified"); return false; } - uint8 worker_threads = sConfig.GetIntDefault("LoginDatabase.WorkerThreads", 1); + uint8 worker_threads = sConfig->GetIntDefault("LoginDatabase.WorkerThreads", 1); if (worker_threads < 1 || worker_threads > 32) { - sLog.outError("Improper value specified for LoginDatabase.WorkerThreads, defaulting to 1."); + sLog->outError("Improper value specified for LoginDatabase.WorkerThreads, defaulting to 1."); worker_threads = 1; } - uint8 synch_threads = sConfig.GetIntDefault("LoginDatabase.SynchThreads", 1); + uint8 synch_threads = sConfig->GetIntDefault("LoginDatabase.SynchThreads", 1); if (synch_threads < 1 || synch_threads > 32) { - sLog.outError("Improper value specified for LoginDatabase.SynchThreads, defaulting to 1."); + sLog->outError("Improper value specified for LoginDatabase.SynchThreads, defaulting to 1."); synch_threads = 1; } /// NOTE: While authserver is singlethreaded you should keep synch_threads == 1. Increasing it is just silly since only 1 will be used ever. if (!LoginDatabase.Open(dbstring.c_str(), worker_threads, synch_threads)) { - sLog.outError("Cannot connect to database"); + sLog->outError("Cannot connect to database"); return false; } diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp index 66abaf17aa8..608657c844e 100755 --- a/src/server/authserver/Realms/RealmList.cpp +++ b/src/server/authserver/Realms/RealmList.cpp @@ -74,7 +74,7 @@ void RealmList::UpdateIfNeed() void RealmList::UpdateRealms(bool init) { - sLog.outDetail("Updating Realm List..."); + sLog->outDetail("Updating Realm List..."); PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_GET_REALMLIST); PreparedQueryResult result = LoginDatabase.Query(stmt); @@ -99,7 +99,7 @@ void RealmList::UpdateRealms(bool init) UpdateRealm(realmId, name, address, port, icon, color, timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop, build); if (init) - sLog.outString("Added realm \"%s\".", fields[1].GetCString()); + sLog->outString("Added realm \"%s\".", fields[1].GetCString()); } while (result->NextRow()); } diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h index aa9e47e4877..c5877aa9d61 100755 --- a/src/server/authserver/Realms/RealmList.h +++ b/src/server/authserver/Realms/RealmList.h @@ -45,9 +45,6 @@ struct Realm class RealmList { public: - // Null_Mutex is safe because the singleton initialized before the acceptor initialized(another place where the singleton called) - static RealmList* instance() { return ACE_Singleton<RealmList, ACE_Null_Mutex>::instance(); } - typedef std::map<std::string, Realm> RealmMap; RealmList(); @@ -71,7 +68,7 @@ class RealmList time_t m_NextUpdateTime; }; -#define sRealmList RealmList::instance() +#define sRealmList ACE_Singleton<RealmList, ACE_Null_Mutex>::instance() #endif /// @} diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index e57424a4ee5..55dd9007480 100755 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -211,12 +211,12 @@ AuthSocket::~AuthSocket(void) {} // Accept the connection and set the s random value for SRP6 void AuthSocket::OnAccept(void) { - sLog.outBasic("Accepting connection from '%s'", socket().get_remote_address().c_str()); + sLog->outBasic("Accepting connection from '%s'", socket().get_remote_address().c_str()); } void AuthSocket::OnClose(void) { - sLog.outDebug("AuthSocket::OnClose"); + sLog->outDebug("AuthSocket::OnClose"); } // Read the packet from the client @@ -237,11 +237,11 @@ void AuthSocket::OnRead() (table[i].status == STATUS_CONNECTED || (_authed && table[i].status == STATUS_AUTHED))) { - sLog.outStaticDebug("[Auth] got data for cmd %u recv length %u", (uint32)_cmd, (uint32)socket().recv_len()); + sLog->outStaticDebug("[Auth] got data for cmd %u recv length %u", (uint32)_cmd, (uint32)socket().recv_len()); if (!(*this.*table[i].handler)()) { - sLog.outStaticDebug("Command handler failed for cmd %u recv length %u", (uint32)_cmd, (uint32)socket().recv_len()); + sLog->outStaticDebug("Command handler failed for cmd %u recv length %u", (uint32)_cmd, (uint32)socket().recv_len()); return; } break; @@ -251,7 +251,7 @@ void AuthSocket::OnRead() // Report unknown packets in the error log if (i == AUTH_TOTAL_COMMANDS) { - sLog.outError("[Auth] got unknown packet from '%s'", socket().get_remote_address().c_str()); + sLog->outError("[Auth] got unknown packet from '%s'", socket().get_remote_address().c_str()); socket().shutdown(); return; } @@ -299,7 +299,7 @@ void AuthSocket::_SetVSFields(const std::string& rI) // Logon Challenge command handler bool AuthSocket::_HandleLogonChallenge() { - sLog.outStaticDebug("Entering _HandleLogonChallenge"); + sLog->outStaticDebug("Entering _HandleLogonChallenge"); if (socket().recv_len() < sizeof(sAuthLogonChallenge_C)) return false; @@ -314,7 +314,7 @@ bool AuthSocket::_HandleLogonChallenge() #endif uint16 remaining = ((sAuthLogonChallenge_C *)&buf[0])->size; - sLog.outStaticDebug("[AuthChallenge] got header, body is %#04x bytes", remaining); + sLog->outStaticDebug("[AuthChallenge] got header, body is %#04x bytes", remaining); if ((remaining < sizeof(sAuthLogonChallenge_C) - buf.size()) || (socket().recv_len() < remaining)) return false; @@ -326,8 +326,8 @@ bool AuthSocket::_HandleLogonChallenge() // Read the remaining of the packet socket().recv((char *)&buf[4], remaining); - sLog.outStaticDebug("[AuthChallenge] got full packet, %#04x bytes", ch->size); - sLog.outStaticDebug("[AuthChallenge] name(%d): '%s'", ch->I_len, ch->I); + sLog->outStaticDebug("[AuthChallenge] got full packet, %#04x bytes", ch->size); + sLog->outStaticDebug("[AuthChallenge] name(%d): '%s'", ch->I_len, ch->I); // BigEndian code, nop in little endian case // size already converted @@ -360,7 +360,7 @@ bool AuthSocket::_HandleLogonChallenge() if (result) { pkt << (uint8)WOW_FAIL_BANNED; - sLog.outBasic("[AuthChallenge] Banned ip %s tried to login!", ip_address.c_str()); + sLog->outBasic("[AuthChallenge] Banned ip %s tried to login!", ip_address.c_str()); } else { @@ -378,20 +378,20 @@ bool AuthSocket::_HandleLogonChallenge() bool locked = false; if (fields[2].GetUInt8() == 1) // if ip is locked { - sLog.outStaticDebug("[AuthChallenge] Account '%s' is locked to IP - '%s'", _login.c_str(), fields[3].GetCString()); - sLog.outStaticDebug("[AuthChallenge] Player address is '%s'", ip_address.c_str()); + sLog->outStaticDebug("[AuthChallenge] Account '%s' is locked to IP - '%s'", _login.c_str(), fields[3].GetCString()); + sLog->outStaticDebug("[AuthChallenge] Player address is '%s'", ip_address.c_str()); if (strcmp(fields[3].GetCString(), ip_address.c_str())) { - sLog.outStaticDebug("[AuthChallenge] Account IP differs"); + sLog->outStaticDebug("[AuthChallenge] Account IP differs"); pkt << (uint8) WOW_FAIL_SUSPENDED; locked = true; } else - sLog.outStaticDebug("[AuthChallenge] Account IP matches"); + sLog->outStaticDebug("[AuthChallenge] Account IP matches"); } else - sLog.outStaticDebug("[AuthChallenge] Account '%s' is not locked to ip", _login.c_str()); + sLog->outStaticDebug("[AuthChallenge] Account '%s' is not locked to ip", _login.c_str()); if (!locked) { @@ -407,12 +407,12 @@ bool AuthSocket::_HandleLogonChallenge() if ((*banresult)[0].GetUInt64() == (*banresult)[1].GetUInt64()) { pkt << (uint8)WOW_FAIL_BANNED; - sLog.outBasic("[AuthChallenge] Banned account %s tried to login!", _login.c_str()); + sLog->outBasic("[AuthChallenge] Banned account %s tried to login!", _login.c_str()); } else { pkt << (uint8)WOW_FAIL_SUSPENDED; - sLog.outBasic("[AuthChallenge] Temporarily banned account %s tried to login!", _login.c_str()); + sLog->outBasic("[AuthChallenge] Temporarily banned account %s tried to login!", _login.c_str()); } } else @@ -424,7 +424,7 @@ bool AuthSocket::_HandleLogonChallenge() std::string databaseV = fields[5].GetString(); std::string databaseS = fields[6].GetString(); - sLog.outDebug("database authentication values: v='%s' s='%s'", databaseV.c_str(), databaseS.c_str()); + sLog->outDebug("database authentication values: v='%s' s='%s'", databaseV.c_str(), databaseS.c_str()); // multiply with 2 since bytes are stored as hexstring if (databaseV.size() != s_BYTE_SIZE * 2 || databaseS.size() != s_BYTE_SIZE * 2) @@ -483,7 +483,7 @@ bool AuthSocket::_HandleLogonChallenge() for (int i = 0; i < 4; ++i) _localizationName[i] = ch->country[4-i-1]; - sLog.outBasic("[AuthChallenge] account %s is using '%c%c%c%c' locale (%u)", + sLog->outBasic("[AuthChallenge] account %s is using '%c%c%c%c' locale (%u)", _login.c_str (), ch->country[3], ch->country[2], ch->country[1], ch->country[0], GetLocaleByName(_localizationName) ); } @@ -500,7 +500,7 @@ bool AuthSocket::_HandleLogonChallenge() // Logon Proof command handler bool AuthSocket::_HandleLogonProof() { - sLog.outStaticDebug("Entering _HandleLogonProof"); + sLog->outStaticDebug("Entering _HandleLogonProof"); // Read the packet sAuthLogonProof_C lp; @@ -511,7 +511,7 @@ bool AuthSocket::_HandleLogonProof() if (_expversion == NO_VALID_EXP_FLAG) { // Check if we have the appropriate patch on the disk - sLog.outDebug("Client with invalid version, patching is not implemented"); + sLog->outDebug("Client with invalid version, patching is not implemented"); socket().shutdown(); return true; } @@ -595,7 +595,7 @@ bool AuthSocket::_HandleLogonProof() // Check if SRP6 results match (password is correct), else send an error if (!memcmp(M.AsByteArray(), lp.M1, 20)) { - sLog.outBasic("User '%s' successfully authenticated", _login.c_str()); + sLog->outBasic("User '%s' successfully authenticated", _login.c_str()); // Update the sessionkey, last_ip, last login time and reset number of failed logins in the account table for this account // No SQL injection (escaped user name) and IP address as received by socket @@ -643,9 +643,9 @@ bool AuthSocket::_HandleLogonProof() char data[4]= { AUTH_LOGON_PROOF, WOW_FAIL_UNKNOWN_ACCOUNT, 3, 0}; socket().send(data, sizeof(data)); - sLog.outBasic("[AuthChallenge] account %s tried to login with wrong password!",_login.c_str ()); + sLog->outBasic("[AuthChallenge] account %s tried to login with wrong password!",_login.c_str ()); - uint32 MaxWrongPassCount = sConfig.GetIntDefault("WrongPass.MaxCount", 0); + uint32 MaxWrongPassCount = sConfig->GetIntDefault("WrongPass.MaxCount", 0); if (MaxWrongPassCount > 0) { //Increment number of failed logins by one and if it reaches the limit temporarily ban that account or IP @@ -662,8 +662,8 @@ bool AuthSocket::_HandleLogonProof() if (failed_logins >= MaxWrongPassCount) { - uint32 WrongPassBanTime = sConfig.GetIntDefault("WrongPass.BanTime", 600); - bool WrongPassBanType = sConfig.GetBoolDefault("WrongPass.BanType", false); + uint32 WrongPassBanTime = sConfig->GetIntDefault("WrongPass.BanTime", 600); + bool WrongPassBanType = sConfig->GetBoolDefault("WrongPass.BanType", false); if (WrongPassBanType) { @@ -673,7 +673,7 @@ bool AuthSocket::_HandleLogonProof() stmt->setUInt32(1, WrongPassBanTime); LoginDatabase.Execute(stmt); - sLog.outBasic("[AuthChallenge] account %s got banned for '%u' seconds because it failed to authenticate '%u' times", + sLog->outBasic("[AuthChallenge] account %s got banned for '%u' seconds because it failed to authenticate '%u' times", _login.c_str(), WrongPassBanTime, failed_logins); } else @@ -683,7 +683,7 @@ bool AuthSocket::_HandleLogonProof() stmt->setUInt32(1, WrongPassBanTime); LoginDatabase.Execute(stmt); - sLog.outBasic("[AuthChallenge] IP %s got banned for '%u' seconds because account %s failed to authenticate '%u' times", + sLog->outBasic("[AuthChallenge] IP %s got banned for '%u' seconds because account %s failed to authenticate '%u' times", socket().get_remote_address().c_str(), WrongPassBanTime, _login.c_str(), failed_logins); } } @@ -697,7 +697,7 @@ bool AuthSocket::_HandleLogonProof() // Reconnect Challenge command handler bool AuthSocket::_HandleReconnectChallenge() { - sLog.outStaticDebug("Entering _HandleReconnectChallenge"); + sLog->outStaticDebug("Entering _HandleReconnectChallenge"); if (socket().recv_len() < sizeof(sAuthLogonChallenge_C)) return false; @@ -712,7 +712,7 @@ bool AuthSocket::_HandleReconnectChallenge() #endif uint16 remaining = ((sAuthLogonChallenge_C *)&buf[0])->size; - sLog.outStaticDebug("[ReconnectChallenge] got header, body is %#04x bytes", remaining); + sLog->outStaticDebug("[ReconnectChallenge] got header, body is %#04x bytes", remaining); if ((remaining < sizeof(sAuthLogonChallenge_C) - buf.size()) || (socket().recv_len() < remaining)) return false; @@ -724,8 +724,8 @@ bool AuthSocket::_HandleReconnectChallenge() // Read the remaining of the packet socket().recv((char *)&buf[4], remaining); - sLog.outStaticDebug("[ReconnectChallenge] got full packet, %#04x bytes", ch->size); - sLog.outStaticDebug("[ReconnectChallenge] name(%d): '%s'", ch->I_len, ch->I); + sLog->outStaticDebug("[ReconnectChallenge] got full packet, %#04x bytes", ch->size); + sLog->outStaticDebug("[ReconnectChallenge] name(%d): '%s'", ch->I_len, ch->I); _login = (const char*)ch->I; @@ -736,7 +736,7 @@ bool AuthSocket::_HandleReconnectChallenge() // Stop if the account is not found if (!result) { - sLog.outError("[ERROR] user %s tried to login and we cannot find his session key in the database.", _login.c_str()); + sLog->outError("[ERROR] user %s tried to login and we cannot find his session key in the database.", _login.c_str()); socket().shutdown(); return false; } @@ -765,7 +765,7 @@ bool AuthSocket::_HandleReconnectChallenge() // Reconnect Proof command handler bool AuthSocket::_HandleReconnectProof() { - sLog.outStaticDebug("Entering _HandleReconnectProof"); + sLog->outStaticDebug("Entering _HandleReconnectProof"); // Read the packet sAuthReconnectProof_C lp; if (!socket().recv((char *)&lp, sizeof(sAuthReconnectProof_C))) @@ -796,7 +796,7 @@ bool AuthSocket::_HandleReconnectProof() } else { - sLog.outError("[ERROR] user %s tried to login, but session invalid.", _login.c_str()); + sLog->outError("[ERROR] user %s tried to login, but session invalid.", _login.c_str()); socket().shutdown(); return false; } @@ -805,7 +805,7 @@ bool AuthSocket::_HandleReconnectProof() // Realm List command handler bool AuthSocket::_HandleRealmList() { - sLog.outStaticDebug("Entering _HandleRealmList"); + sLog->outStaticDebug("Entering _HandleRealmList"); if (socket().recv_len() < 5) return false; @@ -818,7 +818,7 @@ bool AuthSocket::_HandleRealmList() PreparedQueryResult result = LoginDatabase.Query(stmt); if (!result) { - sLog.outError("[ERROR] user %s tried to login and we cannot find him in the database.", _login.c_str()); + sLog->outError("[ERROR] user %s tried to login and we cannot find him in the database.", _login.c_str()); socket().shutdown(); return false; } @@ -905,11 +905,11 @@ bool AuthSocket::_HandleRealmList() // Resume patch transfer bool AuthSocket::_HandleXferResume() { - sLog.outStaticDebug("Entering _HandleXferResume"); + sLog->outStaticDebug("Entering _HandleXferResume"); // Check packet length and patch existence if (socket().recv_len() < 9 || !pPatch) { - sLog.outError("Error while resuming patch transfer (wrong packet)"); + sLog->outError("Error while resuming patch transfer (wrong packet)"); return false; } @@ -926,7 +926,7 @@ bool AuthSocket::_HandleXferResume() // Cancel patch transfer bool AuthSocket::_HandleXferCancel() { - sLog.outStaticDebug("Entering _HandleXferCancel"); + sLog->outStaticDebug("Entering _HandleXferCancel"); // Close and delete the socket socket().recv_skip(1); //clear input buffer @@ -938,12 +938,12 @@ bool AuthSocket::_HandleXferCancel() // Accept patch transfer bool AuthSocket::_HandleXferAccept() { - sLog.outStaticDebug("Entering _HandleXferAccept"); + sLog->outStaticDebug("Entering _HandleXferAccept"); // Check packet length and patch existence if (!pPatch) { - sLog.outError("Error while accepting patch transfer (wrong packet)"); + sLog->outError("Error while accepting patch transfer (wrong packet)"); return false; } @@ -1026,11 +1026,11 @@ void Patcher::LoadPatchMD5(char *szFileName) std::string path = "./patches/"; path += szFileName; FILE *pPatch = fopen(path.c_str(), "rb"); - sLog.outDebug("Loading patch info from %s\n", path.c_str()); + sLog->outDebug("Loading patch info from %s\n", path.c_str()); if (!pPatch) { - sLog.outError("Error loading patch %s\n", path.c_str()); + sLog->outError("Error loading patch %s\n", path.c_str()); return; } diff --git a/src/server/authserver/Server/RealmSocket.cpp b/src/server/authserver/Server/RealmSocket.cpp index 6e32960261f..aad52643392 100755 --- a/src/server/authserver/Server/RealmSocket.cpp +++ b/src/server/authserver/Server/RealmSocket.cpp @@ -73,7 +73,7 @@ int RealmSocket::open(void * arg) if (peer ().get_remote_addr (addr) == -1) { - sLog.outError ("RealmSocket::open: peer ().get_remote_addr errno = %s", ACE_OS::strerror (errno)); + sLog->outError ("RealmSocket::open: peer ().get_remote_addr errno = %s", ACE_OS::strerror (errno)); return -1; } |