Core/Battle.net: Implemented updating realm list after initial login
This commit is contained in:
1 parent
35b14f15e1
commit
56cf7ff2a8
15 files changed
+281
-185
No files matched your search
@@ -18,23 +18,22 @@
|
||||
#include "Session.h"
|
||||
#include "FriendsPackets.h"
|
||||
|
||||
void Battlenet::Friends::SocialnetworkCheckConnected::Read()
|
||||
void Battlenet::Friends::SocialNetworkCheckConnected::Read()
|
||||
{
|
||||
SocialNetworkId = _stream.Read<uint32>(32);
|
||||
}
|
||||
|
||||
std::string Battlenet::Friends::SocialnetworkCheckConnected::ToString() const
|
||||
std::string Battlenet::Friends::SocialNetworkCheckConnected::ToString() const
|
||||
{
|
||||
return "Battlenet::Friends::SocialnetworkCheckConnected SocialNetworkId " + std::to_string(SocialNetworkId);
|
||||
return "Battlenet::Friends::SocialNetworkCheckConnected SocialNetworkId " + std::to_string(SocialNetworkId);
|
||||
}
|
||||
|
||||
void Battlenet::Friends::SocialnetworkCheckConnected::CallHandler(Session* session) const
|
||||
void Battlenet::Friends::SocialNetworkCheckConnected::CallHandler(Session* session) const
|
||||
{
|
||||
SocialNetworkCheckConnectedResult* result = new SocialNetworkCheckConnectedResult(SocialNetworkId);
|
||||
session->AsyncWrite(result);
|
||||
session->HandleSocialNetworkCheckConnected(*this);
|
||||
}
|
||||
|
||||
void Battlenet::Friends::SocialnetworkConnect::Read()
|
||||
void Battlenet::Friends::SocialNetworkConnect::Read()
|
||||
{
|
||||
int32 unk1 = _stream.Read<int32>(32);
|
||||
uint32 size1 = _stream.Read<uint32>(9);
|
||||
@@ -43,12 +42,12 @@ void Battlenet::Friends::SocialnetworkConnect::Read()
|
||||
auto data2 = _stream.ReadBytes(size2);
|
||||
}
|
||||
|
||||
std::string Battlenet::Friends::SocialnetworkConnect::ToString() const
|
||||
std::string Battlenet::Friends::SocialNetworkConnect::ToString() const
|
||||
{
|
||||
return "Battlenet::Friends::SocialnetworkConnect";
|
||||
return "Battlenet::Friends::SocialNetworkConnect";
|
||||
}
|
||||
|
||||
void Battlenet::Friends::SocialnetworkConnect::CallHandler(Session* session) const
|
||||
void Battlenet::Friends::SocialNetworkConnect::CallHandler(Session* session) const
|
||||
{
|
||||
session->LogUnhandledPacket(*this);
|
||||
}
|
||||
@@ -70,8 +69,7 @@ std::string Battlenet::Friends::SocialNetworkCheckConnectedResult::ToString() co
|
||||
void Battlenet::Friends::SocialNetworkCheckConnectedResult::Write()
|
||||
{
|
||||
_stream.Write(0, 23); // Ignored
|
||||
volatile uint16 res = 0;
|
||||
_stream.Write(res, 16); // Unknown
|
||||
_stream.Write(0, 16); // Unknown
|
||||
_stream.Write(SocialNetworkId, 32);
|
||||
}
|
||||
|
||||
|
||||
@@ -54,10 +54,10 @@ namespace Battlenet
|
||||
SMSG_FRIENDS_LIST_NOTIFY_3 = 0x18 // Not implemented
|
||||
};
|
||||
|
||||
class SocialnetworkConnect final : public ClientPacket
|
||||
class SocialNetworkConnect final : public ClientPacket
|
||||
{
|
||||
public:
|
||||
SocialnetworkConnect(PacketHeader const& header, BitStream& stream) : ClientPacket(header, stream)
|
||||
SocialNetworkConnect(PacketHeader const& header, BitStream& stream) : ClientPacket(header, stream)
|
||||
{
|
||||
ASSERT(header == PacketHeader(CMSG_SOCIAL_NETWORK_CONNECT, FRIENDS) && "Invalid packet header for SocialnetworkConnect");
|
||||
}
|
||||
@@ -78,10 +78,10 @@ namespace Battlenet
|
||||
std::string ToString() const override;
|
||||
};
|
||||
|
||||
class SocialnetworkCheckConnected final : public ClientPacket
|
||||
class SocialNetworkCheckConnected final : public ClientPacket
|
||||
{
|
||||
public:
|
||||
SocialnetworkCheckConnected(PacketHeader const& header, BitStream& stream) : ClientPacket(header, stream)
|
||||
SocialNetworkCheckConnected(PacketHeader const& header, BitStream& stream) : ClientPacket(header, stream)
|
||||
{
|
||||
ASSERT(header == PacketHeader(CMSG_SOCIAL_NETWORK_CHECK_CONNECTED, FRIENDS) && "Invalid packet header for SocialNetworkCheckConnected");
|
||||
}
|
||||
@@ -96,7 +96,8 @@ namespace Battlenet
|
||||
class SocialNetworkCheckConnectedResult final : public ServerPacket
|
||||
{
|
||||
public:
|
||||
SocialNetworkCheckConnectedResult(uint32 socialNetworkId) : ServerPacket(PacketHeader(SMSG_SOCIAL_NETWORK_CHECK_CONNECTED_RESULT, FRIENDS)), SocialNetworkId(socialNetworkId)
|
||||
SocialNetworkCheckConnectedResult() : ServerPacket(PacketHeader(SMSG_SOCIAL_NETWORK_CHECK_CONNECTED_RESULT, FRIENDS)),
|
||||
SocialNetworkId(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -57,10 +57,11 @@ namespace Battlenet
|
||||
_creators[PacketHeader(Connection::CMSG_LOGOUT_REQUEST, CONNECTION)] = &New<Connection::LogoutRequest>;
|
||||
|
||||
_creators[PacketHeader(WoWRealm::CMSG_LIST_SUBSCRIBE_REQUEST, WOWREALM)] = &New<WoWRealm::ListSubscribeRequest>;
|
||||
_creators[PacketHeader(WoWRealm::CMSG_LIST_UNSUBSCRIBE, WOWREALM)] = &New<WoWRealm::ListUnsubscribe>;
|
||||
_creators[PacketHeader(WoWRealm::CMSG_JOIN_REQUEST_V2, WOWREALM)] = &New<WoWRealm::JoinRequestV2>;
|
||||
|
||||
_creators[PacketHeader(Friends::CMSG_SOCIAL_NETWORK_CHECK_CONNECTED, FRIENDS)] = &New<Friends::SocialnetworkCheckConnected>;
|
||||
_creators[PacketHeader(Friends::CMSG_SOCIAL_NETWORK_CONNECT, FRIENDS)] = &New<Friends::SocialnetworkConnect>;
|
||||
_creators[PacketHeader(Friends::CMSG_SOCIAL_NETWORK_CHECK_CONNECTED, FRIENDS)] = &New<Friends::SocialNetworkCheckConnected>;
|
||||
_creators[PacketHeader(Friends::CMSG_SOCIAL_NETWORK_CONNECT, FRIENDS)] = &New<Friends::SocialNetworkConnect>;
|
||||
_creators[PacketHeader(Friends::CMSG_GET_FRIENDS_OF_FRIEND, FRIENDS)] = &New<Friends::GetFriendsOfFriend>;
|
||||
_creators[PacketHeader(Friends::CMSG_REALID_FRIEND_INVITE, FRIENDS)] = &New<Friends::RealIdFriendInvite>;
|
||||
|
||||
|
||||
@@ -30,6 +30,16 @@ void Battlenet::WoWRealm::ListSubscribeRequest::CallHandler(Session* session) co
|
||||
session->HandleListSubscribeRequest(*this);
|
||||
}
|
||||
|
||||
std::string Battlenet::WoWRealm::ListUnsubscribe::ToString() const
|
||||
{
|
||||
return "Battlenet::WoWRealm::ListUnsubscribe";
|
||||
}
|
||||
|
||||
void Battlenet::WoWRealm::ListUnsubscribe::CallHandler(Session* session) const
|
||||
{
|
||||
session->HandleListUnsubscribe(*this);
|
||||
}
|
||||
|
||||
Battlenet::WoWRealm::ListSubscribeResponse::~ListSubscribeResponse()
|
||||
{
|
||||
for (ServerPacket* realmData : RealmData)
|
||||
@@ -95,7 +105,7 @@ void Battlenet::WoWRealm::ListUpdate::Write()
|
||||
if (!Version.empty())
|
||||
{
|
||||
_stream.WriteString(Version, 5);
|
||||
_stream.Write(Build, 32);
|
||||
_stream.Write(Id.Build, 32);
|
||||
|
||||
boost::asio::ip::address_v4::bytes_type ip = Address.address().to_v4().to_bytes();
|
||||
uint16 port = Address.port();
|
||||
@@ -110,16 +120,16 @@ void Battlenet::WoWRealm::ListUpdate::Write()
|
||||
_stream.WriteString(Name, 10);
|
||||
}
|
||||
|
||||
_stream.Write(Battlegroup, 8);
|
||||
_stream.Write(Index, 32);
|
||||
_stream.Write(Region, 8);
|
||||
_stream.Write(Id.Battlegroup, 8);
|
||||
_stream.Write(Id.Index, 32);
|
||||
_stream.Write(Id.Region, 8);
|
||||
}
|
||||
|
||||
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(Region) << " Battlegroup " << uint32(Battlegroup) << " Index " << Index;
|
||||
<< " Flags " << uint32(Flags) << " Region " << uint32(Id.Region) << " Battlegroup " << uint32(Id.Battlegroup) << " Index " << Id.Index;
|
||||
|
||||
if (!Version.empty())
|
||||
stream << " Version " << Version;
|
||||
|
||||
@@ -53,6 +53,19 @@ namespace Battlenet
|
||||
void CallHandler(Session* session) const override;
|
||||
};
|
||||
|
||||
class ListUnsubscribe final : public ClientPacket
|
||||
{
|
||||
public:
|
||||
ListUnsubscribe(PacketHeader const& header, BitStream& stream) : ClientPacket(header, stream)
|
||||
{
|
||||
ASSERT(header == PacketHeader(CMSG_LIST_UNSUBSCRIBE, WOWREALM) && "Invalid packet header for ListUnsubscribe");
|
||||
}
|
||||
|
||||
void Read() override { }
|
||||
std::string ToString() const override;
|
||||
void CallHandler(Session* session) const override;
|
||||
};
|
||||
|
||||
class JoinRequestV2 final : public ClientPacket
|
||||
{
|
||||
public:
|
||||
@@ -110,8 +123,7 @@ namespace Battlenet
|
||||
};
|
||||
|
||||
ListUpdate() : ServerPacket(PacketHeader(SMSG_LIST_UPDATE, WOWREALM)), UpdateState(UPDATE),
|
||||
Timezone(0), Population(0.0f), Lock(0), Type(0), Name(""), Version(""),
|
||||
Flags(0), Region(0), Battlegroup(0), Index(0), Build(0)
|
||||
Timezone(0), Population(0.0f), Lock(0), Type(0), Name(""), Version(""), Flags(0)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -127,10 +139,7 @@ namespace Battlenet
|
||||
std::string Version;
|
||||
tcp::endpoint Address;
|
||||
uint8 Flags;
|
||||
uint8 Region;
|
||||
uint8 Battlegroup;
|
||||
uint32 Index;
|
||||
uint32 Build;
|
||||
RealmId Id;
|
||||
};
|
||||
|
||||
class ListComplete final : public ServerPacket
|
||||
|
||||
Reference in new issue
Block a user