aboutsummaryrefslogtreecommitdiff
path: root/src/server/bnetserver/Packets
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2014-10-12 15:34:01 +0200
committerShauren <shauren.trinity@gmail.com>2014-10-12 15:34:01 +0200
commit7679ecd7b3f9cff718023bee80eb6558fdf17b6e (patch)
treef0ffdfc94a0aa3b1067fa35c580facc7f6f2c72f /src/server/bnetserver/Packets
parentc2a39ce36ab41f56cce6f9b31de7835c5f90bd82 (diff)
Core/Battle.net: Improved logging - use separate filters instead of throwing everything to one logger
Diffstat (limited to 'src/server/bnetserver/Packets')
-rw-r--r--src/server/bnetserver/Packets/FriendsPackets.cpp12
-rw-r--r--src/server/bnetserver/Packets/FriendsPackets.h1
-rw-r--r--src/server/bnetserver/Packets/WoWRealmPackets.cpp14
-rw-r--r--src/server/bnetserver/Packets/WoWRealmPackets.h2
4 files changed, 14 insertions, 15 deletions
diff --git a/src/server/bnetserver/Packets/FriendsPackets.cpp b/src/server/bnetserver/Packets/FriendsPackets.cpp
index 7a4bd7dd64f..ec7078f9b02 100644
--- a/src/server/bnetserver/Packets/FriendsPackets.cpp
+++ b/src/server/bnetserver/Packets/FriendsPackets.cpp
@@ -117,10 +117,10 @@ void Battlenet::Friends::RealIdFriendInvite::Read()
}
_stream.Read<uint8>(1);
-
+
if (_stream.Read<uint8>(1))
Message = _stream.ReadString(9);
-
+
_stream.Read<uint32>(32);
}
@@ -129,12 +129,6 @@ std::string Battlenet::Friends::RealIdFriendInvite::ToString() const
return "Battlenet::Friends::RealIdFriendInvite Mail: " + Email + " Message: " + Message;
}
-void Battlenet::Friends::RealIdFriendInvite::CallHandler(Session* session)
-{
- FriendInviteResult* result = new FriendInviteResult();
- session->AsyncWrite(result);
-}
-
std::string Battlenet::Friends::FriendInviteResult::ToString() const
{
return "Battlenet::Friends::RealIdFriendInviteResult";
@@ -150,7 +144,7 @@ void Battlenet::Friends::FriendInviteResult::Write()
_stream.WriteString("Testing2", 8);
}
_stream.Write(5, 32);
-
+
_stream.Write(0, 0xC); // Ignored
_stream.Write(1, 16);
diff --git a/src/server/bnetserver/Packets/FriendsPackets.h b/src/server/bnetserver/Packets/FriendsPackets.h
index a35b02e616d..692ab5a860b 100644
--- a/src/server/bnetserver/Packets/FriendsPackets.h
+++ b/src/server/bnetserver/Packets/FriendsPackets.h
@@ -139,7 +139,6 @@ namespace Battlenet
void Read() override;
std::string ToString() const override;
- void CallHandler(Session* session) override;
std::string Email;
std::string Message;
diff --git a/src/server/bnetserver/Packets/WoWRealmPackets.cpp b/src/server/bnetserver/Packets/WoWRealmPackets.cpp
index 4d11dd0a11f..beeeb14895c 100644
--- a/src/server/bnetserver/Packets/WoWRealmPackets.cpp
+++ b/src/server/bnetserver/Packets/WoWRealmPackets.cpp
@@ -128,11 +128,17 @@ void Battlenet::WoWRealm::ListUpdate::Write()
std::string Battlenet::WoWRealm::ListUpdate::ToString() const
{
std::ostringstream stream;
- stream << "Battlenet::WoWRealm::ListUpdate Timezone " << Timezone << " Population " << Population << " Lock " << uint32(Lock) << " Type " << Type << " Name " << Name
- << " Flags " << uint32(Flags) << " Region " << uint32(Id.Region) << " Battlegroup " << uint32(Id.Battlegroup) << " Index " << Id.Index;
+ stream << "Battlenet::WoWRealm::ListUpdate";
+ if (UpdateState == UPDATE)
+ {
+ stream << " Timezone: " << Timezone << " Population: " << Population << " Lock: " << uint32(Lock) << " Type: " << Type << " Name: " << Name
+ << " Flags: " << uint32(Flags) << " Region: " << uint32(Id.Region) << " Battlegroup: " << uint32(Id.Battlegroup) << " Index: " << Id.Index;
- if (!Version.empty())
- stream << " Version " << Version;
+ if (!Version.empty())
+ stream << " Version: " << Version;
+ }
+ else
+ stream << " Delete realm [Region: " << uint32(Id.Region) << " Battlegroup : " << uint32(Id.Battlegroup) << " Index : " << Id.Index << "]";
return stream.str().c_str();
}
diff --git a/src/server/bnetserver/Packets/WoWRealmPackets.h b/src/server/bnetserver/Packets/WoWRealmPackets.h
index fe211d6fea4..403ca71279f 100644
--- a/src/server/bnetserver/Packets/WoWRealmPackets.h
+++ b/src/server/bnetserver/Packets/WoWRealmPackets.h
@@ -163,7 +163,7 @@ namespace Battlenet
};
JoinResponseV2() : ServerPacket(PacketHeader(SMSG_JOIN_RESPONSE_V2, WOWREALM)),
- ServerSeed(0), Response(SUCCESS), ResponseCode(26)
+ Response(SUCCESS), ResponseCode(26), ServerSeed(0)
{
}