Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h

5 files changed, 61 insertions, 66 deletions

diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp
index ac7c1cfaee5..4112f991dc6 100644
--- a/src/server/authserver/Server/AuthSession.cpp
+++ b/src/server/authserver/Server/AuthSession.cpp
@@ -21,6 +21,7 @@
 #include "AuthCodes.h"
 #include "Database/DatabaseEnv.h"
 #include "SHA1.h"
+#include "TOTP.h"
 #include "openssl/crypto.h"
 #include "Configuration/Config.h"
 #include "RealmList.h"
@@ -52,7 +53,6 @@ enum eStatus
 
 typedef struct AUTH_LOGON_CHALLENGE_C
 {
-    uint8   cmd;
     uint8   error;
     uint16  size;
     uint8   gamename[4];
@@ -71,7 +71,6 @@ typedef struct AUTH_LOGON_CHALLENGE_C
 
 typedef struct AUTH_LOGON_PROOF_C
 {
-    uint8   cmd;
     uint8   A[32];
     uint8   M1[20];
     uint8   crc_hash[20];
@@ -99,7 +98,6 @@ typedef struct AUTH_LOGON_PROOF_S_OLD
 
 typedef struct AUTH_RECONNECT_PROOF_C
 {
-    uint8   cmd;
     uint8   R1[16];
     uint8   R2[20];
     uint8   R3[20];
@@ -114,10 +112,10 @@ enum class BufferSizes : uint32
     SRP_6_S = 0x20,
 };
 
-#define REALM_LIST_PACKET_SIZE 5
-#define XFER_ACCEPT_SIZE 1
-#define XFER_RESUME_SIZE 9
-#define XFER_CANCEL_SIZE 1
+#define REALM_LIST_PACKET_SIZE 4
+#define XFER_ACCEPT_SIZE 0
+#define XFER_RESUME_SIZE 8
+#define XFER_CANCEL_SIZE 0
 
 std::unordered_map<uint8, AuthHandler> AuthSession::InitHandlers()
 {
@@ -137,48 +135,43 @@ std::unordered_map<uint8, AuthHandler> AuthSession::InitHandlers()
 
 std::unordered_map<uint8, AuthHandler> const Handlers = AuthSession::InitHandlers();
 
-void AuthSession::ReadHeaderHandler(boost::system::error_code error, size_t transferedBytes)
+void AuthSession::ReadHeaderHandler()
 {
-    if (!error && transferedBytes == 1)
+    uint8 cmd = GetHeaderBuffer()[0];
+    auto itr = Handlers.find(cmd);
+    if (itr != Handlers.end())
     {
-        uint8 cmd = GetReadBuffer()[0];
-        auto itr = Handlers.find(cmd);
-        if (itr != Handlers.end())
+        // Handle dynamic size packet
+        if (cmd == AUTH_LOGON_CHALLENGE || cmd == AUTH_RECONNECT_CHALLENGE)
         {
-            // Handle dynamic size packet
-            if (cmd == AUTH_LOGON_CHALLENGE || cmd == AUTH_RECONNECT_CHALLENGE)
-            {
-                ReadData(sizeof(uint8) + sizeof(uint16), sizeof(cmd)); //error + size
-                sAuthLogonChallenge_C* challenge = reinterpret_cast<sAuthLogonChallenge_C*>(GetReadBuffer());
+            ReadData(sizeof(uint8) + sizeof(uint16)); //error + size
+            sAuthLogonChallenge_C* challenge = reinterpret_cast<sAuthLogonChallenge_C*>(GetDataBuffer());
 
-                AsyncReadData(challenge->size, sizeof(uint8) + sizeof(uint8) + sizeof(uint16)); // cmd + error + size
-            }
-            else
-                AsyncReadData(itr->second.packetSize, sizeof(uint8));
+            AsyncReadData(challenge->size);
         }
+        else
+            AsyncReadData(itr->second.packetSize);
     }
     else
         CloseSocket();
 }
 
-void AuthSession::ReadDataHandler(boost::system::error_code error, size_t transferedBytes)
+void AuthSession::ReadDataHandler()
 {
-    if (!error && transferedBytes > 0)
+    if (!(*this.*Handlers.at(GetHeaderBuffer()[0]).handler)())
     {
-        if (!(*this.*Handlers.at(GetReadBuffer()[0]).handler)())
-        {
-            CloseSocket();
-            return;
-        }
-
-        AsyncReadHeader();
-    }
-    else
         CloseSocket();
+        return;
+    }
+
+    AsyncReadHeader();
 }
 
 void AuthSession::AsyncWrite(ByteBuffer& packet)
 {
+    if (!IsOpen())
+        return;
+
     std::lock_guard<std::mutex> guard(_writeLock);
 
     bool needsWriteStart = _writeQueue.empty();
@@ -191,7 +184,7 @@ void AuthSession::AsyncWrite(ByteBuffer& packet)
 
 bool AuthSession::HandleLogonChallenge()
 {
-    sAuthLogonChallenge_C* challenge = reinterpret_cast<sAuthLogonChallenge_C*>(GetReadBuffer());
+    sAuthLogonChallenge_C* challenge = reinterpret_cast<sAuthLogonChallenge_C*>(GetDataBuffer());
 
     //TC_LOG_DEBUG("server.authserver", "[AuthChallenge] got full packet, %#04x bytes", challenge->size);
     TC_LOG_DEBUG("server.authserver", "[AuthChallenge] name(%d): '%s'", challenge->I_len, challenge->I);
@@ -412,7 +405,7 @@ bool AuthSession::HandleLogonProof()
 
     TC_LOG_DEBUG("server.authserver", "Entering _HandleLogonProof");
     // Read the packet
-    sAuthLogonProof_C *logonProof = reinterpret_cast<sAuthLogonProof_C*>(GetReadBuffer());
+    sAuthLogonProof_C *logonProof = reinterpret_cast<sAuthLogonProof_C*>(GetDataBuffer());
 
     // If the client has no valid version
     if (_expversion == NO_VALID_EXP_FLAG)
@@ -519,17 +512,12 @@ bool AuthSession::HandleLogonProof()
         // Check auth token
         if ((logonProof->securityFlags & 0x04) || !_tokenKey.empty())
         {
-            // TODO To be fixed
-
-            /*
-            uint8 size;
-            socket().recv((char*)&size, 1);
-            char* token = new char[size + 1];
-            token[size] = '\0';
-            socket().recv(token, size);
-            unsigned int validToken = TOTP::GenerateToken(_tokenKey.c_str());
-            unsigned int incomingToken = atoi(token);
-            delete[] token;
+            ReadData(1);
+            uint8 size = *(GetDataBuffer() + sizeof(sAuthLogonProof_C));
+            ReadData(size);
+            std::string token(reinterpret_cast<char*>(GetDataBuffer() + sizeof(sAuthLogonProof_C) + sizeof(size)), size);
+            uint32 validToken = TOTP::GenerateToken(_tokenKey.c_str());
+            uint32 incomingToken = atoi(token.c_str());
             if (validToken != incomingToken)
             {
                 ByteBuffer packet;
@@ -539,7 +527,7 @@ bool AuthSession::HandleLogonProof()
                 packet << uint8(0);
                 AsyncWrite(packet);
                 return false;
-            }*/
+            }
         }
 
         ByteBuffer packet;
@@ -647,7 +635,7 @@ bool AuthSession::HandleLogonProof()
 bool AuthSession::HandleReconnectChallenge()
 {
     TC_LOG_DEBUG("server.authserver", "Entering _HandleReconnectChallenge");
-    sAuthLogonChallenge_C* challenge = reinterpret_cast<sAuthLogonChallenge_C*>(GetReadBuffer());
+    sAuthLogonChallenge_C* challenge = reinterpret_cast<sAuthLogonChallenge_C*>(GetDataBuffer());
 
     //TC_LOG_DEBUG("server.authserver", "[AuthChallenge] got full packet, %#04x bytes", challenge->size);
     TC_LOG_DEBUG("server.authserver", "[AuthChallenge] name(%d): '%s'", challenge->I_len, challenge->I);
@@ -698,7 +686,7 @@ bool AuthSession::HandleReconnectChallenge()
 bool AuthSession::HandleReconnectProof()
 {
     TC_LOG_DEBUG("server.authserver", "Entering _HandleReconnectProof");
-    sAuthReconnectProof_C *reconnectProof = reinterpret_cast<sAuthReconnectProof_C*>(GetReadBuffer());
+    sAuthReconnectProof_C *reconnectProof = reinterpret_cast<sAuthReconnectProof_C*>(GetDataBuffer());
 
     if (_login.empty() || !_reconnectProof.GetNumBytes() || !K.GetNumBytes())
         return false;
diff --git a/src/server/authserver/Server/AuthSession.h b/src/server/authserver/Server/AuthSession.h
index 2ba6b3efdd4..04ee339df8e 100644
--- a/src/server/authserver/Server/AuthSession.h
+++ b/src/server/authserver/Server/AuthSession.h
@@ -37,7 +37,8 @@ class AuthSession : public Socket<AuthSession, ByteBuffer>
 public:
     static std::unordered_map<uint8, AuthHandler> InitHandlers();
 
-    AuthSession(tcp::socket&& socket) : Socket(std::move(socket), 1)
+    AuthSession(tcp::socket&& socket) : Socket(std::move(socket), 1),
+        _isAuthenticated(false), _build(0), _expversion(0), _accountSecurityLevel(SEC_PLAYER)
     {
         N.SetHexStr("894B645E89E1535BBDAD5B8B290650530801B18EBFBF5E8FAB3C82872A3E9BB7");
         g.SetDword(7);
@@ -51,8 +52,8 @@ public:
     void AsyncWrite(ByteBuffer& packet);
 
 protected:
-    void ReadHeaderHandler(boost::system::error_code error, size_t transferedBytes) override;
-    void ReadDataHandler(boost::system::error_code error, size_t transferedBytes) override;
+    void ReadHeaderHandler() override;
+    void ReadDataHandler() override;
 
 private:
     bool HandleLogonChallenge();
diff --git a/src/server/authserver/Server/BattlenetBitStream.h b/src/server/authserver/Server/BattlenetBitStream.h
index 8f369f1d3ce..c1c95236360 100644
--- a/src/server/authserver/Server/BattlenetBitStream.h
+++ b/src/server/authserver/Server/BattlenetBitStream.h
@@ -18,8 +18,9 @@
 #ifndef __BATTLENETBITSTREAM_H__
 #define __BATTLENETBITSTREAM_H__
 
-#include "ByteConverter.h"
 #include "Common.h"
+#include "ByteConverter.h"
+#include "MessageBuffer.h"
 #include <exception>
 #include <vector>
 #include <type_traits>
@@ -63,6 +64,10 @@ namespace Battlenet
             _buffer.resize(length, 0);
         }
 
+        BitStream(MessageBuffer&& buffer) : _buffer(buffer.Move()), _numBits(_buffer.size() * 8), _readPos(0), _writePos(0)
+        {
+        }
+
         BitStream() : _numBits(0), _readPos(0), _writePos(0)
         {
             _buffer.reserve(0x1000);
diff --git a/src/server/authserver/Server/BattlenetSession.cpp b/src/server/authserver/Server/BattlenetSession.cpp
index 0fd08c267f1..e345cd35200 100644
--- a/src/server/authserver/Server/BattlenetSession.cpp
+++ b/src/server/authserver/Server/BattlenetSession.cpp
@@ -538,17 +538,10 @@ bool Battlenet::Session::HandleRealmJoinRequest(PacketHeader& header, BitStream&
     return true;
 }
 
-void Battlenet::Session::ReadHeaderHandler(boost::system::error_code error, size_t transferedBytes)
+void Battlenet::Session::ReadDataHandler()
 {
-    if (error)
-    {
-        CloseSocket();
-        return;
-    }
-
-    BitStream packet(transferedBytes);
-    std::memcpy(packet.GetBuffer(), GetReadBuffer(), transferedBytes);
-    _crypt.DecryptRecv(packet.GetBuffer(), transferedBytes);
+    BitStream packet(MoveData());
+    _crypt.DecryptRecv(packet.GetBuffer(), packet.GetSize());
 
     while (!packet.IsRead())
     {
@@ -589,17 +582,23 @@ void Battlenet::Session::ReadHeaderHandler(boost::system::error_code error, size
         }
     }
 
-    AsyncReadHeader();
+    AsyncReadData(size_t(BufferSizes::Read));
 }
 
 void Battlenet::Session::Start()
 {
     TC_LOG_TRACE("server.battlenet", "Battlenet::Session::Start");
-    AsyncReadHeader();
+    AsyncReadData(size_t(BufferSizes::Read));
 }
 
 void Battlenet::Session::AsyncWrite(ServerPacket* packet)
 {
+    if (!IsOpen())
+    {
+        delete packet;
+        return;
+    }
+
     TC_LOG_TRACE("server.battlenet", "Battlenet::Session::AsyncWrite %s", packet->ToString().c_str());
 
     packet->Write();
diff --git a/src/server/authserver/Server/BattlenetSession.h b/src/server/authserver/Server/BattlenetSession.h
index 78ae00b4e3e..0ffa253e371 100644
--- a/src/server/authserver/Server/BattlenetSession.h
+++ b/src/server/authserver/Server/BattlenetSession.h
@@ -79,9 +79,11 @@ namespace Battlenet
 
         void AsyncWrite(ServerPacket* packet);
 
+        bool IsDataReady() const override { return GetDataSize() > 0; }
+
     protected:
-        void ReadHeaderHandler(boost::system::error_code error, size_t transferedBytes) override;
-        void ReadDataHandler(boost::system::error_code /*error*/, size_t /*transferedBytes*/) override { }
+        void ReadHeaderHandler() override { }
+        void ReadDataHandler() override;
 
     private:
         void _SetVSFields(std::string const& rI);