Changeset 74

Timestamp:

11/19/08 13:31:47 (17 years ago)

Author:

yumileroy

Message:

[svn] * Fixed compile from r78
* Fixed: not apply healling bonus to spell 40972 heal amount. - Source Mangos
* Item 30627 hidden cooldown - Source Mangos
* Fixed Trinityrealm autopatching system - Source Arrai
* Add support for autoconf 2.6.2 and newer - Source Derex
Some decent sized changes, please test before deploying - KP

Original author: KingPin?
Date: 2008-10-19 21:08:34-05:00

Location:

trunk

Files:

• sql/characters.sql (modified) (1 diff)
• sql/updates/79_characters.sql (added)
• sql/updates/79_world.sql (added)
• src/game/CharacterHandler.cpp (modified) (1 diff)
• src/game/Player.cpp (modified) (7 diffs)
• src/game/SpellAuras.cpp (modified) (1 diff)
• src/game/Unit.cpp (modified) (1 diff)
• src/game/WorldSocketMgr.cpp (modified) (1 diff)
• src/trinityrealm/AuthSocket.cpp (modified) (12 diffs)
• src/trinityrealm/AuthSocket.h (modified) (3 diffs)
• win/VC71/framework.vcproj (modified) (2 diffs)
• win/VC80/framework.vcproj (modified) (4 diffs)
• win/VC90/framework.vcproj (modified) (4 diffs)

trunk/sql/characters.sql

@@ -609 +609 @@
   `trans_o` float NOT NULL default '0',
   `transguid` bigint(20) unsigned NOT NULL default '0',
-  `gmstate` tinyint(3) unsigned NOT NULL default '0',
+  `extra_flags` tinyint(3) unsigned NOT NULL default '0',
   `stable_slots` tinyint(1) unsigned NOT NULL default '0',
   `at_login` int(11) unsigned NOT NULL default '0',

trunk/src/game/CharacterHandler.cpp

@@ -62 +62 @@
     // NOTE: all fields in `characters` must be read to prevent lost character data at next save in case wrong DB structure.
     // !!! NOTE: including unused `zone`,`online`
-    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADFROM,            "SELECT guid, account, data, name, race, class, position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, gmstate, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty FROM characters WHERE guid = '%u'", GUID_LOPART(m_guid));
+    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADFROM,            "SELECT guid, account, data, name, race, class, position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty FROM characters WHERE guid = '%u'", GUID_LOPART(m_guid));
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADGROUP,           "SELECT leaderGuid FROM group_member WHERE memberGuid ='%u'", GUID_LOPART(m_guid));
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES,  "SELECT id, permanent, map, difficulty, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = '%u'", GUID_LOPART(m_guid));

trunk/src/game/Player.cpp

@@ -13665 +13665 @@
 {
     ////                                                     0     1        2     3     4     5      6           7           8           9    10           11        12         13         14         15          16           17                 18                 19                 20       21       22       23       24         25       26            27        [28]  [29]    30                 31         32
-    //QueryResult *result = CharacterDatabase.PQuery("SELECT guid, account, data, name, race, class, position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, gmstate, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty FROM characters WHERE guid = '%u'", guid);
+    //QueryResult *result = CharacterDatabase.PQuery("SELECT guid, account, data, name, race, class, position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extraflags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty FROM characters WHERE guid = '%u'", guid);
     QueryResult *result = holder->GetResult(PLAYER_LOGIN_QUERY_LOADFROM);
 
@@ -13900 +13900 @@
     m_taxi.LoadTaxiMask( fields[11].GetString() );          // must be before InitTaxiNodesForLevel
 
-    uint32 gmstate = fields[25].GetUInt32();
+    uint32 extraflags = fields[25].GetUInt32();
 
     m_stableSlots = fields[26].GetUInt32();
@@ -14090 +14090 @@
             case 1: SetGameMaster(true); break;             // enable
             case 2:                                         // save state
-                if(gmstate & PLAYER_EXTRA_GM_ON)
+                if(extraflags & PLAYER_EXTRA_GM_ON)
                     SetGameMaster(true);
                 break;
@@ -14101 +14101 @@
             case 1: SetAcceptTicket(true); break;           // enable
             case 2:                                         // save state
-            if(gmstate & PLAYER_EXTRA_GM_ACCEPT_TICKETS)
+            if(extraflags & PLAYER_EXTRA_GM_ACCEPT_TICKETS)
                 SetAcceptTicket(true);
             break;
@@ -14112 +14112 @@
             case 1: SetGMChat(true); break;                 // enable
             case 2:                                         // save state
-                if(gmstate & PLAYER_EXTRA_GM_CHAT)
+                if(extraflags & PLAYER_EXTRA_GM_CHAT)
                     SetGMChat(true);
                 break;
@@ -14123 +14123 @@
             case 1: SetAcceptWhispers(true); break;         // enable
             case 2:                                         // save state
-                if(gmstate & PLAYER_EXTRA_ACCEPT_WHISPERS)
+                if(extraflags & PLAYER_EXTRA_ACCEPT_WHISPERS)
                     SetAcceptWhispers(true);
                 break;
@@ -15110 +15110 @@
         "taximask, online, cinematic, "
         "totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, "
-        "trans_x, trans_y, trans_z, trans_o, transguid, gmstate, stable_slots, at_login, zone, "
+        "trans_x, trans_y, trans_z, trans_o, transguid, extraflags, stable_slots, at_login, zone, "
         "death_expire_time, taxi_path) VALUES ("
         << GetGUIDLow() << ", "

trunk/src/game/SpellAuras.cpp

@@ -1954 +1954 @@
                 if(caster->GetTypeId() == TYPEID_PLAYER)
                 {
-                    ((Player*)caster)->PlaySound(11965, false);
+                    ((Player*)caster)->SendPlaySound(11965, false);
                 }
                 return;

trunk/src/game/Unit.cpp

@@ -7765 +7765 @@
 
     // These Spells are doing fixed amount of healing (TODO found less hack-like check)
-    if(spellProto->Id == 15290 || spellProto->Id == 39373 || spellProto->Id == 33778 || spellProto->Id == 379 || spellProto->Id == 38395)
+    if (spellProto->Id == 15290 || spellProto->Id == 39373 ||
+        spellProto->Id == 33778 || spellProto->Id == 379   ||
+        spellProto->Id == 38395 || spellProto->Id == 40972)
         return healamount;
 

trunk/src/game/WorldSocketMgr.cpp

@@ -363 +363 @@
   return m_NetThreads[min].AddSocket (sock);
 
-  return 0;
 }
 

trunk/src/trinityrealm/AuthSocket.cpp

@@ -138 +138 @@
     uint8 cmd;                                              // XFER_INITIATE
     uint8 fileNameLen;                                      // strlen(fileName);
-    uint8 fileName[1];                                      // fileName[fileNameLen]
+    uint8 fileName[5];                                      // fileName[fileNameLen]
     uint64 file_size;                                       // file size (bytes)
     uint8 md5[MD5_DIGEST_LENGTH];                           // MD5
@@ -218 +218 @@
     g.SetDword(7);
     _authed = false;
-    pPatch=NULL;
+    pPatch = NULL;
 
     _accountSecurityLevel = SEC_PLAYER;
@@ -226 +226 @@
 AuthSocket::~AuthSocket()
 {
+    ZThread::Guard<ZThread::Mutex> g(patcherLock);
     if(pPatch)
         fclose(pPatch);
@@ -361 +362 @@
 
     _login = (const char*)ch->I;
+    _build = ch->build;
 
     ///- Normalize account name
@@ -370 +372 @@
     dbRealmServer.escape_string(_safelogin);
 
+    pkt << (uint8) AUTH_LOGON_CHALLENGE;
+    pkt << (uint8) 0x00;
+
+    ///- Verify that this IP is not in the ip_banned table
+    // No SQL injection possible (paste the IP address as passed by the socket)
+    dbRealmServer.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
+
+    std::string address = GetRemoteAddress();
+    dbRealmServer.escape_string(address);
+    QueryResult *result = dbRealmServer.PQuery(  "SELECT * FROM ip_banned WHERE ip = '%s'",address.c_str());
+    if(result)
+    {
+        pkt << (uint8)REALM_AUTH_ACCOUNT_BANNED;
+        sLog.outBasic("[AuthChallenge] Banned ip %s tries to login!",GetRemoteAddress().c_str ());
+        delete result;
+    }
+    else
+    {
+        ///- Get the account details from the account table
+        // No SQL injection (escaped user name)
+
+        result = dbRealmServer.PQuery("SELECT sha_pass_hash,id,locked,last_ip,gmlevel FROM account WHERE username = '%s'",_safelogin.c_str ());
+        if( result )
+        {
+            ///- If the IP is 'locked', check that the player comes indeed from the correct IP address
+            bool locked = false;
+            if((*result)[2].GetUInt8() == 1)            // if ip is locked
+            {
+                DEBUG_LOG("[AuthChallenge] Account '%s' is locked to IP - '%s'", _login.c_str(), (*result)[3].GetString());
+                DEBUG_LOG("[AuthChallenge] Player address is '%s'", GetRemoteAddress().c_str());
+                if ( strcmp((*result)[3].GetString(),GetRemoteAddress().c_str()) )
+                {
+                    DEBUG_LOG("[AuthChallenge] Account IP differs");
+                    pkt << (uint8) REALM_AUTH_ACCOUNT_FREEZED;
+                    locked=true;
+                }
+                else
+                {
+                    DEBUG_LOG("[AuthChallenge] Account IP matches");
+                }
+            }
+            else
+            {
+                DEBUG_LOG("[AuthChallenge] Account '%s' is not locked to ip", _login.c_str());
+            }
+
+            if (!locked)
+            {
+                //set expired bans to inactive
+                dbRealmServer.Execute("UPDATE account_banned SET active = 0 WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
+                ///- If the account is banned, reject the logon attempt
+                QueryResult *banresult = dbRealmServer.PQuery("SELECT bandate,unbandate FROM account_banned WHERE id = %u AND active = 1", (*result)[1].GetUInt32());
+                if(banresult)
+                {
+                    if((*banresult)[0].GetUInt64() == (*banresult)[1].GetUInt64())
+                    {
+                        pkt << (uint8) REALM_AUTH_ACCOUNT_BANNED;
+                        sLog.outBasic("[AuthChallenge] Banned account %s tries to login!",_login.c_str ());
+                    }
+                    else
+                    {
+                        pkt << (uint8) REALM_AUTH_ACCOUNT_FREEZED;
+                        sLog.outBasic("[AuthChallenge] Temporarily banned account %s tries to login!",_login.c_str ());
+                    }
+
+                    delete banresult;
+                }
+                else
+                {
+                    ///- Get the password from the account table, upper it, and make the SRP6 calculation
+                    std::string rI = (*result)[0].GetCppString();
+                    _SetVSFields(rI);
+
+                    b.SetRand(19 * 8);
+                    BigNumber gmod=g.ModExp(b, N);
+                    B = ((v * 3) + gmod) % N;
+
+                    ASSERT(gmod.GetNumBytes() <= 32);
+
+                    BigNumber unk3;
+                    unk3.SetRand(16*8);
+
+                    ///- Fill the response packet with the result
+                    pkt << (uint8)REALM_AUTH_SUCCESS;
+
+                    // B may be calculated < 32B so we force minnimal length to 32B
+                    pkt.append(B.AsByteArray(32), 32);   // 32 bytes
+                    pkt << (uint8)1;
+                    pkt.append(g.AsByteArray(), 1);
+                    pkt << (uint8)32;
+                    pkt.append(N.AsByteArray(), 32);
+                    pkt.append(s.AsByteArray(), s.GetNumBytes());   // 32 bytes
+                    pkt.append(unk3.AsByteArray(), 16);
+                    pkt << (uint8)0;                    // Added in 1.12.x client branch
+
+                    uint8 secLevel = (*result)[4].GetUInt8();
+                    _accountSecurityLevel = secLevel <= SEC_ADMINISTRATOR ? AccountTypes(secLevel) : SEC_ADMINISTRATOR;
+
+                    _localizationName.resize(4);
+                    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)", _login.c_str (), ch->country[3],ch->country[2],ch->country[1],ch->country[0], GetLocaleByName(_localizationName));
+                }
+            }
+            delete result;
+        }
+        else                                            //no account
+        {
+            pkt<< (uint8) REALM_AUTH_NO_MATCH;
+        }
+    }
+    SendBuf((char const*)pkt.contents(), pkt.size());
+    return true;
+}
+
+/// Logon Proof command handler
+bool AuthSocket::_HandleLogonProof()
+{
+    DEBUG_LOG("Entering _HandleLogonProof");
+    ///- Read the packet
+    if (ibuf.GetLength() < sizeof(sAuthLogonProof_C))
+        return false;
+    sAuthLogonProof_C lp;
+    ibuf.Read((char *)&lp, sizeof(sAuthLogonProof_C));
+
     ///- Check if the client has one of the expected version numbers
     bool valid_version=false;
     int accepted_versions[]=EXPECTED_TRINITY_CLIENT_BUILD;
     for(int i=0;accepted_versions[i];i++)
-        if(ch->build==accepted_versions[i])
-    {
-        valid_version=true;
-        break;
-    }
-
-    /// <ul><li> if this is a valid version
-    if(valid_version)
-    {
-        pkt << (uint8) AUTH_LOGON_CHALLENGE;
-        pkt << (uint8) 0x00;
-
-        ///- Verify that this IP is not in the ip_banned table
-        // No SQL injection possible (paste the IP address as passed by the socket)
-        dbRealmServer.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
-
-        std::string address = GetRemoteAddress();
-        dbRealmServer.escape_string(address);
-        QueryResult *result = dbRealmServer.PQuery(  "SELECT * FROM ip_banned WHERE ip = '%s'",address.c_str());
-        if(result)
-        {
-            pkt << (uint8)REALM_AUTH_ACCOUNT_BANNED;
-            sLog.outBasic("[AuthChallenge] Banned ip %s tries to login!",GetRemoteAddress().c_str ());
-            delete result;
-        }
-        else
-        {
-            ///- Get the account details from the account table
-            // No SQL injection (escaped user name)
-
-            result = dbRealmServer.PQuery("SELECT sha_pass_hash,id,locked,last_ip,gmlevel FROM account WHERE username = '%s'",_safelogin.c_str ());
-            if( result )
-            {
-                ///- If the IP is 'locked', check that the player comes indeed from the correct IP address
-                bool locked = false;
-                if((*result)[2].GetUInt8() == 1)            // if ip is locked
-                {
-                    DEBUG_LOG("[AuthChallenge] Account '%s' is locked to IP - '%s'", _login.c_str(), (*result)[3].GetString());
-                    DEBUG_LOG("[AuthChallenge] Player address is '%s'", GetRemoteAddress().c_str());
-                    if ( strcmp((*result)[3].GetString(),GetRemoteAddress().c_str()) )
-                    {
-                        DEBUG_LOG("[AuthChallenge] Account IP differs");
-                        pkt << (uint8) REALM_AUTH_ACCOUNT_FREEZED;
-                        locked=true;
-                    }
-                    else
-                    {
-                        DEBUG_LOG("[AuthChallenge] Account IP matches");
-                    }
-                }
-                else
-                {
-                    DEBUG_LOG("[AuthChallenge] Account '%s' is not locked to ip", _login.c_str());
-                }
-
-                if (!locked)
-                {
-                    //set expired bans to inactive
-                    dbRealmServer.Execute("UPDATE account_banned SET active = 0 WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
-                    ///- If the account is banned, reject the logon attempt
-                    QueryResult *banresult = dbRealmServer.PQuery("SELECT bandate,unbandate FROM account_banned WHERE id = %u AND active = 1", (*result)[1].GetUInt32());
-                    if(banresult)
-                    {
-                        if((*banresult)[0].GetUInt64() == (*banresult)[1].GetUInt64())
-                        {
-                            pkt << (uint8) REALM_AUTH_ACCOUNT_BANNED;
-                            sLog.outBasic("[AuthChallenge] Banned account %s tries to login!",_login.c_str ());
-                        }
-                        else
-                        {
-                            pkt << (uint8) REALM_AUTH_ACCOUNT_FREEZED;
-                            sLog.outBasic("[AuthChallenge] Temporarily banned account %s tries to login!",_login.c_str ());
-                        }
-
-                        delete banresult;
-                    }
-                    else
-                    {
-                        ///- Get the password from the account table, upper it, and make the SRP6 calculation
-                        std::string rI = (*result)[0].GetCppString();
-                        _SetVSFields(rI);
-
-                        b.SetRand(19 * 8);
-                        BigNumber gmod=g.ModExp(b, N);
-                        B = ((v * 3) + gmod) % N;
-
-                        ASSERT(gmod.GetNumBytes() <= 32);
-
-                        BigNumber unk3;
-                        unk3.SetRand(16*8);
-
-                        ///- Fill the response packet with the result
-                        pkt << (uint8)REALM_AUTH_SUCCESS;
-
-                        // B may be calculated < 32B so we force minnimal length to 32B
-                        pkt.append(B.AsByteArray(32), 32);   // 32 bytes
-                        pkt << (uint8)1;
-                        pkt.append(g.AsByteArray(), 1);
-                        pkt << (uint8)32;
-                        pkt.append(N.AsByteArray(), 32);
-                        pkt.append(s.AsByteArray(), s.GetNumBytes());   // 32 bytes
-                        pkt.append(unk3.AsByteArray(), 16);
-                        pkt << (uint8)0;                    // Added in 1.12.x client branch
-
-                        uint8 secLevel = (*result)[4].GetUInt8();
-                        _accountSecurityLevel = secLevel <= SEC_ADMINISTRATOR ? AccountTypes(secLevel) : SEC_ADMINISTRATOR;
-
-                        std::string localeName;
-                        localeName.resize(4);
-                        for(int i = 0; i <4; ++i)
-                            localeName[i] = ch->country[4-i-1];
-
-                        _localization = GetLocaleByName(localeName);
-
-                        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], _localization);
-                    }
-                }
-                delete result;
-            }
-            else                                            //no account
-            {
-                pkt<< (uint8) REALM_AUTH_NO_MATCH;
-            }
-        }
-    }                                                       //valid version
-    else
-        ///<li> else
+    {
+        if(_build==accepted_versions[i])
+        {
+            valid_version=true;
+            break;
+        }
+    }
+
+    /// <ul><li> If the client has no valid version
+    if(!valid_version)
     {
         ///- Check if we have the apropriate patch on the disk
-        char tmp[64];
+
+        // 24 = len("./patches/65535enGB.mpq")+1
+        char tmp[24];
         // No buffer overflow (fixed length of arguments)
-        sprintf(tmp,"./patches/%d%c%c%c%c.mpq",ch->build,ch->country[3],
-            ch->country[2],ch->country[1],ch->country[0]);
+        sprintf(tmp,"./patches/%d%s.mpq",_build, _localizationName.c_str());
         // This will be closed at the destruction of the AuthSocket (client deconnection)
         FILE *pFile=fopen(tmp,"rb");
+
         if(!pFile)
         {
+            ByteBuffer pkt;
             pkt << (uint8) AUTH_LOGON_CHALLENGE;
             pkt << (uint8) 0x00;
             pkt << (uint8) REALM_AUTH_WRONG_BUILD_NUMBER;
-            DEBUG_LOG("[AuthChallenge] %u is not a valid client version!", ch->build);
+            DEBUG_LOG("[AuthChallenge] %u is not a valid client version!", _build);
             DEBUG_LOG("[AuthChallenge] Patch %s not found",tmp);
-        }else
-        {                                                   //have patch
+            SendBuf((char const*)pkt.contents(), pkt.size());
+            return true;
+        }
+        else                                                // have patch
+        {
             pPatch=pFile;
             XFER_INIT xferh;
@@ -547 +564 @@
     }
     /// </ul>
-    SendBuf((char const*)pkt.contents(), pkt.size());
-    return true;
-}
-
-/// Logon Proof command handler
-bool AuthSocket::_HandleLogonProof()
-{
-    DEBUG_LOG("Entering _HandleLogonProof");
-    ///- Read the packet
-    if (ibuf.GetLength() < sizeof(sAuthLogonProof_C))
-        return false;
-
-    sAuthLogonProof_C lp;
-    ibuf.Read((char *)&lp, sizeof(sAuthLogonProof_C));
 
     ///- Continue the SRP6 calculation based on data received from the client
@@ -639 +642 @@
         // No SQL injection (escaped user name) and IP address as received by socket
         const char* K_hex = K.AsHexStr();
-        dbRealmServer.PExecute("UPDATE account SET sessionkey = '%s', last_ip = '%s', last_login = NOW(), locale = '%u', failed_logins = 0 WHERE username = '%s'", K_hex, GetRemoteAddress().c_str(),  _localization, _safelogin.c_str() );
+        dbRealmServer.PExecute("UPDATE account SET sessionkey = '%s', last_ip = '%s', last_login = NOW(), locale = '%u', failed_logins = 0 WHERE username = '%s'", K_hex, GetRemoteAddress().c_str(), GetLocaleByName(_localizationName), _safelogin.c_str() );
         OPENSSL_free((void*)K_hex);
 
@@ -685 +688 @@
                     {
                         uint32 acc_id = fields[0].GetUInt32();
-                        dbRealmServer.PExecute("INSERT INTO account_banned VALUES ('%u',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Trinity realm','Failed login autoban',1)",
+                        dbRealmServer.PExecute("INSERT INTO account_banned VALUES ('%u',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Trinity realmd','Failed login autoban',1)",
                             acc_id, WrongPassBanTime);
                         sLog.outBasic("[AuthChallenge] account %s got banned for '%u' seconds because it failed to authenticate '%u' times",
@@ -694 +697 @@
                         std::string current_ip = GetRemoteAddress();
                         dbRealmServer.escape_string(current_ip);
-                        dbRealmServer.PExecute("INSERT INTO ip_banned VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Trinity realm','Failed login autoban')",
+                        dbRealmServer.PExecute("INSERT INTO ip_banned VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Trinity realmd','Failed login autoban')",
                             current_ip.c_str(), WrongPassBanTime);
                         sLog.outBasic("[AuthChallenge] IP %s got banned for '%u' seconds because account %s failed to authenticate '%u' times",
@@ -851 +854 @@
 void PatcherRunnable::run()
 {
+    ZThread::Guard<ZThread::Mutex> g(mySocket->patcherLock);
     XFER_DATA_STRUCT xfdata;
     xfdata.opcode = XFER_DATA;
@@ -869 +873 @@
 /// Preload MD5 hashes of existing patch files on server
 #ifndef _WIN32
-#include <sys/dir.h>
+#include <dirent.h>
 #include <errno.h>
 void Patcher::LoadPatchesInfo()
@@ -912 +916 @@
         return;                                             //no patches were found
 
-    LoadPatchMD5(fil.cFileName);
-
-    while(FindNextFile(hFil,&fil))
+    do
+    {
         LoadPatchMD5(fil.cFileName);
+    }
+    while(FindNextFile(hFil,&fil));
 }
 #endif

trunk/src/trinityrealm/AuthSocket.h

@@ -34 +34 @@
 #include "sockets/Parse.h"
 #include "sockets/Socket.h"
+#include "zthread/Mutex.h"
 
 /// Handle login commands
@@ -59 +60 @@
 
         FILE *pPatch;
+        ZThread::Mutex patcherLock;
         bool IsLag();
 
@@ -71 +73 @@
         std::string _login;
         std::string _safelogin;
-        uint8 _localization;
+        
+        
+        // Since GetLocaleByName() is _NOT_ bijective, we have to store the locale as a string. Otherwise we can't differ
+        // between enUS and enGB, which is important for the patch system
+        std::string _localizationName;
+        uint16 _build;
         AccountTypes _accountSecurityLevel;
 };

trunk/win/VC71/framework.vcproj

@@ -23 +23 @@
                                 AdditionalOptions="/Zl"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB"
                                 MinimalRebuild="FALSE"
@@ -74 +74 @@
                                 AdditionalOptions="/Zl"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                 StringPooling="TRUE"

trunk/win/VC80/framework.vcproj

@@ -47 +47 @@
                                 AdditionalOptions="/Zl /MP"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB"
                                 MinimalRebuild="false"
@@ -122 +122 @@
                                 AdditionalOptions="/Zl /MP"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB"
                                 MinimalRebuild="false"
@@ -196 +196 @@
                                 AdditionalOptions="/Zl /MP"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                 StringPooling="true"
@@ -272 +272 @@
                                 AdditionalOptions="/Zl /MP"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                 StringPooling="true"

trunk/win/VC90/framework.vcproj

@@ -48 +48 @@
                                 AdditionalOptions="/Zl /MP"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB"
                                 MinimalRebuild="false"
@@ -124 +124 @@
                                 AdditionalOptions="/Zl /MP"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                 StringPooling="true"
@@ -201 +201 @@
                                 AdditionalOptions="/Zl /MP"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB"
                                 MinimalRebuild="false"
@@ -278 +278 @@
                                 AdditionalOptions="/Zl /MP"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\src\framework"
+                                AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                 StringPooling="true"