diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-10-04 00:26:38 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-10-04 00:26:38 +0200 |
| commit | 705e5ea5d9ff5344b89be5aa5e0b6504acff5502 (patch) | |
| tree | 489fe941184636f983022102d4aeaf2e7ffc6700 /src/server/bnetserver/Packets | |
| parent | 8ebb1054982d53785d934d41400e6c626e08f4f2 (diff) | |
Core/Battle.net
* Updated game account flags
* Fixed infinite loop in ReadFourCC if value in packet was 0
* Corrected ClosingReason enum in ConnectionClosing
Diffstat (limited to 'src/server/bnetserver/Packets')
4 files changed, 17 insertions, 17 deletions
diff --git a/src/server/bnetserver/Packets/AuthenticationPackets.cpp b/src/server/bnetserver/Packets/AuthenticationPackets.cpp index cff5b6742b2..4c49bdcc5f1 100644 --- a/src/server/bnetserver/Packets/AuthenticationPackets.cpp +++ b/src/server/bnetserver/Packets/AuthenticationPackets.cpp @@ -35,7 +35,7 @@ void Battlenet::Authentication::ResumeRequest::Read() } Login = _stream.ReadString(9, 3); - Region = _stream.Read<uint8>(8); + GameAccountRegion = _stream.Read<uint8>(8); GameAccountName = _stream.ReadString(5, 1); } @@ -47,7 +47,7 @@ std::string Battlenet::Authentication::ResumeRequest::ToString() const stream << std::endl << "Battlenet::Component Program: " << component.Program << ", Platform: " << component.Platform << ", Build: " << component.Build; stream << std::endl << "Login: " << Login; - stream << std::endl << "Region: " << uint32(Region); + stream << std::endl << "GameAccountRegion: " << uint32(GameAccountRegion); stream << std::endl << "GameAccountName: " << GameAccountName; return stream.str(); diff --git a/src/server/bnetserver/Packets/AuthenticationPackets.h b/src/server/bnetserver/Packets/AuthenticationPackets.h index 5233ea9e45b..5f7b653157d 100644 --- a/src/server/bnetserver/Packets/AuthenticationPackets.h +++ b/src/server/bnetserver/Packets/AuthenticationPackets.h @@ -60,7 +60,7 @@ namespace Battlenet std::string Locale; std::vector<Component> Components; std::string Login; - uint8 Region = 0; + uint8 GameAccountRegion = 0; std::string GameAccountName; }; diff --git a/src/server/bnetserver/Packets/BitStream.h b/src/server/bnetserver/Packets/BitStream.h index 432f0243149..f54c7211604 100644 --- a/src/server/bnetserver/Packets/BitStream.h +++ b/src/server/bnetserver/Packets/BitStream.h @@ -123,7 +123,7 @@ namespace Battlenet uint32 fcc = Read<uint32>(32); EndianConvertReverse(fcc); size_t len = 4; - while (!(fcc & 0xFF)) + while (!(fcc & 0xFF) && len) { fcc >>= 8; --len; diff --git a/src/server/bnetserver/Packets/ConnectionPackets.h b/src/server/bnetserver/Packets/ConnectionPackets.h index 9d49b7c26fb..6cd11e5fcaa 100644 --- a/src/server/bnetserver/Packets/ConnectionPackets.h +++ b/src/server/bnetserver/Packets/ConnectionPackets.h @@ -100,19 +100,19 @@ namespace Battlenet public: enum ClosingReason { - PACKET_TOO_LARGE, - PACKET_CORRUPT, - PACKET_INVALID, - PACKET_INCORRECT, - HEADER_CORRUPT, - HEADER_IGNORED, - HEADER_INCORRECT, - PACKET_REJECTED, - CHANNEL_UNHANDLED, - COMMAND_UNHANDLED, - COMMAND_BAD_PERMISSIONS, - DIRECT_CALL, - TIMEOUT, + PACKET_TOO_LARGE = 1, + PACKET_CORRUPT = 2, + PACKET_INVALID = 3, + PACKET_INCORRECT = 4, + HEADER_CORRUPT = 5, + HEADER_IGNORED = 6, + HEADER_INCORRECT = 7, + PACKET_REJECTED = 8, + CHANNEL_UNHANDLED = 9, + COMMAND_UNHANDLED = 10, + COMMAND_BAD_PERMISSIONS = 11, + DIRECT_CALL = 12, + TIMEOUT = 13, }; struct PacketInfo |