Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist

5 files changed, 162 insertions, 197 deletions

diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
index ec472b33f40..f4a0339d9e6 100644
--- a/src/server/shared/Utilities/ServiceWin32.cpp
+++ b/src/server/shared/Utilities/ServiceWin32.cpp
@@ -60,7 +60,7 @@ bool WinServiceInstall()
         if (GetModuleFileName( 0, path, sizeof(path)/sizeof(path[0]) ) > 0)
         {
             SC_HANDLE service;
-            std::strcat(path, " --service");
+            std::strcat(path, " --service run");
             service = CreateService(serviceControlManager,
                 serviceName,                                // name of service
                 serviceLongName,                            // service name to display
@@ -119,6 +119,8 @@ bool WinServiceInstall()
         }
         CloseServiceHandle(serviceControlManager);
     }
+
+    printf("Service installed\n");
     return true;
 }
 
@@ -143,6 +145,8 @@ bool WinServiceUninstall()
 
         CloseServiceHandle(serviceControlManager);
     }
+
+    printf("Service uninstalled\n");
     return true;
 }
 
diff --git a/src/server/shared/Utilities/SignalHandler.h b/src/server/shared/Utilities/SignalHandler.h
deleted file mode 100644
index 41e867c3d1a..00000000000
--- a/src/server/shared/Utilities/SignalHandler.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __SIGNAL_HANDLER_H__
-#define __SIGNAL_HANDLER_H__
-
-#include <ace/Event_Handler.h>
-
-namespace Trinity
-{
-
-/// Handle termination signals
-class SignalHandler : public ACE_Event_Handler
-{
-    public:
-        int handle_signal(int SigNum, siginfo_t* = NULL, ucontext_t* = NULL)
-        {
-            HandleSignal(SigNum);
-            return 0;
-        }
-        virtual void HandleSignal(int /*SigNum*/) { };
-};
-
-}
-
-#endif /* __SIGNAL_HANDLER_H__ */
diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h
index c809a59c20f..7c62de5f5ed 100644
--- a/src/server/shared/Utilities/Timer.h
+++ b/src/server/shared/Utilities/Timer.h
@@ -19,13 +19,15 @@
 #ifndef TRINITY_TIMER_H
 #define TRINITY_TIMER_H
 
-#include "ace/OS_NS_sys_time.h"
-#include "Common.h"
+#include <chrono>
+
+using namespace std::chrono;
 
 inline uint32 getMSTime()
 {
-    static const ACE_Time_Value ApplicationStartTime = ACE_OS::gettimeofday();
-    return (ACE_OS::gettimeofday() - ApplicationStartTime).msec();
+    static const system_clock::time_point ApplicationStartTime = system_clock::now();
+
+    return duration_cast<milliseconds>(system_clock::now() - ApplicationStartTime).count();
 }
 
 inline uint32 getMSTimeDiff(uint32 oldMSTime, uint32 newMSTime)
@@ -44,158 +46,158 @@ inline uint32 GetMSTimeDiffToNow(uint32 oldMSTime)
 
 struct IntervalTimer
 {
-    public:
-
-        IntervalTimer()
-            : _interval(0), _current(0)
-        {
-        }
-
-        void Update(time_t diff)
-        {
-            _current += diff;
-            if (_current < 0)
-                _current = 0;
-        }
-
-        bool Passed()
-        {
-            return _current >= _interval;
-        }
-
-        void Reset()
-        {
-            if (_current >= _interval)
-                _current %= _interval;
-        }
-
-        void SetCurrent(time_t current)
-        {
-            _current = current;
-        }
-
-        void SetInterval(time_t interval)
-        {
-            _interval = interval;
-        }
-
-        time_t GetInterval() const
-        {
-            return _interval;
-        }
-
-        time_t GetCurrent() const
-        {
-            return _current;
-        }
-
-    private:
-
-        time_t _interval;
-        time_t _current;
+public:
+
+    IntervalTimer()
+        : _interval(0), _current(0)
+    {
+    }
+
+    void Update(time_t diff)
+    {
+        _current += diff;
+        if (_current < 0)
+            _current = 0;
+    }
+
+    bool Passed()
+    {
+        return _current >= _interval;
+    }
+
+    void Reset()
+    {
+        if (_current >= _interval)
+            _current %= _interval;
+    }
+
+    void SetCurrent(time_t current)
+    {
+        _current = current;
+    }
+
+    void SetInterval(time_t interval)
+    {
+        _interval = interval;
+    }
+
+    time_t GetInterval() const
+    {
+        return _interval;
+    }
+
+    time_t GetCurrent() const
+    {
+        return _current;
+    }
+
+private:
+
+    time_t _interval;
+    time_t _current;
 };
 
 struct TimeTracker
 {
-    public:
+public:
 
-        TimeTracker(time_t expiry)
-            : i_expiryTime(expiry)
-        {
-        }
+    TimeTracker(time_t expiry)
+        : i_expiryTime(expiry)
+    {
+    }
 
-        void Update(time_t diff)
-        {
-            i_expiryTime -= diff;
-        }
+    void Update(time_t diff)
+    {
+        i_expiryTime -= diff;
+    }
 
-        bool Passed() const
-        {
-            return i_expiryTime <= 0;
-        }
+    bool Passed() const
+    {
+        return i_expiryTime <= 0;
+    }
 
-        void Reset(time_t interval)
-        {
-            i_expiryTime = interval;
-        }
+    void Reset(time_t interval)
+    {
+        i_expiryTime = interval;
+    }
 
-        time_t GetExpiry() const
-        {
-            return i_expiryTime;
-        }
+    time_t GetExpiry() const
+    {
+        return i_expiryTime;
+    }
 
-    private:
+private:
 
-        time_t i_expiryTime;
+    time_t i_expiryTime;
 };
 
 struct TimeTrackerSmall
 {
-    public:
+public:
 
-        TimeTrackerSmall(uint32 expiry = 0)
-            : i_expiryTime(expiry)
-        {
-        }
+    TimeTrackerSmall(uint32 expiry = 0)
+        : i_expiryTime(expiry)
+    {
+    }
 
-        void Update(int32 diff)
-        {
-            i_expiryTime -= diff;
-        }
+    void Update(int32 diff)
+    {
+        i_expiryTime -= diff;
+    }
 
-        bool Passed() const
-        {
-            return i_expiryTime <= 0;
-        }
+    bool Passed() const
+    {
+        return i_expiryTime <= 0;
+    }
 
-        void Reset(uint32 interval)
-        {
-            i_expiryTime = interval;
-        }
+    void Reset(uint32 interval)
+    {
+        i_expiryTime = interval;
+    }
 
-        int32 GetExpiry() const
-        {
-            return i_expiryTime;
-        }
+    int32 GetExpiry() const
+    {
+        return i_expiryTime;
+    }
 
-    private:
+private:
 
-        int32 i_expiryTime;
+    int32 i_expiryTime;
 };
 
 struct PeriodicTimer
 {
-    public:
+public:
 
-        PeriodicTimer(int32 period, int32 start_time)
-            : i_period(period), i_expireTime(start_time)
-        {
-        }
+    PeriodicTimer(int32 period, int32 start_time)
+        : i_period(period), i_expireTime(start_time)
+    {
+    }
 
-        bool Update(const uint32 diff)
-        {
-            if ((i_expireTime -= diff) > 0)
-                return false;
+    bool Update(const uint32 diff)
+    {
+        if ((i_expireTime -= diff) > 0)
+            return false;
 
-            i_expireTime += i_period > int32(diff) ? i_period : diff;
-            return true;
-        }
+        i_expireTime += i_period > int32(diff) ? i_period : diff;
+        return true;
+    }
 
-        void SetPeriodic(int32 period, int32 start_time)
-        {
-            i_expireTime = start_time;
-            i_period = period;
-        }
+    void SetPeriodic(int32 period, int32 start_time)
+    {
+        i_expireTime = start_time;
+        i_period = period;
+    }
 
-        // Tracker interface
-        void TUpdate(int32 diff) { i_expireTime -= diff; }
-        bool TPassed() const { return i_expireTime <= 0; }
-        void TReset(int32 diff, int32 period)  { i_expireTime += period > diff ? period : diff; }
+    // Tracker interface
+    void TUpdate(int32 diff) { i_expireTime -= diff; }
+    bool TPassed() const { return i_expireTime <= 0; }
+    void TReset(int32 diff, int32 period)  { i_expireTime += period > diff ? period : diff; }
 
-    private:
+private:
 
-        int32 i_period;
-        int32 i_expireTime;
+    int32 i_period;
+    int32 i_expireTime;
 };
 
 #endif
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index 4c54492f5ad..a68d836252d 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -21,42 +21,54 @@
 #include "utf8.h"
 #include "SFMT.h"
 #include "Errors.h" // for ASSERT
-#include <ace/TSS_T.h>
+#include <boost/thread/tss.hpp>
 
-typedef ACE_TSS<SFMTRand> SFMTRandTSS;
-static SFMTRandTSS sfmtRand;
+static boost::thread_specific_ptr<SFMTRand> sfmtRand;
+
+static SFMTRand* GetRng()
+{
+    SFMTRand* rand = sfmtRand.get();
+
+    if (!rand)
+    {
+        rand = new SFMTRand();
+        sfmtRand.reset(rand);
+    }
+
+    return rand;
+}
 
 int32 irand(int32 min, int32 max)
 {
     ASSERT(max >= min);
-    return int32(sfmtRand->IRandom(min, max));
+    return int32(GetRng()->IRandom(min, max));
 }
 
 uint32 urand(uint32 min, uint32 max)
 {
     ASSERT(max >= min);
-    return sfmtRand->URandom(min, max);
+    return GetRng()->URandom(min, max);
 }
 
 float frand(float min, float max)
 {
     ASSERT(max >= min);
-    return float(sfmtRand->Random() * (max - min) + min);
+    return float(GetRng()->Random() * (max - min) + min);
 }
 
 int32 rand32()
 {
-    return int32(sfmtRand->BRandom());
+    return int32(GetRng()->BRandom());
 }
 
 double rand_norm(void)
 {
-    return sfmtRand->Random();
+    return GetRng()->Random();
 }
 
 double rand_chance(void)
 {
-    return sfmtRand->Random() * 100.0;
+    return GetRng()->Random() * 100.0;
 }
 
 Tokenizer::Tokenizer(const std::string &src, const char sep, uint32 vectorReserve)
@@ -127,6 +139,14 @@ void stripLineInvisibleChars(std::string &str)
 
 }
 
+#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))
+struct tm* localtime_r(const time_t* time, struct tm *result)
+{
+    localtime_s(result, time);
+    return result;
+}
+#endif
+
 std::string secsToTimeString(uint64 timeInSecs, bool shortText, bool hoursOnly)
 {
     uint64 secs    = timeInSecs % MINUTE;
@@ -216,7 +236,7 @@ uint32 TimeStringToSecs(const std::string& timestring)
 std::string TimeToTimestampStr(time_t t)
 {
     tm aTm;
-    ACE_OS::localtime_r(&t, &aTm);
+    localtime_r(&t, &aTm);
     //       YYYY   year
     //       MM     month (2 digits 01-12)
     //       DD     day (2 digits 01-31)
@@ -239,21 +259,6 @@ bool IsIPAddress(char const* ipaddress)
     return inet_addr(ipaddress) != INADDR_NONE;
 }
 
-std::string GetAddressString(ACE_INET_Addr const& addr)
-{
-    char buf[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16];
-    addr.addr_to_string(buf, ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16);
-    return buf;
-}
-
-bool IsIPAddrInNetwork(ACE_INET_Addr const& net, ACE_INET_Addr const& addr, ACE_INET_Addr const& subnetMask)
-{
-    uint32 mask = subnetMask.get_ip_address();
-    if ((net.get_ip_address() & mask) == (addr.get_ip_address() & mask))
-        return true;
-    return false;
-}
-
 /// create PID file
 uint32 CreatePIDFile(const std::string& filename)
 {
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index 538264c9cfe..6fc5dcfdc2b 100644
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -27,7 +27,6 @@
 #include <vector>
 #include <list>
 #include <map>
-#include <ace/INET_Addr.h>
 
 // Searcher for map of structs
 template<typename T, class S> struct Finder
@@ -71,6 +70,8 @@ void stripLineInvisibleChars(std::string &src);
 
 int64 MoneyStringToMoney(const std::string& moneyString);
 
+struct tm* localtime_r(const time_t* time, struct tm *result);
+
 std::string secsToTimeString(uint64 timeInSecs, bool shortText = false, bool hoursOnly = false);
 uint32 TimeStringToSecs(const std::string& timestring);
 std::string TimeToTimestampStr(time_t t);
@@ -348,12 +349,6 @@ bool Utf8ToUpperOnlyLatin(std::string& utf8String);
 
 bool IsIPAddress(char const* ipaddress);
 
-/// Checks if address belongs to the a network with specified submask
-bool IsIPAddrInNetwork(ACE_INET_Addr const& net, ACE_INET_Addr const& addr, ACE_INET_Addr const& subnetMask);
-
-/// Transforms ACE_INET_Addr address into string format "dotted_ip:port"
-std::string GetAddressString(ACE_INET_Addr const& addr);
-
 uint32 CreatePIDFile(const std::string& filename);
 
 std::string ByteArrayToHexStr(uint8 const* bytes, uint32 length, bool reverse = false);