Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.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/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h
This commit is contained in:
Shauren
2014-07-27 20:59:22 +02:00
parent 55eafa247d e502e01f5d
commit 2cba07d6a1
32 changed files with 264 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/authserver/Server/AuthSession.cpp
View File

@@ -18,7 +18,6 @@
#include "AuthSession.h"
#include "Log.h"
#include "ByteBuffer.h"
#include "AuthCodes.h"
#include "Database/DatabaseEnv.h"
#include "SHA1.h"
@@ -173,19 +172,16 @@ void AuthSession::ReadDataHandler(boost::system::error_code error, size_t transf
CloseSocket();
}
void AuthSession::AsyncWrite(ByteBuffer const& packet)
void AuthSession::AsyncWrite(ByteBuffer& packet)
{
std::vector<uint8> data(packet.size());
std::memcpy(data.data(), packet.contents(), packet.size());
std::lock_guard<std::mutex> guard(_writeLock);
bool needsWriteStart = _writeQueue.empty();
_writeQueue.push(std::move(data));
_writeQueue.push(std::move(packet));
if (needsWriteStart)
AsyncWrite(_writeQueue.front());
Base::AsyncWrite(_writeQueue.front());
}
bool AuthSession::HandleLogonChallenge()